fix: researchEntity에 websiteURL 추가 (#211)

* fix: researchEntity에 websiteURL 추가 * fix: ProfessorServiceTest 수정
wafflestudio · Mar 12, 2024 · 60c8941 · 60c8941
1 parent ad8942f
commit 60c8941
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/research/database/ResearchEntity.kt b/src/main/kotlin/com/wafflestudio/csereal/core/research/database/ResearchEntity.kt
@@ -22,6 +22,8 @@ class ResearchEntity(
     @Column(columnDefinition = "mediumText")
     var description: String?,
 
+    var websiteURL: String?,
+
     @OneToMany(mappedBy = "research", cascade = [CascadeType.ALL], orphanRemoval = true)
     var labs: MutableList<LabEntity> = mutableListOf(),
 
@@ -43,7 +45,8 @@ class ResearchEntity(
                 postType = researchDto.postType,
                 language = languageType,
                 name = researchDto.name,
-                description = researchDto.description
+                description = researchDto.description,
+                websiteURL = researchDto.websiteURL
             )
         }
     }

diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/research/database/ResearchSearchEntity.kt b/src/main/kotlin/com/wafflestudio/csereal/core/research/database/ResearchSearchEntity.kt
@@ -58,6 +58,7 @@ class ResearchSearchEntity(
                 appendLine(cleanTextFromHtml(it))
             }
             research.labs.forEach { appendLine(it.name) }
+            research.websiteURL?.let { appendLine(it) }
         }.toString()
 
         fun createContent(lab: LabEntity) = StringBuilder().apply {

diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/research/dto/ResearchDto.kt b/src/main/kotlin/com/wafflestudio/csereal/core/research/dto/ResearchDto.kt
@@ -12,6 +12,7 @@ data class ResearchDto(
     val language: String,
     val name: String,
     val description: String?,
+    val websiteURL: String?,
     val createdAt: LocalDateTime?,
     val modifiedAt: LocalDateTime?,
     val labs: List<ResearchLabResponse>?,
@@ -26,6 +27,7 @@ data class ResearchDto(
                 language = LanguageType.makeLowercase(entity.language),
                 name = this.name,
                 description = this.description,
+                websiteURL = this.websiteURL,
                 createdAt = this.createdAt,
                 modifiedAt = this.modifiedAt,
                 labs = this.labs.map { ResearchLabResponse(id = it.id, name = it.name) },

diff --git a/src/test/kotlin/com/wafflestudio/csereal/core/member/service/ProfessorServiceTest.kt b/src/test/kotlin/com/wafflestudio/csereal/core/member/service/ProfessorServiceTest.kt
@@ -41,6 +41,7 @@ class ProfessorServiceTest(
             language = LanguageType.KO,
             name = "researchName",
             description = null,
+            websiteURL = null,
             postType = ResearchPostType.LABS
         )
         var labEntity = LabEntity(
@@ -143,6 +144,7 @@ class ProfessorServiceTest(
             language = LanguageType.KO,
             name = "researchName",
             description = null,
+            websiteURL = null,
             postType = ResearchPostType.LABS
         )
         val labEntity1 = LabEntity(

diff --git a/src/test/kotlin/com/wafflestudio/csereal/core/reseach/service/ResearchSearchServiceTest.kt b/src/test/kotlin/com/wafflestudio/csereal/core/reseach/service/ResearchSearchServiceTest.kt
@@ -98,7 +98,8 @@ class ResearchSearchServiceTest(
                     language = LanguageType.KO,
                     name = "research",
                     postType = ResearchPostType.GROUPS,
-                    description = null
+                    description = null,
+                    websiteURL = null
                 )
             )
 

diff --git a/src/test/kotlin/com/wafflestudio/csereal/core/reseach/service/ResearchServiceTest.kt b/src/test/kotlin/com/wafflestudio/csereal/core/reseach/service/ResearchServiceTest.kt
@@ -50,6 +50,7 @@ class ResearchServiceTest(
             name = "name",
             postType = ResearchPostType.CENTERS,
             description = "description",
+            websiteURL = null,
             createdAt = null,
             modifiedAt = null,
             labs = null,
@@ -101,6 +102,7 @@ class ResearchServiceTest(
             name = "name",
             postType = ResearchPostType.CENTERS,
             description = "description",
+            websiteURL = null,
             createdAt = null,
             modifiedAt = null,
             labs = null,
@@ -121,6 +123,7 @@ class ResearchServiceTest(
                 name = "name2",
                 postType = ResearchPostType.GROUPS,
                 description = "description2",
+                websiteURL = null,
                 createdAt = null,
                 modifiedAt = null,
                 labs = null,
@@ -198,7 +201,8 @@ class ResearchServiceTest(
                 language = LanguageType.KO,
                 name = "research",
                 postType = ResearchPostType.GROUPS,
-                description = null
+                description = null,
+                websiteURL = null
             )
         )
 
@@ -305,7 +309,8 @@ class ResearchServiceTest(
                 language = LanguageType.KO,
                 name = "research",
                 postType = ResearchPostType.GROUPS,
-                description = null
+                description = null,
+                websiteURL = null
             )
         )