Merge pull request #368 from GSM-MSG/feature/365-update-teacher-stude…

…nt-details 포트폴리오 PDF 파일 관련 DTO 수정 및 "학생정보 수정 로직" 수정
GSM-MSG · Jun 18, 2024 · d9f0f0c · d9f0f0c
2 parents bd488c2 + 6be71f4
commit d9f0f0c
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 1 deletion.
diff --git a/...c/main/kotlin/team/msg/sms/domain/student/dto/res/DetailStudentInfoTeacherResponseData.kt b/...c/main/kotlin/team/msg/sms/domain/student/dto/res/DetailStudentInfoTeacherResponseData.kt
@@ -11,6 +11,7 @@ data class DetailStudentInfoTeacherResponseData(
     val name: String,
     val introduce: String,
     val portfolioUrl: String?,
+    val portfolioFileUrl: String?,
     val grade: Int,
     val classNum: Int,
     val number: Int,

diff --git a/...src/main/kotlin/team/msg/sms/domain/student/dto/res/DetailStudentInfoTokenResponseData.kt b/...src/main/kotlin/team/msg/sms/domain/student/dto/res/DetailStudentInfoTokenResponseData.kt
@@ -11,6 +11,7 @@ data class DetailStudentInfoTokenResponseData(
     val name: String,
     val introduce: String,
     val portfolioUrl: String?,
+    val portfolioFileUrl: String?,
     val grade: Int,
     val classNum: Int,
     val number: Int,

diff --git a/sms-core/src/main/kotlin/team/msg/sms/domain/student/usecase/ModifyStudentInfoUseCase.kt b/sms-core/src/main/kotlin/team/msg/sms/domain/student/usecase/ModifyStudentInfoUseCase.kt
@@ -70,7 +70,17 @@ class ModifyStudentInfoUseCase(
         // 학생 정보 수정
         val checkStudentMismatch = studentService.checkStudentDataMismatch(student, modifyStudentInfoDataModel)
         if (checkStudentMismatch) {
-            studentService.saveStudent(modifyStudentInfoDataModel.copy(id = student.id), user)
+            val portfolioFileUrl =
+                if(student.portfolioUrl != modifyStudentInfoDataModel.portfolioUrl
+                    && modifyStudentInfoData.portfolioUrl != null) null
+                else student.portfolioFileUrl
+
+            studentService.saveStudent(
+                modifyStudentInfoDataModel.copy(
+                    id = student.id,
+                    portfolioFileUrl = portfolioFileUrl
+                ), user
+            )
         }
 
         // 기술 스택 지우기 수정

diff --git a/sms-core/src/main/kotlin/team/msg/sms/domain/student/usecase/StudentInfoTeacherUseCase.kt b/sms-core/src/main/kotlin/team/msg/sms/domain/student/usecase/StudentInfoTeacherUseCase.kt
@@ -49,6 +49,7 @@ class StudentInfoTeacherUseCase(
             name = student.name,
             introduce = student.introduce,
             portfolioUrl = student.portfolioUrl,
+            portfolioFileUrl = student.portfolioFileUrl,
             grade = student.stuNum.substring(0, 1).toInt(),
             classNum = student.stuNum.substring(1, 2).toInt(),
             number = student.stuNum.substring(2, 4).toInt(),

diff --git a/sms-core/src/main/kotlin/team/msg/sms/domain/student/usecase/StudentInfoTokenUseCase.kt b/sms-core/src/main/kotlin/team/msg/sms/domain/student/usecase/StudentInfoTokenUseCase.kt
@@ -53,6 +53,7 @@ class StudentInfoTokenUseCase(
             name = student.name,
             introduce = student.introduce,
             portfolioUrl = student.portfolioUrl,
+            portfolioFileUrl = student.portfolioFileUrl,
             grade = student.stuNum.substring(0, 1).toInt(),
             classNum = student.stuNum.substring(1, 2).toInt(),
             number = student.stuNum.substring(2, 4).toInt(),

diff --git a/sms-core/src/main/kotlin/team/msg/sms/domain/user/dto/res/UserProfileDetailResponseData.kt b/sms-core/src/main/kotlin/team/msg/sms/domain/user/dto/res/UserProfileDetailResponseData.kt
@@ -11,6 +11,7 @@ data class UserProfileDetailResponseData(
     val name: String,
     val introduce: String,
     val portfolioUrl: String?,
+    val portfolioFileUrl: String?,
     val grade: Int,
     val classNum: Int,
     val number: Int,

diff --git a/.../src/main/kotlin/team/msg/sms/domain/user/usecase/QueryCurrentUserProfileDetailUseCase.kt b/.../src/main/kotlin/team/msg/sms/domain/user/usecase/QueryCurrentUserProfileDetailUseCase.kt
@@ -74,6 +74,7 @@ class QueryCurrentUserProfileDetailUseCase(
             name = student.name,
             introduce = student.introduce,
             portfolioUrl = student.portfolioUrl,
+            portfolioFileUrl = student.portfolioFileUrl,
             grade = student.stuNum.substring(0, 1).toInt(),
             classNum = student.stuNum.substring(1, 2).toInt(),
             number = student.stuNum.substring(2, 4).toInt(),

diff --git a/sms-presentation/src/main/kotlin/team/msg/sms/domain/student/StudentWebAdapter.kt b/sms-presentation/src/main/kotlin/team/msg/sms/domain/student/StudentWebAdapter.kt
@@ -157,6 +157,7 @@ class StudentWebAdapter(
             name = this.name,
             introduce = this.introduce,
             portfolioUrl = this.portfolioUrl,
+            portfolioFileUrl = this.portfolioFileUrl,
             grade = this.grade,
             classNum = this.classNum,
             number = this.number,

diff --git a/.../src/main/kotlin/team/msg/sms/domain/student/dto/res/DetailStudentInfoTokenWebResponse.kt b/.../src/main/kotlin/team/msg/sms/domain/student/dto/res/DetailStudentInfoTokenWebResponse.kt
@@ -11,6 +11,7 @@ data class DetailStudentInfoTokenWebResponse(
     val name: String,
     val introduce: String,
     val portfolioUrl: String?,
+    val portfolioFileUrl: String?,
     val grade: Int,
     val classNum: Int,
     val number: Int,

diff --git a/sms-presentation/src/main/kotlin/team/msg/sms/domain/user/UserWebAdapter.kt b/sms-presentation/src/main/kotlin/team/msg/sms/domain/user/UserWebAdapter.kt
@@ -33,6 +33,7 @@ class UserWebAdapter(
             name = this.name,
             introduce = this.introduce,
             portfolioUrl = this.portfolioUrl,
+            portfolioFileUrl = this.portfolioFileUrl,
             grade = this.grade,
             classNum = this.classNum,
             number = this.number,

diff --git a/...entation/src/main/kotlin/team/msg/sms/domain/user/dto/res/UserProfileDetailWebResponse.kt b/...entation/src/main/kotlin/team/msg/sms/domain/user/dto/res/UserProfileDetailWebResponse.kt
@@ -11,6 +11,7 @@ data class UserProfileDetailWebResponse(
     val name: String,
     val introduce: String,
     val portfolioUrl: String?,
+    val portfolioFileUrl: String?,
     val grade: Int,
     val classNum: Int,
     val number: Int,