Merge pull request #402 from GSM-MSG/feature/401-mypage-field-sync

portfolioUrl 필수값으로 응답하도록 수정

Author: louis7308

sms-core/src/main/kotlin/team/msg/sms/domain/student/dto/res/DetailStudentInfoTeacherResponseData.kt

@@ -10,7 +10,7 @@ import team.msg.sms.domain.student.model.MilitaryService
 data class DetailStudentInfoTeacherResponseData(
     val name: String,
     val introduce: String,
-    val portfolioUrl: String?,
+    val portfolioUrl: String,
     val portfolioFileUrl: String?,
     val grade: Int,
     val classNum: Int,

sms-core/src/main/kotlin/team/msg/sms/domain/student/dto/res/DetailStudentInfoTokenResponseData.kt

@@ -10,7 +10,7 @@ import team.msg.sms.domain.student.model.MilitaryService
 data class DetailStudentInfoTokenResponseData(
     val name: String,
     val introduce: String,
-    val portfolioUrl: String?,
+    val portfolioUrl: String,
     val portfolioFileUrl: String?,
     val grade: Int,
     val classNum: Int,

sms-core/src/main/kotlin/team/msg/sms/domain/student/usecase/ModifyStudentInfoUseCase.kt

@@ -71,7 +71,7 @@ class ModifyStudentInfoUseCase(
         val checkStudentMismatch = studentService.checkStudentDataMismatch(student, modifyStudentInfoDataModel)
         if (checkStudentMismatch) {
             val portfolioFileUrl =
-                if(student.portfolioUrl != modifyStudentInfoDataModel.portfolioUrl
+                if(student.portfolioUrl != modifyStudentInfoDataModel.portfolioUrl // true && true) //해당 데이터가 다르면서 수정 데이터는 있으면 null
                     && modifyStudentInfoData.portfolioUrl != null) null
                 else student.portfolioFileUrl
 
@@ -299,6 +299,7 @@ class ModifyStudentInfoUseCase(
             }
 
             else -> when (departmentCode) {
+                "0" -> Department.SW_DEVELOPMENT
                 "1", "2" -> Department.SW_DEVELOPMENT
                 "3", "4" -> Department.SMART_IOT_DEVELOPMENT
                 else -> throw StuNumNotRightException

sms-core/src/main/kotlin/team/msg/sms/domain/student/usecase/StudentInfoTeacherUseCase.kt

@@ -13,6 +13,7 @@ import team.msg.sms.domain.project.service.ProjectService
 import team.msg.sms.domain.project.service.ProjectTechStackService
 import team.msg.sms.domain.region.service.RegionService
 import team.msg.sms.domain.student.dto.res.DetailStudentInfoTeacherResponseData
+import team.msg.sms.domain.student.model.Student
 import team.msg.sms.domain.student.model.StudentTechStack
 import team.msg.sms.domain.student.service.StudentService
 import team.msg.sms.domain.student.service.StudentTechStackService
@@ -48,7 +49,7 @@ class StudentInfoTeacherUseCase(
         return DetailStudentInfoTeacherResponseData(
             name = student.name,
             introduce = student.introduce,
-            portfolioUrl = student.portfolioUrl,
+            portfolioUrl = getStudentPortfolioUrl(student),
             portfolioFileUrl = student.portfolioFileUrl,
             grade = student.stuNum.substring(0, 1).toInt(),
             classNum = student.stuNum.substring(1, 2).toInt(),
@@ -90,5 +91,13 @@ class StudentInfoTeacherUseCase(
 
     private fun toStudentTechStacks(techStacks: List<TechStack>, studentTechStack: StudentTechStack): TechStack? =
         techStacks.find { it.id == studentTechStack.techStackId }
+
+    private fun getStudentPortfolioUrl(student: Student.StudentWithUserInfo): String {
+        return when {
+            !student.portfolioUrl.isNullOrBlank() -> student.portfolioUrl
+            !student.portfolioFileUrl.isNullOrBlank() -> student.portfolioFileUrl
+            else -> ""
+        }
+    }
 }
 

sms-core/src/main/kotlin/team/msg/sms/domain/student/usecase/StudentInfoTokenUseCase.kt

@@ -52,7 +52,7 @@ class StudentInfoTokenUseCase(
         return DetailStudentInfoTokenResponseData(
             name = student.name,
             introduce = student.introduce,
-            portfolioUrl = student.portfolioUrl,
+            portfolioUrl = getStudentPortfolioUrl(student),
             portfolioFileUrl = student.portfolioFileUrl,
             grade = student.stuNum.substring(0, 1).toInt(),
             classNum = student.stuNum.substring(1, 2).toInt(),
@@ -94,5 +94,13 @@ class StudentInfoTokenUseCase(
 
     private fun toStudentTechStacks(techStacks: List<TechStack>, studentTechStack: StudentTechStack): TechStack? =
         techStacks.find { it.id == studentTechStack.techStackId }
+
+    private fun getStudentPortfolioUrl(student: Student.StudentWithUserInfo): String {
+        return when {
+            !student.portfolioUrl.isNullOrBlank() -> student.portfolioUrl
+            !student.portfolioFileUrl.isNullOrBlank() -> student.portfolioFileUrl
+            else -> ""
+        }
+    }
 }
 

sms-core/src/main/kotlin/team/msg/sms/domain/user/dto/res/UserProfileDetailResponseData.kt

@@ -10,7 +10,7 @@ import team.msg.sms.domain.student.model.MilitaryService
 data class UserProfileDetailResponseData(
     val name: String,
     val introduce: String,
-    val portfolioUrl: String?,
+    val portfolioUrl: String,
     val portfolioFileUrl: String?,
     val grade: Int,
     val classNum: Int,

sms-core/src/main/kotlin/team/msg/sms/domain/user/usecase/QueryCurrentUserProfileDetailUseCase.kt

@@ -73,7 +73,7 @@ class QueryCurrentUserProfileDetailUseCase(
         UserProfileDetailResponseData(
             name = student.name,
             introduce = student.introduce,
-            portfolioUrl = student.portfolioUrl,
+            portfolioUrl = getStudentPortfolioUrl(student),
             portfolioFileUrl = student.portfolioFileUrl,
             grade = student.stuNum.substring(0, 1).toInt(),
             classNum = student.stuNum.substring(1, 2).toInt(),
@@ -113,4 +113,12 @@ class QueryCurrentUserProfileDetailUseCase(
 
     private fun toStudentTechStacks(techStacks: List<TechStack>, studentTechStack: StudentTechStack): TechStack? =
         techStacks.find { it.id == studentTechStack.techStackId }
+
+    private fun getStudentPortfolioUrl(student: Student.StudentWithUserInfo): String {
+        return when {
+            !student.portfolioUrl.isNullOrBlank() -> student.portfolioUrl
+            !student.portfolioFileUrl.isNullOrBlank() -> student.portfolioFileUrl
+            else -> ""
+        }
+    }
 }

sms-presentation/src/main/kotlin/team/msg/sms/domain/student/dto/res/DetailStudentInfoTeacherWebResponse.kt

@@ -10,7 +10,7 @@ import team.msg.sms.domain.student.model.MilitaryService
 data class DetailStudentInfoTeacherWebResponse(
     val name: String,
     val introduce: String,
-    val portfolioUrl: String?,
+    val portfolioUrl: String,
     val portfolioFileUrl: String?,
     val grade: Int,
     val classNum: Int,

sms-presentation/src/main/kotlin/team/msg/sms/domain/student/dto/res/DetailStudentInfoTokenWebResponse.kt

@@ -10,7 +10,7 @@ import team.msg.sms.domain.student.model.MilitaryService
 data class DetailStudentInfoTokenWebResponse(
     val name: String,
     val introduce: String,
-    val portfolioUrl: String?,
+    val portfolioUrl: String,
     val portfolioFileUrl: String?,
     val grade: Int,
     val classNum: Int,