modify(ideas, blog): add sort by like on ideas & fix sort on blogs (#76)

* modify(ideas, blog): add sort by like on ideas & fix sort on blogs

* modify(leaderboards): add new endpoints leaderboards

* modify(leaderboards): trim down response

Co-authored-by: Yofriadi Yahya <yofriadi.yahya@outlook.com>

Author: yofriadi

src/api/controllers/blog.ts

@@ -47,11 +47,13 @@ export default class BlogController {
     let sorts = '';
     if (sort) {
       sort.split(',').forEach((s: string) => {
+        let ss = s;
+        if (ss.startsWith('-')) ss = s.slice(1);
         if (orderEnum.indexOf(s, 1) < 0) {
           return;
         }
 
-        sorts += snakeCase(s);
+        sorts += s.startsWith('-') ? '-' + snakeCase(s) : snakeCase(s);
       });
     }
 

src/api/controllers/idea.ts

@@ -1,6 +1,7 @@
 import camelcaseKeys from 'camelcase-keys';
 import {FastifyRequest} from 'fastify';
 import {Controller, GET, POST, PUT} from 'fastify-decorators';
+import {snakeCase} from 'lodash';
 
 import {
   UserService,
@@ -22,6 +23,7 @@ import {
   ideaCommentSchema,
   ideaInputSchema,
   paginatedIdeaSchema,
+  paginatedLeaderboardSchema,
   ideaQueryStringSchema,
   ideaProblemAreaSchema,
 } from '../schemas/idea';
@@ -30,7 +32,7 @@ import {PaginatedResponse, IdeaQueryString} from '../../libs/types';
 import {paginateResponse} from '../../libs/utils';
 
 @Controller({route: '/ideas'})
-export default class IdeaController {
+export class IdeaController {
   constructor(
     private userService: UserService,
     private ideaService: IdeaService,
@@ -68,6 +70,11 @@ export default class IdeaController {
   async getAllIdeas(
     req: FastifyRequest<{Querystring: IdeaQueryString}>,
   ): Promise<PaginatedResponse<Idea>> {
+    const orderEnum = ['solutionType', 'liked'];
+    if (req.query.sort) {
+      req.query.sort = transformSort(req.query.sort, orderEnum);
+    }
+
     const response = await this.ideaService.getAll(req.query);
     return paginateResponse(req.query, response);
   }
@@ -166,3 +173,44 @@ export default class IdeaController {
     return this.ideaProblemAreaService.getAll();
   }
 }
+
+@Controller({route: '/leaderboards/team'})
+export class LeaderboardController {
+  constructor(private ideaService: IdeaService) {}
+
+  @GET({
+    url: '/',
+    options: {
+      schema: {
+        querystring: ideaQueryStringSchema,
+        response: {200: paginatedLeaderboardSchema},
+      },
+    },
+  })
+  async getAllIdeas(
+    req: FastifyRequest<{Querystring: IdeaQueryString}>,
+  ): Promise<PaginatedResponse<Idea>> {
+    const orderEnum = ['solutionType', 'liked'];
+
+    if (req.query.sort) {
+      req.query.sort = transformSort(req.query.sort, orderEnum);
+    }
+
+    const response = await this.ideaService.getAll(req.query);
+    return paginateResponse(req.query, response);
+  }
+}
+
+function transformSort(sort: string, order: string[]): string {
+  let sorts = '';
+  sort.split(',').forEach((s: string) => {
+    let ss = s;
+    if (ss.startsWith('-')) ss = s.slice(1);
+    if (order.indexOf(ss) < 0) {
+      return;
+    }
+
+    sorts += s.startsWith('-') ? '-' + snakeCase(s) : snakeCase(s);
+  });
+  return sorts;
+}

src/api/schemas/idea.ts

@@ -53,6 +53,24 @@ export const paginatedIdeaSchema = {
   },
 };
 
+export const paginatedLeaderboardSchema = {
+  type: 'object',
+  properties: {
+    pages: pagination,
+    data: {
+      type: 'array',
+      items: {
+        type: 'object',
+        properties: {
+          solutionName: {type: 'string'},
+          solutionSupportingPhotos: {type: 'array'},
+          liked: {type: 'number'},
+        },
+      },
+    },
+  },
+};
+
 export const ideaCommentSchema = {
   type: 'object',
   properties: {

src/api/services/blog.ts

@@ -29,6 +29,7 @@ export default class BlogService {
 
       sorts.forEach((s: string) => {
         if (s.startsWith('-')) {
+          s = s.slice(1);
           orderBy[`blogs.${s}`] = 'DESC';
         } else {
           orderBy[`blogs.${s}`] = 'ASC';

src/api/services/idea.ts

@@ -45,17 +45,24 @@ export default class IdeaService {
       });
     }
 
+    const orderBy = {};
     if (sort) {
-      if (sort.startsWith('-')) {
-        query = query.orderBy('ideas.solution_name', 'DESC');
-      } else {
-        query = query.orderBy('ideas.solution_name', 'ASC');
-      }
+      const sorts = sort.split(',');
+
+      sorts.forEach((s: string) => {
+        if (s.startsWith('-')) {
+          s = s.slice(1);
+          orderBy[`ideas.${s}`] = 'DESC';
+        } else {
+          orderBy[`ideas.${s}`] = 'ASC';
+        }
+      });
     }
 
     return query
       .limit(limit)
       .offset(offset)
+      .orderBy(orderBy)
       .leftJoinAndSelect('ideas.problemArea', 'problemArea')
       .loadRelationCountAndMap('ideas.totalLikes', 'ideas.likes')
       .loadRelationCountAndMap('ideas.totalComments', 'ideas.comments')

src/index.ts

@@ -4,7 +4,7 @@ import fastifyCors from 'fastify-cors';
 import {bootstrap} from 'fastify-decorators';
 import fastifyMultipart from 'fastify-multipart';
 
-import IdeaController from './api/controllers/idea';
+import {IdeaController, LeaderboardController} from './api/controllers/idea';
 import IdeaUserController from './api/controllers/ideaUser';
 import IdeaLikeController from './api/controllers/ideaLike';
 import IdeaCommentController from './api/controllers/ideaComment';
@@ -33,6 +33,7 @@ server.register(fastifyCors, {
 });
 server.register(bootstrap, {
   controllers: [
+    LeaderboardController,
     IdeaController,
     IdeaUserController,
     IdeaLikeController,