[ADD] userImage and dashboard user (#78)

Author: ibnuimam

package.json

@@ -62,6 +62,8 @@
     },
     "rules": {
       "@typescript-eslint/no-var-requires": 0,
+      "@typescript-eslint/ban-ts-ignore": 0,
+      "@typescript-eslint/ban-ts-comment": 0,
       "max-len": [
         "error",
         {

src/api/controllers/idea.ts

@@ -154,6 +154,7 @@ export class IdeaController {
 
     const problemArea = new IdeaProblemArea();
     problemArea.id = req.body.problemAreaId;
+    // @typescript-eslint/ban-ts-comment
     // @ts-ignore
     delete req.body.problemAreaId;
     let updated = await this.ideaService.update(req.params.id, {
@@ -183,7 +184,7 @@ export class IdeaController {
 }
 
 @Controller({route: '/leaderboards/team'})
-export class LeaderboardController {
+export class LeaderboardTeamController {
   constructor(private ideaService: IdeaService) {}
 
   @GET({

src/api/controllers/user.ts

@@ -5,10 +5,10 @@ import UserService from '../services/user';
 import authenticate from '../hooks/onRequest/authentication';
 import {User} from '../entity/user';
 import {commonQueryString, commonParams} from '../schemas/common';
-import {userSchema, userProfileSchema} from '../schemas/user';
+import {userSchema, userProfileSchema, userLeaderSchema} from '../schemas/user';
 
 @Controller({route: '/users'})
-export default class UserController {
+export class UserController {
   constructor(private service: UserService) {}
 
   @GET({
@@ -214,4 +214,80 @@ export default class UserController {
 
     return user;
   }
+
+  @GET({
+    url: '/account',
+    options: {
+      schema: {
+        response: {200: userSchema},
+      },
+      onRequest: authenticate,
+    },
+  })
+  async getUserAccount(req: AuthenticatedRequest): Promise<User | undefined> {
+    const user = await this.service.getOne({id: req.user.user.id});
+    if (!user) throw {statusCode: 404, message: 'Data not found'};
+    return user;
+  }
+
+  @PUT({
+    url: '/image',
+    options: {
+      schema: {
+        response: {200: userSchema},
+      },
+      onRequest: authenticate,
+    },
+  })
+  async updateUserImage(
+    req: AuthenticatedRequest<{
+      Body: {imageUrl: string};
+    }>,
+  ): Promise<User | undefined> {
+    const user = await this.service.updateById(req.user.user.id, {
+      imageUrl: req.body.imageUrl,
+    });
+    if (!user) throw {statusCode: 404, message: 'Data not found'};
+    return user;
+  }
+
+  @PUT({
+    url: '/fcm-token',
+    options: {
+      schema: {
+        response: {200: userSchema},
+      },
+      onRequest: authenticate,
+    },
+  })
+  async updateUserFCMToken(
+    req: AuthenticatedRequest<{
+      Body: {fcmToken: string};
+    }>,
+  ): Promise<User | undefined> {
+    const user = await this.service.updateById(req.user.user.id, {
+      fcmToken: req.body.fcmToken,
+    });
+    if (!user) throw {statusCode: 404, message: 'Data not found'};
+    return user;
+  }
+}
+
+@Controller({route: '/leaderboards/user'})
+export class LeaderboardUserController {
+  constructor(private service: UserService) {}
+
+  @GET({
+    url: '/',
+    options: {
+      schema: {
+        querystring: commonQueryString,
+        response: {200: {type: 'array', items: userLeaderSchema}},
+      },
+    },
+  })
+  async getUserLeaders(): Promise<User[]> {
+    const leaderUsers = await this.service.getUserLeader();
+    return leaderUsers;
+  }
 }

src/api/entity/user.ts

@@ -50,6 +50,12 @@ export class User {
   @Column({type: 'bigint', default: 0})
   markodingPoint: number;
 
+  @Column('text')
+  fcmToken: string;
+
+  @Column('text')
+  imageUrl: string;
+
   @OneToMany(() => UserPoint, (point) => point.user)
   points: UserPoint[];
 }
@@ -63,6 +69,8 @@ export type UserInput = Omit<
   | 'skilvulPoint'
   | 'markodingPoint'
   | 'points'
+  | 'imageUrl'
+  | 'fcmToken'
 >;
 
 export type UserUpdateInput = Omit<

src/api/schemas/user.ts

@@ -11,6 +11,8 @@ const properties = {
     type: 'number',
     nullable: true,
   },
+  fcmToken: {type: 'string'},
+  imageUrl: {type: 'string'},
 };
 
 export const userSchema = {
@@ -40,3 +42,20 @@ export const userProfileSchema = {
     },
   },
 };
+
+export const userLeaderSchema = {
+  type: 'object',
+  properties: {
+    id: {type: 'string'},
+    name: {type: 'string'},
+    imageUrl: {type: 'string'},
+    skilvulPoint: {
+      type: 'number',
+      nullable: true,
+    },
+    markodingPoint: {
+      type: 'number',
+      nullable: true,
+    },
+  },
+};

src/api/services/event.ts

@@ -22,20 +22,18 @@ export default class EventService {
   async getAll(queryString: CommonQueryString): Promise<[Event[], number]> {
     const {limit, offset, sort} = queryString;
     let query = this.repository.createQueryBuilder('events');
-
+    query.addSelect('start_date > now() as is_active');
     if (sort) {
       if (sort.startsWith('-')) {
         query = query.orderBy('events.title', 'DESC');
       } else {
         query = query.orderBy('events.title', 'ASC');
       }
+    } else {
+      query.addOrderBy('is_active', 'DESC');
+      query.addOrderBy('events.start_date', 'ASC');
     }
-
-    return query
-      .offset(offset)
-      .limit(limit)
-      .addOrderBy('events.start_date', 'ASC')
-      .getManyAndCount();
+    return query.offset(offset).limit(limit).getManyAndCount();
   }
 
   async store(event: Partial<Event>): Promise<Event> {

src/api/services/user.ts

@@ -282,4 +282,12 @@ export default class UserService {
 
     return raw[0];
   }
+
+  async getUserLeader(): Promise<User[]> {
+    return this.repository
+      .createQueryBuilder('user')
+      .limit(10)
+      .orderBy('user.skilvulPoint + user.markodingPoint', 'DESC')
+      .getMany();
+  }
 }

src/index.ts

@@ -4,7 +4,14 @@ import fastifyCors from 'fastify-cors';
 import {bootstrap} from 'fastify-decorators';
 import fastifyMultipart from 'fastify-multipart';
 
-import {IdeaController, LeaderboardController} from './api/controllers/idea';
+import {
+  UserController,
+  LeaderboardUserController,
+} from './api/controllers/user';
+import {
+  IdeaController,
+  LeaderboardTeamController,
+} from './api/controllers/idea';
 import IdeaUserController from './api/controllers/ideaUser';
 import IdeaLikeController from './api/controllers/ideaLike';
 import IdeaCommentController from './api/controllers/ideaComment';
@@ -20,7 +27,6 @@ import QuestionLikeController from './api/controllers/questionLike';
 import ChatController from './api/controllers/chat';
 import UploadController from './api/controllers/upload';
 import ProfileController from './api/controllers/profile';
-import UserController from './api/controllers/user';
 import SearchController from './api/controllers/search';
 
 const {APP_PORT = 8080, APP_HOST = '0.0.0.0'} = process.env;
@@ -33,7 +39,8 @@ server.register(fastifyCors, {
 });
 server.register(bootstrap, {
   controllers: [
-    LeaderboardController,
+    LeaderboardUserController,
+    LeaderboardTeamController,
     IdeaController,
     IdeaUserController,
     IdeaLikeController,