hotfix(team, idea): create team with role student & teacher, login to… (#90)

* hotfix(team, idea): create team with role student & teacher, login to see idea, order desc idea comment

* fix(idea): order by updated_at desc

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

Author: yofriadi

src/api/controllers/idea.ts

@@ -47,11 +47,17 @@ export class IdeaController {
         params: commonParams,
         response: {200: ideaCommentSchema},
       },
+      onRequest: authenticate,
     },
   })
   async getIdeaById(
-    req: FastifyRequest<{Params: {id: string}}>,
+    req: AuthenticatedRequest<{Params: {id: string}}>,
   ): Promise<IdeaResponse> {
+    const user = req.user?.user as User;
+    const userFound = await this.userService.getOne({id: user.id});
+    if (!userFound) {
+      throw {statusCode: 400, message: 'Please login to see ideas'};
+    }
     const idea = await this.ideaService.getOne({id: req.params.id});
     if (!idea) throw {statusCode: 404, message: 'Idea not found'};
 
@@ -65,11 +71,17 @@ export class IdeaController {
         querystring: ideaQueryStringSchema,
         response: {200: paginatedIdeaSchema},
       },
+      onRequest: authenticate,
     },
   })
   async getAllIdeas(
-    req: FastifyRequest<{Querystring: IdeaQueryString}>,
+    req: AuthenticatedRequest<{Querystring: IdeaQueryString}>,
   ): Promise<PaginatedResponse<Idea>> {
+    const user = req.user?.user as User;
+    const userFound = await this.userService.getOne({id: user.id});
+    if (!userFound) {
+      throw {statusCode: 400, message: 'Please login to see ideas'};
+    }
     const orderEnum = ['solutionType', 'solutionName', 'liked'];
     let sorts = '';
     if (req.query.sort) {

src/api/controllers/ideaUser.ts

@@ -88,8 +88,11 @@ export default class IdeaController {
       ]);
 
       if (!userFound) throw {statusCode: 404, message: 'User not found'};
-      if (userFound.profile?.profileType !== 'student') {
-        throw {statusCode: 400, message: 'User not student'};
+      if (
+        userFound.profile?.profileType !== 'student' &&
+        userFound.profile?.profileType !== 'teacher'
+      ) {
+        throw {statusCode: 400, message: 'User not student or teacher'};
       }
       if (userFoundOnTeam) {
         throw {statusCode: 400, message: 'User already on team'};

src/api/services/idea.ts

@@ -64,7 +64,7 @@ export default class IdeaService {
       .limit(limit)
       .offset(offset)
       .orderBy(orderBy)
-      .addOrderBy('ideas.created_at', 'ASC')
+      .addOrderBy('ideas.updated_at', 'DESC')
       .leftJoinAndSelect('ideas.problemArea', 'problemArea')
       .loadRelationCountAndMap('ideas.totalLikes', 'ideas.likes')
       .loadRelationCountAndMap('ideas.totalComments', 'ideas.comments')

src/api/services/ideaComment.ts

@@ -32,6 +32,7 @@ export default class IdeaCommentService {
     return this.repository
       .createQueryBuilder('ideaComment')
       .where('idea_id = :id', {id})
+      .orderBy('ideaComment.created_at', 'DESC')
       .leftJoinAndSelect('ideaComment.user', 'user')
       .limit(limit)
       .offset(offset)