feat: users schema의 community innerschema 수정 #115

boostcampwm-2022 · Nov 25, 2022 · 20f1953 · 20f1953
1 parent 779ede1
commit 20f1953
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 26 deletions.
diff --git a/server/apps/api/src/community/community.controller.ts b/server/apps/api/src/community/community.controller.ts
@@ -91,16 +91,16 @@ export class CommunityController {
     }
   }
 
-  @Get()
-  @UseGuards(JwtAccessGuard)
-  async getCommunities(@Req() req: any) {
-    try {
-      const _id = req.user._id;
-      const result = await this.communityService.getCommunities(_id);
-      return responseForm(200, result);
-    } catch (error) {
-      this.logger.error(JSON.stringify(error.response));
-      throw error;
-    }
-  }
+  // @Get()
+  // @UseGuards(JwtAccessGuard)
+  // async getCommunities(@Req() req: any) {
+  //   try {
+  //     const _id = req.user._id;
+  //     const result = await this.communityService.getCommunities(_id);
+  //     return responseForm(200, result);
+  //   } catch (error) {
+  //     this.logger.error(JSON.stringify(error.response));
+  //     throw error;
+  //   }
+  // }
 }
diff --git a/server/apps/api/src/community/community.service.ts b/server/apps/api/src/community/community.service.ts
@@ -20,10 +20,9 @@ export class CommunityService {
       ...createCommunityDto,
       users: [createCommunityDto.managerId],
     });
-    await this.userRepository.appendElementAtArr(
-      { _id: createCommunityDto.managerId },
-      { communities: community._id.toString() },
-    );
+    const newCommunity = {};
+    newCommunity[`communities.${community._id.toString()}`] = { _id: community._id.toString() };
+    await this.userRepository.updateObject({ _id: createCommunityDto.managerId }, newCommunity);
     return community;
   }
 

diff --git a/server/dao/repository/user.repository.ts b/server/dao/repository/user.repository.ts
@@ -33,6 +33,10 @@ export class UserRepository {
     await this.userModel.updateOne(filter, { $push: appendElement });
   }
 
+  async updateObject(filter, appendElement) {
+    await this.userModel.updateOne(filter, { $set: appendElement });
+  }
+
   async deleteElementAtArr(filter, removeElement) {
     await this.userModel.updateOne(filter, { $pullAll: removeElement });
   }
@@ -46,4 +50,10 @@ export class UserRepository {
     addArr[attribute] = { $each: appendArr };
     return await this.userModel.findByIdAndUpdate(filter, { $addToSet: addArr }, { new: true });
   }
+
+  // async set(filter, obj) {
+  //   const user = new User();
+  //
+  //   this.userModel.find(filter).communities.set();
+  // }
 }
diff --git a/server/dao/schemas/user.schema.ts b/server/dao/schemas/user.schema.ts
@@ -1,11 +1,16 @@
-import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
+import { Prop, raw, Schema, SchemaFactory } from '@nestjs/mongoose';
 import { IsIn, IsString } from 'class-validator';
 import mongoose, { Document } from 'mongoose';
 import { STATUS } from '@utils/def';
 
+const channels = {
+  _id: { type: String },
+  lastRead: { type: Date, default: new Date() },
+};
+
 export type UserDocument = User & Document;
 
-@Schema()
+@Schema({ timestamps: true })
 export class User {
   @Prop()
   name: string;
@@ -49,12 +54,6 @@ export class User {
   @Prop({ default: new Date(), type: mongoose.Schema.Types.Date })
   lastLogin: Date;
 
-  @Prop({ default: new Date(), type: mongoose.Schema.Types.Date })
-  createdAt: Date;
-
-  @Prop({ default: new Date(), type: mongoose.Schema.Types.Date })
-  updatedAt: Date;
-
   @Prop({ type: mongoose.Schema.Types.Date })
   deletedAt: Date;
 
@@ -66,7 +65,13 @@ export class User {
   @IsString()
   followers: string[];
 
-  @Prop()
-  communities: string[];
+  @Prop(
+    raw({
+      type: Map,
+      of: new mongoose.Schema({ _id: { type: String }, channels: { type: Map, of: Date } }),
+    }),
+  )
+  communities; //: { type: Map<string, any> };
 }
+
 export const UserSchema = SchemaFactory.createForClass(User);