Browse Source

Добавлен isChild для юзера

Vadim 2 months ago
parent
commit
7d7c5b1379
2 changed files with 12 additions and 2 deletions
  1. 4 0
      src/db/db-schema.ts
  2. 8 2
      src/modules/client/users/c-users-controller.ts

+ 4 - 0
src/db/db-schema.ts

@@ -8,6 +8,7 @@ const DbSchema = {
       email: z.string().email(),
       password: z.string(),
       wrongPassTries: z.number().int().default(0),
+      isChild: z.boolean(),
     },
     roles: {
       roleId: z.string().uuid(),
@@ -140,6 +141,9 @@ const DbSchema = {
       eventInstId: z.string().uuid(),
       code: z.string(),
       name: z.string(),
+      maxMembers: z.number().int().nullable(),
+      isJoinAfterCreate: z.boolean(),
+      isWithMembers: z.boolean(),
     },
     actValidators: {
       actValidatorId: z.string().uuid(),

+ 8 - 2
src/modules/client/users/c-users-controller.ts

@@ -17,14 +17,19 @@ class ClientUsersController {
     // next: NextFunction
   ) {
     const event = await sessionService.getCurrentEventFromReq(req);
-    const user = sessionService.getUserFromReq(req);
+    const userId = sessionService.getUserFromReq(req).userId;
 
     const userData =
       await cUsersService.getUserEventDataWithValuesAndValidators(
         event.eventId,
-        user.userId,
+        userId,
       );
 
+    const user = await cUsersService.getUser(userId);
+    if (!user) {
+      throw ApiError.UnauthorizedError();
+    }
+
     RouterUtils.validAndSendResponse(
       api.client.users.GET_UserEventData.res,
       res,
@@ -32,6 +37,7 @@ class ClientUsersController {
         code: "success",
         userData: {
           fields: [...userData],
+          isChild: user.isChild,
         },
       },
     );