feat(be): study group management implement

.vscode/settings.json

@@ -16,5 +16,6 @@
   },
   "[caddyfile]": {
     "editor.defaultFormatter": "matthewpi.caddyfile-support"
-  }
+  },
+  "prisma.pinToPrisma6": true
 }

apps/backend/apps/admin/src/group/group.resolver.ts

@@ -25,7 +25,7 @@ import {
   UpdateCourseNoticeInput
 } from './model/course-notice.input'
 import { UpdateCourseQnAInput } from './model/course-qna.input'
-import { CourseInput } from './model/group.input'
+import { CourseInput, CreateGroupInput } from './model/group.input'
 import { DuplicateCourse, FindGroup } from './model/group.output'
 
 @Resolver(() => Group)
@@ -68,6 +68,15 @@ export class GroupResolver {
     return await this.groupService.duplicateCourse(groupId, req.user.id)
   }
 
+  @Mutation(() => Group)
+  @UseGroupLeaderGuard()
+  async createGroup(
+    @Args('input') input: CreateGroupInput,
+    @Context('req') req: AuthenticatedRequest
+  ) {
+    return await this.groupService.createGroup(input, req.user.id)
+  }
+
   @Query(() => [FindGroup])
   @UseDisableAdminGuard()
   async getCoursesUserLead(@Context('req') req: AuthenticatedRequest) {

apps/backend/apps/admin/src/group/group.service.spec.ts

@@ -53,7 +53,8 @@ const courseInfo = {
   email: 'johndoe@example.com',
   website: 'https://example.com',
   office: 'Room 301',
-  phoneNum: '010-3333-2222'
+  phoneNum: '010-3333-2222',
+  invitationCode: null
 }
 
 const group = {
@@ -66,14 +67,16 @@ const group = {
       groupId: 1,
       isGroupLeader: true,
       createTime: faker.date.past(),
-      updateTime: faker.date.past()
+      updateTime: faker.date.past(),
+      totalStudyTime: 0
     },
     {
       userId: faker.number.int(),
       groupId: 1,
       isGroupLeader: false,
       createTime: faker.date.past(),
-      updateTime: faker.date.past()
+      updateTime: faker.date.past(),
+      totalStudyTime: 0
     }
   ],
   groupName: 'Programming Basics',
@@ -635,4 +638,23 @@ describe('WhitelistService', () => {
       ).to.be.true
     })
   })
+
+  describe('Study Tracking (totalStudyTime)', () => {
+    it('Default totalStudyTime of User in new study group must be 0.', async () => {
+      const mockUserGroup = {
+        userId,
+        groupId,
+        isGroupLeader: false,
+        totalStudyTime: 0
+      }
+
+      db.userGroup.create.resolves(mockUserGroup)
+
+      const result = await db.userGroup.create({
+        data: { userId, groupId }
+      })
+
+      expect(result.totalStudyTime).to.equal(0)
+    })
+  })
 })

apps/backend/apps/admin/src/group/group.service.ts

@@ -18,6 +18,7 @@ import type {
 } from './model/course-notice.input'
 import type { UpdateCourseQnAInput } from './model/course-qna.input'
 import type { CourseInput } from './model/group.input'
+import { CreateGroupInput } from './model/group.input'
 
 @Injectable()
 export class GroupService {
@@ -101,6 +102,47 @@ export class GroupService {
     }
   }
 
