From 07d3004c815c8b8b31c27e62ba7f351650c417e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B2=A0=EB=89=B4?= Date: Wed, 3 Sep 2025 22:39:40 +0900 Subject: [PATCH 1/6] feat: add isOnCampus field to create new experiment posts --- .../dobby/usecase/experiment/CreateExperimentPostUseCase.kt | 2 ++ .../usecase/experiment/CreateExperimentPostUseCaseTest.kt | 3 +++ .../experiment/GetExperimentPostApplyMethodUseCaseTest.kt | 1 + .../main/kotlin/com/dobby/model/experiment/ExperimentPost.kt | 3 +++ 4 files changed, 9 insertions(+) diff --git a/application/src/main/kotlin/com/dobby/usecase/experiment/CreateExperimentPostUseCase.kt b/application/src/main/kotlin/com/dobby/usecase/experiment/CreateExperimentPostUseCase.kt index ba2b83fd..66abbd19 100644 --- a/application/src/main/kotlin/com/dobby/usecase/experiment/CreateExperimentPostUseCase.kt +++ b/application/src/main/kotlin/com/dobby/usecase/experiment/CreateExperimentPostUseCase.kt @@ -37,6 +37,7 @@ class CreateExperimentPostUseCase( val timeRequired: TimeSlot?, val leadResearcher: String, + val isOnCampus: Boolean, val place: String?, val region: Region?, val area: Area?, @@ -116,6 +117,7 @@ class CreateExperimentPostUseCase( timeRequired = input.timeRequired, count = input.count, matchType = input.matchType, + isOnCampus = input.isOnCampus, place = input.place, region = input.region, area = input.area, diff --git a/application/src/test/kotlin/com/dobby/usecase/experiment/CreateExperimentPostUseCaseTest.kt b/application/src/test/kotlin/com/dobby/usecase/experiment/CreateExperimentPostUseCaseTest.kt index 86d7a17f..3d1def14 100644 --- a/application/src/test/kotlin/com/dobby/usecase/experiment/CreateExperimentPostUseCaseTest.kt +++ b/application/src/test/kotlin/com/dobby/usecase/experiment/CreateExperimentPostUseCaseTest.kt @@ -66,6 +66,7 @@ class CreateExperimentPostUseCaseTest : BehaviorSpec({ count = 35, timeRequired = TimeSlot.LESS_30M, leadResearcher = "야뿌 랩실 서버 25기 신수정", + isOnCampus = true, place = "이화여자대학교", region = Region.SEOUL, area = Area.GEUMCHEONGU, @@ -131,6 +132,7 @@ class CreateExperimentPostUseCaseTest : BehaviorSpec({ count = 35, timeRequired = TimeSlot.LESS_30M, leadResearcher = "야뿌 랩실 서버 25기 신수정", + isOnCampus = true, place = "이화여자대학교", region = Region.SEOUL, area = Area.GEUMCHEONGU, @@ -188,6 +190,7 @@ class CreateExperimentPostUseCaseTest : BehaviorSpec({ count = 35, timeRequired = TimeSlot.LESS_30M, leadResearcher = "야뿌 랩실 서버 25기 신수정", + isOnCampus = true, place = "이화여자대학교", region = Region.SEOUL, area = Area.GEUMCHEONGU, diff --git a/application/src/test/kotlin/com/dobby/usecase/experiment/GetExperimentPostApplyMethodUseCaseTest.kt b/application/src/test/kotlin/com/dobby/usecase/experiment/GetExperimentPostApplyMethodUseCaseTest.kt index 00105bb7..d1b6ea0a 100644 --- a/application/src/test/kotlin/com/dobby/usecase/experiment/GetExperimentPostApplyMethodUseCaseTest.kt +++ b/application/src/test/kotlin/com/dobby/usecase/experiment/GetExperimentPostApplyMethodUseCaseTest.kt @@ -52,6 +52,7 @@ class GetExperimentPostApplyMethodUseCaseTest : BehaviorSpec({ applyMethod = applyMethod, region = Region.SEOUL, area = Area.GWANGJINGU, + isOnCampus = true, place = "건국대학교", detailedAddress = "건국대학교 공학관", content = "야뿌들의 한끼 식사량을 체크하는 테스트입니다.", diff --git a/domain/src/main/kotlin/com/dobby/model/experiment/ExperimentPost.kt b/domain/src/main/kotlin/com/dobby/model/experiment/ExperimentPost.kt index bec3b2bb..52dfee6f 100644 --- a/domain/src/main/kotlin/com/dobby/model/experiment/ExperimentPost.kt +++ b/domain/src/main/kotlin/com/dobby/model/experiment/ExperimentPost.kt @@ -32,6 +32,7 @@ data class ExperimentPost( var timeRequired: TimeSlot?, var count: Int, var matchType: MatchType, + var isOnCampus: Boolean?, var place: String?, var region: Region?, var area: Area?, @@ -140,6 +141,7 @@ data class ExperimentPost( timeRequired: TimeSlot?, count: Int, matchType: MatchType, + isOnCampus: Boolean, place: String?, region: Region?, area: Area?, @@ -165,6 +167,7 @@ data class ExperimentPost( timeRequired = timeRequired, count = count, matchType = matchType, + isOnCampus = isOnCampus, place = place, region = region, area = area, From 1e7283d7dbf5d582d6698536617d4f286671cde9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B2=A0=EB=89=B4?= Date: Wed, 3 Sep 2025 22:40:05 +0900 Subject: [PATCH 2/6] feat: add isOnCampus field in ExperimentPostEntity --- .../persistence/entity/experiment/ExperimentPostEntity.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/infrastructure/src/main/kotlin/com/dobby/persistence/entity/experiment/ExperimentPostEntity.kt b/infrastructure/src/main/kotlin/com/dobby/persistence/entity/experiment/ExperimentPostEntity.kt index eba5786a..6503f18f 100644 --- a/infrastructure/src/main/kotlin/com/dobby/persistence/entity/experiment/ExperimentPostEntity.kt +++ b/infrastructure/src/main/kotlin/com/dobby/persistence/entity/experiment/ExperimentPostEntity.kt @@ -70,6 +70,9 @@ class ExperimentPostEntity( @Column(name = "match_type", nullable = false) var matchType: MatchType, + @Column(name = "is_on_campus") + var isOnCampus: Boolean?, + @Column(name = "place", length = 100) var place: String?, @@ -138,6 +141,7 @@ class ExperimentPostEntity( timeRequired = timeRequired, count = count, matchType = matchType, + isOnCampus = isOnCampus, place = place, region = region, area = area, @@ -166,6 +170,7 @@ class ExperimentPostEntity( timeRequired = experimentPost.timeRequired, count = experimentPost.count, matchType = experimentPost.matchType, + isOnCampus = experimentPost.isOnCampus, place = experimentPost.place, region = experimentPost.region, area = experimentPost.area, From c6b7ec37176ca80e4bea45752c5c24a65b8e0962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B2=A0=EB=89=B4?= Date: Wed, 3 Sep 2025 22:40:22 +0900 Subject: [PATCH 3/6] feat: add isOnCampus value on presentation layer --- .../api/dto/request/experiment/CreateExperimentPostRequest.kt | 1 + .../src/main/kotlin/com/dobby/api/mapper/ExperimentPostMapper.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/presentation/src/main/kotlin/com/dobby/api/dto/request/experiment/CreateExperimentPostRequest.kt b/presentation/src/main/kotlin/com/dobby/api/dto/request/experiment/CreateExperimentPostRequest.kt index 233b8b14..a300b3f8 100644 --- a/presentation/src/main/kotlin/com/dobby/api/dto/request/experiment/CreateExperimentPostRequest.kt +++ b/presentation/src/main/kotlin/com/dobby/api/dto/request/experiment/CreateExperimentPostRequest.kt @@ -19,6 +19,7 @@ data class CreateExperimentPostRequest( val leadResearcher: String, // 연구 책임 정보 -> 기본값: 연구자 정보에서 끌어와야 함, 추후에 자유롭게 수정 가능 + val isOnCampus: Boolean, val place: String?, // 대학교 이름 -> 기본값: 연구자 정보에서 끌어와야 함, 추후에 자유롭게 수정 가능 val region: Region?, val area: Area?, diff --git a/presentation/src/main/kotlin/com/dobby/api/mapper/ExperimentPostMapper.kt b/presentation/src/main/kotlin/com/dobby/api/mapper/ExperimentPostMapper.kt index 5437f42a..97ce8c79 100644 --- a/presentation/src/main/kotlin/com/dobby/api/mapper/ExperimentPostMapper.kt +++ b/presentation/src/main/kotlin/com/dobby/api/mapper/ExperimentPostMapper.kt @@ -53,6 +53,7 @@ object ExperimentPostMapper { title = request.title, content = request.content, alarmAgree = request.alarmAgree, + isOnCampus = request.isOnCampus, place = request.place, count = request.count, region = request.region, From 2aaf34672707717e9d8f9e8f9aa238489d2cfafc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B2=A0=EB=89=B4?= Date: Wed, 3 Sep 2025 22:53:58 +0900 Subject: [PATCH 4/6] fix: fix failed test cases --- .../GetExperimentPostDetailForUpdateUseCaseTest.kt | 1 + .../usecase/experiment/GetExperimentPostDetailUseCaseTest.kt | 1 + .../usecase/experiment/GetExperimentPostsUseCaseTest.kt | 5 +++++ .../usecase/experiment/GetMyExperimentPostsUseCaseTest.kt | 3 +++ .../UpdateExperimentPostRecruitStatusUseCaseTest.kt | 2 ++ .../member/email/GetMatchingExperimentPostsUseCaseTest.kt | 1 + .../usecase/member/email/SendMatchingEmailUseCaseTest.kt | 2 ++ 7 files changed, 15 insertions(+) diff --git a/application/src/test/kotlin/com/dobby/usecase/experiment/GetExperimentPostDetailForUpdateUseCaseTest.kt b/application/src/test/kotlin/com/dobby/usecase/experiment/GetExperimentPostDetailForUpdateUseCaseTest.kt index e8ae5161..f2f2e8c0 100644 --- a/application/src/test/kotlin/com/dobby/usecase/experiment/GetExperimentPostDetailForUpdateUseCaseTest.kt +++ b/application/src/test/kotlin/com/dobby/usecase/experiment/GetExperimentPostDetailForUpdateUseCaseTest.kt @@ -60,6 +60,7 @@ class GetExperimentPostDetailForUpdateUseCaseTest : BehaviorSpec({ applyMethod = applyMethod, region = Region.SEOUL, area = Area.GWANGJINGU, + isOnCampus = true, place = "건국대학교", detailedAddress = "건국대학교 공학관", content = "야뿌들의 한끼 식사량을 체크하는 테스트입니다.", diff --git a/application/src/test/kotlin/com/dobby/usecase/experiment/GetExperimentPostDetailUseCaseTest.kt b/application/src/test/kotlin/com/dobby/usecase/experiment/GetExperimentPostDetailUseCaseTest.kt index 83e70b82..c3d387cd 100644 --- a/application/src/test/kotlin/com/dobby/usecase/experiment/GetExperimentPostDetailUseCaseTest.kt +++ b/application/src/test/kotlin/com/dobby/usecase/experiment/GetExperimentPostDetailUseCaseTest.kt @@ -62,6 +62,7 @@ class GetExperimentPostDetailUseCaseTest : BehaviorSpec({ applyMethod = applyMethod, region = Region.SEOUL, area = Area.GWANGJINGU, + isOnCampus = true, place = "건국대학교", detailedAddress = "건국대학교 공학관", content = "야뿌들의 한끼 식사량을 체크하는 테스트입니다.", diff --git a/application/src/test/kotlin/com/dobby/usecase/experiment/GetExperimentPostsUseCaseTest.kt b/application/src/test/kotlin/com/dobby/usecase/experiment/GetExperimentPostsUseCaseTest.kt index 6da3d55b..02f3267a 100644 --- a/application/src/test/kotlin/com/dobby/usecase/experiment/GetExperimentPostsUseCaseTest.kt +++ b/application/src/test/kotlin/com/dobby/usecase/experiment/GetExperimentPostsUseCaseTest.kt @@ -47,6 +47,7 @@ class GetExperimentPostsUseCaseTest : BehaviorSpec({ id = "1", title = "야뿌 피자 먹방 테스트", views = 10, + isOnCampus = true, place = "야뿌 대학교", reward = "스타벅스 1만원권 쿠폰", recruitStatus = false, @@ -132,6 +133,7 @@ class GetExperimentPostsUseCaseTest : BehaviorSpec({ id = "1", title = "Study Target Null Test", views = 10, + isOnCampus = true, place = "Test University", reward = "Test Reward", recruitStatus = false, @@ -214,6 +216,7 @@ class GetExperimentPostsUseCaseTest : BehaviorSpec({ id = "1", title = "Location Target Null Test", views = 10, + isOnCampus = true, place = "Test University", reward = "Test Reward", recruitStatus = false, @@ -295,6 +298,7 @@ class GetExperimentPostsUseCaseTest : BehaviorSpec({ id = "1", title = "Location Target Null Test", views = 10, + isOnCampus = true, place = "Test University", reward = "Test Reward", recruitStatus = false, @@ -376,6 +380,7 @@ class GetExperimentPostsUseCaseTest : BehaviorSpec({ id = "1", title = "야뿌 피자 먹방 테스트", views = 10, + isOnCampus = true, place = "Test University", reward = "Test Reward", recruitStatus = false, diff --git a/application/src/test/kotlin/com/dobby/usecase/experiment/GetMyExperimentPostsUseCaseTest.kt b/application/src/test/kotlin/com/dobby/usecase/experiment/GetMyExperimentPostsUseCaseTest.kt index 616bcb87..93ac5f8a 100644 --- a/application/src/test/kotlin/com/dobby/usecase/experiment/GetMyExperimentPostsUseCaseTest.kt +++ b/application/src/test/kotlin/com/dobby/usecase/experiment/GetMyExperimentPostsUseCaseTest.kt @@ -60,6 +60,7 @@ class GetMyExperimentPostsUseCaseTest : BehaviorSpec({ timeRequired = TimeSlot.ABOUT_1H, targetGroup = targetGroup, applyMethod = applyMethod, + isOnCampus = true, region = Region.SEOUL, area = Area.GWANGJINGU, place = "건국대학교", @@ -87,6 +88,7 @@ class GetMyExperimentPostsUseCaseTest : BehaviorSpec({ applyMethod = applyMethod, region = Region.BUSAN, area = Area.GEUMJEONGGU, + isOnCampus = true, place = "부산대학교", detailedAddress = "부산대학교 자연과학대학", content = "다음 세대의 AI를 위한 실험 연구입니다.", @@ -112,6 +114,7 @@ class GetMyExperimentPostsUseCaseTest : BehaviorSpec({ applyMethod = applyMethod, region = Region.SEOUL, area = Area.GWANAKGU, + isOnCampus = true, place = "서울대학교", detailedAddress = "서울대학교 전산관", content = "소셜 미디어에 대한 연구에 참여할 모집입니다.", diff --git a/application/src/test/kotlin/com/dobby/usecase/experiment/UpdateExperimentPostRecruitStatusUseCaseTest.kt b/application/src/test/kotlin/com/dobby/usecase/experiment/UpdateExperimentPostRecruitStatusUseCaseTest.kt index e3e41c58..dc139160 100644 --- a/application/src/test/kotlin/com/dobby/usecase/experiment/UpdateExperimentPostRecruitStatusUseCaseTest.kt +++ b/application/src/test/kotlin/com/dobby/usecase/experiment/UpdateExperimentPostRecruitStatusUseCaseTest.kt @@ -54,6 +54,7 @@ class UpdateExperimentPostRecruitStatusUseCaseTest : BehaviorSpec({ timeRequired = TimeSlot.ABOUT_1H, count = 10, matchType = mockk(), + isOnCampus = true, place = "야뿌대학교", region = Region.SEOUL, area = Area.GANGNAMGU, @@ -110,6 +111,7 @@ class UpdateExperimentPostRecruitStatusUseCaseTest : BehaviorSpec({ timeRequired = TimeSlot.ABOUT_1H, count = 10, matchType = mockk(), + isOnCampus = true, place = "야뿌대학교", region = Region.SEOUL, area = Area.GANGNAMGU, diff --git a/application/src/test/kotlin/com/dobby/usecase/member/email/GetMatchingExperimentPostsUseCaseTest.kt b/application/src/test/kotlin/com/dobby/usecase/member/email/GetMatchingExperimentPostsUseCaseTest.kt index c25dac47..dad0c0df 100644 --- a/application/src/test/kotlin/com/dobby/usecase/member/email/GetMatchingExperimentPostsUseCaseTest.kt +++ b/application/src/test/kotlin/com/dobby/usecase/member/email/GetMatchingExperimentPostsUseCaseTest.kt @@ -76,6 +76,7 @@ class GetMatchingExperimentPostsUseCaseTest : BehaviorSpec({ count = 35, timeRequired = TimeSlot.LESS_30M, leadResearcher = "야뿌 랩실 서버 25기 신수정", + isOnCampus = true, place = "이화여자대학교", region = Region.SEOUL, area = Area.GEUMCHEONGU, diff --git a/application/src/test/kotlin/com/dobby/usecase/member/email/SendMatchingEmailUseCaseTest.kt b/application/src/test/kotlin/com/dobby/usecase/member/email/SendMatchingEmailUseCaseTest.kt index 265616e1..c073d278 100644 --- a/application/src/test/kotlin/com/dobby/usecase/member/email/SendMatchingEmailUseCaseTest.kt +++ b/application/src/test/kotlin/com/dobby/usecase/member/email/SendMatchingEmailUseCaseTest.kt @@ -96,6 +96,7 @@ class SendMatchingEmailUseCaseTest : BehaviorSpec({ count = 35, timeRequired = TimeSlot.LESS_30M, leadResearcher = "야뿌 랩실 서버 25기 신수정", + isOnCampus = true, place = "이화여자대학교", region = Region.SEOUL, area = Area.GEUMCHEONGU, @@ -164,6 +165,7 @@ class SendMatchingEmailUseCaseTest : BehaviorSpec({ count = 35, timeRequired = TimeSlot.LESS_30M, leadResearcher = "야뿌 랩실 서버 25기 신수정", + isOnCampus = true, place = "이화여자대학교", region = Region.SEOUL, area = Area.GEUMCHEONGU, From 9f5204297b0e10b1a9a31a7a25ce0e308b9df9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B2=A0=EB=89=B4?= Date: Sat, 6 Sep 2025 21:36:15 +0900 Subject: [PATCH 5/6] feat: revise isOnCampus field nullable to non-nullable --- .../com/dobby/usecase/experiment/GetExperimentPostsUseCase.kt | 2 ++ .../main/kotlin/com/dobby/model/experiment/ExperimentPost.kt | 2 +- .../dobby/persistence/entity/experiment/ExperimentPostEntity.kt | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/application/src/main/kotlin/com/dobby/usecase/experiment/GetExperimentPostsUseCase.kt b/application/src/main/kotlin/com/dobby/usecase/experiment/GetExperimentPostsUseCase.kt index a3916100..b64cf3cd 100644 --- a/application/src/main/kotlin/com/dobby/usecase/experiment/GetExperimentPostsUseCase.kt +++ b/application/src/main/kotlin/com/dobby/usecase/experiment/GetExperimentPostsUseCase.kt @@ -51,6 +51,7 @@ class GetExperimentPostsUseCase( val experimentPostId: String, val title: String, val views: Int, + val isOnCampus: Boolean, val place: String?, val reward: String, val recruitStatus: Boolean, @@ -82,6 +83,7 @@ class GetExperimentPostsUseCase( experimentPostId = post.id, title = post.title, views = post.views, + isOnCampus = post.isOnCampus, place = post.place, reward = post.reward, recruitStatus = post.recruitStatus, diff --git a/domain/src/main/kotlin/com/dobby/model/experiment/ExperimentPost.kt b/domain/src/main/kotlin/com/dobby/model/experiment/ExperimentPost.kt index 52dfee6f..f2c30eb7 100644 --- a/domain/src/main/kotlin/com/dobby/model/experiment/ExperimentPost.kt +++ b/domain/src/main/kotlin/com/dobby/model/experiment/ExperimentPost.kt @@ -32,7 +32,7 @@ data class ExperimentPost( var timeRequired: TimeSlot?, var count: Int, var matchType: MatchType, - var isOnCampus: Boolean?, + var isOnCampus: Boolean, var place: String?, var region: Region?, var area: Area?, diff --git a/infrastructure/src/main/kotlin/com/dobby/persistence/entity/experiment/ExperimentPostEntity.kt b/infrastructure/src/main/kotlin/com/dobby/persistence/entity/experiment/ExperimentPostEntity.kt index 6503f18f..287022e2 100644 --- a/infrastructure/src/main/kotlin/com/dobby/persistence/entity/experiment/ExperimentPostEntity.kt +++ b/infrastructure/src/main/kotlin/com/dobby/persistence/entity/experiment/ExperimentPostEntity.kt @@ -71,7 +71,7 @@ class ExperimentPostEntity( var matchType: MatchType, @Column(name = "is_on_campus") - var isOnCampus: Boolean?, + var isOnCampus: Boolean, @Column(name = "place", length = 100) var place: String?, From 0e26473c46509708617b5592f5954a95774d5d1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B2=A0=EB=89=B4?= Date: Sun, 7 Sep 2025 18:25:03 +0900 Subject: [PATCH 6/6] feature: add isOnCampus field in updateExperimentPost --- .../dobby/usecase/experiment/CreateExperimentPostUseCase.kt | 2 ++ .../dobby/usecase/experiment/UpdateExperimentPostUseCase.kt | 3 +++ .../api/dto/request/experiment/UpdateExperimentPostRequest.kt | 1 + .../kotlin/com/dobby/api/dto/response/experiment/PostInfo.kt | 1 + .../main/kotlin/com/dobby/api/mapper/ExperimentPostMapper.kt | 4 ++++ 5 files changed, 11 insertions(+) diff --git a/application/src/main/kotlin/com/dobby/usecase/experiment/CreateExperimentPostUseCase.kt b/application/src/main/kotlin/com/dobby/usecase/experiment/CreateExperimentPostUseCase.kt index 66abbd19..d89dac7e 100644 --- a/application/src/main/kotlin/com/dobby/usecase/experiment/CreateExperimentPostUseCase.kt +++ b/application/src/main/kotlin/com/dobby/usecase/experiment/CreateExperimentPostUseCase.kt @@ -74,6 +74,7 @@ class CreateExperimentPostUseCase( val postId: String, val title: String, val views: Int, + val isOnCampus: Boolean, val place: String?, val reward: String?, val durationInfo: DurationInfo? @@ -142,6 +143,7 @@ class CreateExperimentPostUseCase( postId = savedExperimentPost.id, title = savedExperimentPost.title, views = savedExperimentPost.views, + isOnCampus = savedExperimentPost.isOnCampus, place = savedExperimentPost.place, durationInfo = DurationInfo( startDate = savedExperimentPost.startDate, diff --git a/application/src/main/kotlin/com/dobby/usecase/experiment/UpdateExperimentPostUseCase.kt b/application/src/main/kotlin/com/dobby/usecase/experiment/UpdateExperimentPostUseCase.kt index 90eaa919..f9d8ad80 100644 --- a/application/src/main/kotlin/com/dobby/usecase/experiment/UpdateExperimentPostUseCase.kt +++ b/application/src/main/kotlin/com/dobby/usecase/experiment/UpdateExperimentPostUseCase.kt @@ -33,6 +33,7 @@ class UpdateExperimentPostUseCase( val timeRequired: TimeSlot?, val leadResearcher: String?, + val isOnCampus: Boolean, val place: String?, val region: Region?, val area: Area?, @@ -69,6 +70,7 @@ class UpdateExperimentPostUseCase( val postId: String, val title: String, val views: Int, + val isOnCampus: Boolean, val place: String?, val reward: String?, val durationInfo: DurationInfo? @@ -122,6 +124,7 @@ class UpdateExperimentPostUseCase( postId = updatedPost.id, title = updatedPost.title, views = updatedPost.views, + isOnCampus = updatedPost.isOnCampus, place = updatedPost.place, reward = updatedPost.reward, durationInfo = DurationInfo( diff --git a/presentation/src/main/kotlin/com/dobby/api/dto/request/experiment/UpdateExperimentPostRequest.kt b/presentation/src/main/kotlin/com/dobby/api/dto/request/experiment/UpdateExperimentPostRequest.kt index 84e0a08b..491e5438 100644 --- a/presentation/src/main/kotlin/com/dobby/api/dto/request/experiment/UpdateExperimentPostRequest.kt +++ b/presentation/src/main/kotlin/com/dobby/api/dto/request/experiment/UpdateExperimentPostRequest.kt @@ -19,6 +19,7 @@ data class UpdateExperimentPostRequest( val leadResearcher: String?, // 연구 책임 정보 -> 기본값: 연구자 정보에서 끌어와야 함, 추후에 자유롭게 수정 가능 + val isOnCampus: Boolean, val place: String?, // 대학교 이름 -> 기본값: 연구자 정보에서 끌어와야 함, 추후에 자유롭게 수정 가능 val region: Region?, val area: Area?, diff --git a/presentation/src/main/kotlin/com/dobby/api/dto/response/experiment/PostInfo.kt b/presentation/src/main/kotlin/com/dobby/api/dto/response/experiment/PostInfo.kt index 8bfca327..43a112cd 100644 --- a/presentation/src/main/kotlin/com/dobby/api/dto/response/experiment/PostInfo.kt +++ b/presentation/src/main/kotlin/com/dobby/api/dto/response/experiment/PostInfo.kt @@ -5,6 +5,7 @@ data class PostInfo( val experimentPostId: String, val title: String, val views: Int, + val isOnCampus: Boolean, val place: String?, val reward: String?, val durationInfo: DurationInfo diff --git a/presentation/src/main/kotlin/com/dobby/api/mapper/ExperimentPostMapper.kt b/presentation/src/main/kotlin/com/dobby/api/mapper/ExperimentPostMapper.kt index 97ce8c79..18a3a712 100644 --- a/presentation/src/main/kotlin/com/dobby/api/mapper/ExperimentPostMapper.kt +++ b/presentation/src/main/kotlin/com/dobby/api/mapper/ExperimentPostMapper.kt @@ -102,6 +102,7 @@ object ExperimentPostMapper { experimentPostId = input.postId, title = input.title, views = input.views, + isOnCampus = input.isOnCampus, durationInfo = DurationInfo( startDate = input.durationInfo?.startDate, endDate = input.durationInfo?.endDate @@ -143,6 +144,7 @@ object ExperimentPostMapper { startDate = input.durationInfo?.startDate, endDate = input.durationInfo?.endDate ), + isOnCampus = input.isOnCampus, reward = input.reward, place = input.place ) @@ -157,6 +159,7 @@ object ExperimentPostMapper { imageListInfo = toUpdateImageListInfo(request.imageListInfo), title = request.title, content = request.content, + isOnCampus = request.isOnCampus, place = request.place, count = request.count, region = request.region, @@ -398,6 +401,7 @@ object ExperimentPostMapper { experimentPostId = post.postInfo.experimentPostId, title = post.postInfo.title, views = post.postInfo.views, + isOnCampus = post.postInfo.isOnCampus, place = post.postInfo.place, reward = post.postInfo.reward, durationInfo = DurationInfo(