add units and language to user type

app/server/src/server/controllers/user.controller.ts

@@ -1,4 +1,4 @@
-import { validateModel, Token, TokenSchema, UserSchema, User } from 'shared'
+import { validateModel, Token, TokenSchema, UserSchema, User, LanguageSchema, UnitsSchema} from 'shared'
 import { KnownError } from '../errors'
 import { z } from 'zod'
 import { Context } from 'koa'
@@ -16,10 +16,10 @@ const RegisterRequestSchema = z.object({
     email: z.string(),
     password: z.string(),
     name: z.string(),
+    language: LanguageSchema,
+    units: UnitsSchema,
 })
 
-type RegisterRequest = z.infer<typeof RegisterRequestSchema>
-
 export const UserController = {
     async getUserByToken(ctx: Context): Promise<void> {
         const token = TokenSchema.parse(ctx.state.token);
@@ -98,22 +98,24 @@ export const UserController = {
     },
 
     async register(ctx: Context): Promise<void> {
-        const result = validateModel(ctx.request.body, RegisterRequestSchema)
+        const bodyParseRes = RegisterRequestSchema.safeParse(ctx.request.body)
 
-        if (!result.ok) {
+        if (!bodyParseRes.success) {
             throw new KnownError({
-                message: result.error.message,
+                message: bodyParseRes.error.message,
                 code: 400,
                 name: 'ValidationError',
             });
         }
 
-        const body = ctx.request.body as RegisterRequest
+        const body = bodyParseRes.data
 
         await UserService.register(
             body.email,
             body.password,
             body.name,
+            body.language,
+            body.units,
         )
 
         ctx.status = 201

app/server/src/server/repositories/user.repo.ts

@@ -65,7 +65,6 @@ export const UserRepo: IUserRepo = {
             createdAt: doc.createdAt.toDate(),
         }
 
-
         const validatedUser = UserSchema.parse(createdUser);
         return validatedUser;
     },

app/server/src/server/services/user.service.ts

@@ -1,6 +1,6 @@
 import uuid4 from 'uuid4';
 import { KnownError } from '../errors';
-import { Token, User, UserSchema, validateModel } from 'shared';
+import { Token, User, UserSchema, validateModel, Language, Units } from 'shared';
 import { UserRepo, TokenRepo } from '../repositories'
 import bcrypt from 'bcrypt'
 
@@ -44,8 +44,6 @@ export const UserService = {
             type: "access",
         })
 
-        // TODO revoke user's previous tokens
-
         return jwt
     },
 
@@ -71,7 +69,13 @@ export const UserService = {
         return validatedNewUser
     },
 
-    async register(email: string, password: string, name: string): Promise<void> {
+    async register(
+        email: string,
+        password: string,
+        name: string,
+        language: Language,
+        units: Units,
+    ): Promise<void> {
         const existingUser = await UserRepo.findByEmail(email)
 
         if (existingUser != null) {
@@ -84,16 +88,20 @@ export const UserService = {
 
         const hashedPassword = bcrypt.hashSync(password, 10)
 
-        const user = await UserRepo.create({
+        const newUser = UserSchema.parse({
             id: uuid4(),
             email: email,
             emailVerified: false,
             password: hashedPassword,
             name: name,
             type: 'user',
             createdAt: new Date(),
+            language: language,
+            units: units,
         })
 
+        const user = await UserRepo.create({ ...newUser })
+
         const result = validateModel(user, UserSchema)
 
         if (!result.ok) throw new Error(

app/shared/src/models/index.ts

@@ -7,6 +7,12 @@ export type { Token } from './token.model';
 export { UserSchema } from './user.model';
 export type { User } from './user.model';
 
+export { LanguageSchema } from './user.model';
+export type { Language } from './user.model';
+
+export { UnitsSchema } from './user.model';
+export type { Units } from './user.model';
+
 export { default as validateModel } from './validateModel';
 
 export { WellSchema } from './well.model';

app/shared/src/models/user.model.ts

@@ -1,5 +1,11 @@
 import { z } from 'zod';
 
+export const LanguageSchema = z.enum(['english', 'bengali']);
+export type Language = z.infer<typeof LanguageSchema>;
+
+export const UnitsSchema = z.enum(['meters', 'feet']);
+export type Units = z.infer<typeof UnitsSchema>;
+
 export const UserSchema = z.object({
     id: z.string(),
     email: z.string(),
@@ -8,6 +14,8 @@ export const UserSchema = z.object({
     name: z.string(),
     type: z.enum(['admin', 'user']),
     createdAt: z.date(),
+    language: LanguageSchema,
+    units: UnitsSchema,
 });
 
 export type User = z.infer<typeof UserSchema>;