+  async createGroup(input: CreateGroupInput, userId: number) {
+    const { groupName, description, isPrivate, capacity, invitationCode } =
+      input
+
+    const existingGroup = await this.prisma.group.findFirst({
+      where: { groupName }
+    })
+    if (existingGroup) {
+      throw new ConflictFoundException('Group name already exists')
+    }
+
+    const group = await this.prisma.group.create({
+      data: {
+        groupName,
+        description: description ?? '',
+        config: {
+          type: 'Study',
+          isPrivate,
+          showOnList: true,
+          allowJoinFromSearch: true,
+          allowJoinWithURL: true,
+          requireApprovalBeforeJoin: false
+        },
+        userGroup: {
+          create: {
+            userId,
+            isGroupLeader: true
+          }
+        },
+        studyInfo: {
+          create: {
+            capacity: capacity ?? 10,
+            invitationCode: isPrivate ? invitationCode : null
+          }
+        }
+      }
+    })
+
+    return group
+  }
+
   /**
    * 강좌(Course) 목록을 조회합니다.
    *

apps/backend/apps/admin/src/group/model/group.input.ts

@@ -1,6 +1,6 @@
 import { Field, Int } from '@nestjs/graphql'
 import { InputType } from '@nestjs/graphql'
-import { GroupCreateInput, GroupUpdateInput } from '@generated'
+import { GroupUpdateInput } from '@generated'
 
 @InputType()
 class Config {
@@ -18,9 +18,24 @@ class Config {
 }
 
 @InputType()
-export class CreateGroupInput extends GroupCreateInput {
-  @Field(() => Config, { nullable: false })
-  declare config: Config
+export class CreateGroupInput {
+  @Field(() => String)
+  groupName: string
+
+  @Field(() => String, { nullable: true })
+  description?: string
+
+  @Field(() => Boolean, { defaultValue: false })
+  isPrivate: boolean
+
+  @Field(() => Int, { nullable: true, description: 'Max people (default: 10)' })
+  capacity?: number
+
+  @Field(() => String, {
+    nullable: true,
+    description: 'Private invitation code'
+  })
+  invitationCode?: string
 }
 
 @InputType()

apps/backend/apps/admin/src/group/model/group.output.ts

@@ -1,5 +1,4 @@
-import { Field, Int } from '@nestjs/graphql'
-import { ObjectType } from '@nestjs/graphql'
+import { Field, Int, ObjectType } from '@nestjs/graphql'
 import { Group } from '@generated'
 
 @ObjectType()
@@ -17,10 +16,10 @@ export class DuplicateCourse {
   duplicatedCourse!: Group
 
   @Field(() => [Int], { nullable: false })
-  originAssignments!: number
+  originAssignments!: number[]
 
   @Field(() => [Int], { nullable: false })
-  copiedAssignments!: number
+  copiedAssignments!: number[]
 }
 
 @ObjectType()

apps/backend/apps/admin/src/user/user.resolver.spec.ts

@@ -92,7 +92,8 @@ describe('GroupMemberResolver', () => {
         groupId,
         isGroupLeader: false,
         createTime: faker.date.past(),
-        updateTime: faker.date.past()
+        updateTime: faker.date.past(),
+        totalStudyTime: 0
       }
 
       // Mock the service method

apps/backend/apps/admin/src/user/user.service.spec.ts

@@ -69,23 +69,26 @@ const userGroup1: UserGroup = {
   groupId: 2,
   isGroupLeader: true,
   createTime: faker.date.past(),
-  updateTime: faker.date.past()
+  updateTime: faker.date.past(),
+  totalStudyTime: 0
 }
 
 const userGroup2: UserGroup = {
   userId: 4,
   groupId: 2,
   isGroupLeader: true,
   createTime: faker.date.past(),
-  updateTime: faker.date.past()
+  updateTime: faker.date.past(),
+  totalStudyTime: 0
 }
 
 const userGroup3: UserGroup = {
   userId: 5,
   groupId: 2,
   isGroupLeader: false,
   createTime: faker.date.past(),
-  updateTime: faker.date.past()
+  updateTime: faker.date.past(),
+  totalStudyTime: 0
 }
 
 const updateFindResult = [

apps/backend/apps/client/src/app.module.ts

@@ -24,6 +24,7 @@ import { GroupModule } from './group/group.module'
 import { NoticeModule } from './notice/notice.module'
 import { NotificationModule } from './notification/notification.module'
 import { ProblemModule } from './problem/problem.module'
+import { StudyModule } from './study/study.module'
 import { SubmissionModule } from './submission/submission.module'
 import { UserModule } from './user/user.module'
 import { WorkbookModule } from './workbook/workbook.module'
@@ -43,6 +44,7 @@ import { WorkbookModule } from './workbook/workbook.module'
     AuthModule,
     ContestModule,
     GroupModule,
+    StudyModule,
     NoticeModule,
     ProblemModule,
     SubmissionModule,

apps/backend/apps/client/src/group/group.service.spec.ts

@@ -110,7 +110,8 @@ describe('GroupService', () => {
           email: 'example01@skku.edu',
           website: 'https://seclab.com',
           office: null,
-          phoneNum: null
+          phoneNum: null,
+          invitationCode: null
         },
         isGroupLeader: true,
         isJoined: true
@@ -151,7 +152,8 @@ describe('GroupService', () => {
           email: 'example01@skku.edu',
           website: 'https://seclab.com',
           office: null,
-          phoneNum: null
+          phoneNum: null,
+          invitationCode: null
         },
         isGroupLeader: true,
         isJoined: true
@@ -221,7 +223,8 @@ describe('GroupService', () => {
             email: 'example01@skku.edu',
             website: 'https://seclab.com',
             office: null,
-            phoneNum: null
+            phoneNum: null,
+            invitationCode: null
           },
           memberNum: 11,
           isGroupLeader: true
@@ -256,7 +259,8 @@ describe('GroupService', () => {
       const userGroupData: UserGroupData = {
         userId,
         groupId,
-        isGroupLeader: false
+        isGroupLeader: false,
+        totalStudyTime: 0
       }
 
       expect(res)
@@ -317,6 +321,7 @@ describe('GroupService', () => {
         userId,
         groupId,
         isGroupLeader: false,
+        totalStudyTime: 0,
         createTime: undefined,
         updateTime: undefined
       })

apps/backend/apps/client/src/group/group.service.ts

@@ -81,7 +81,8 @@ export class GroupService {
                 email: true,
                 phoneNum: true,
                 office: true,
-                website: true
+                website: true,
+                invitationCode: true
               }
             }
           }

apps/backend/apps/client/src/group/interface/user-group-data.interface.ts

@@ -2,4 +2,5 @@ export interface UserGroupData {
   userId: number
   groupId: number
   isGroupLeader: boolean
+  totalStudyTime?: number
 }

apps/backend/apps/client/src/group/mock/group.mock.ts

@@ -114,28 +114,32 @@ export const userGroups: UserGroup[] = [
     userId: 1,
     createTime: new Date('2023-02-22T00:00:00.000Z'),
     updateTime: new Date('2023-02-22T10:00:00.000Z'),
-    isGroupLeader: true
+    isGroupLeader: true,
+    totalStudyTime: 0
   },
   {
     groupId: 1,
     userId: 2,
     createTime: new Date('2023-02-22T00:00:00.000Z'),
     updateTime: new Date('2023-02-22T10:00:00.000Z'),
-    isGroupLeader: false
+    isGroupLeader: false,
+    totalStudyTime: 0
   },
   {
     groupId: 2,
     userId: 1,
     createTime: new Date('2023-02-22T00:00:00.000Z'),
     updateTime: new Date('2023-02-22T10:00:00.000Z'),
-    isGroupLeader: true
+    isGroupLeader: true,
+    totalStudyTime: 0
   },
   {
     groupId: 2,
     userId: 2,
     createTime: new Date('2023-02-22T00:00:00.000Z'),
     updateTime: new Date('2023-02-22T10:00:00.000Z'),
-    isGroupLeader: false
+    isGroupLeader: false,
+    totalStudyTime: 0
   }
 ]