DiaryActivityType -> DiaryActivity

Author: asp345

…n/kotlin/diary/data/DiaryActivityType.kt …/main/kotlin/diary/data/DiaryActivity.ktcore/src/main/kotlin/diary/data/DiaryActivityType.kt renamed to core/src/main/kotlin/diary/data/DiaryActivity.kt core/src/main/kotlin/diary/data/DiaryActivityType.kt renamed to core/src/main/kotlin/diary/data/DiaryActivity.kt

@@ -5,7 +5,7 @@ import org.springframework.data.mongodb.core.index.Indexed
 import org.springframework.data.mongodb.core.mapping.Document
 
 @Document
-data class DiaryActivityType(
+data class DiaryActivity(
     @Id
     val id: String? = null,
     @Indexed(unique = true)

core/src/main/kotlin/diary/data/DiaryQuestion.kt

@@ -11,6 +11,6 @@ data class DiaryQuestion(
     val shortQuestion: String,
     val answers: List<String>,
     val shortAnswers: List<String>,
-    val targetActivityTypes: List<DiaryActivityType>,
+    val targetActivityTypes: List<DiaryActivity>,
     var active: Boolean = true,
 )

core/src/main/kotlin/diary/dto/DiaryActivityTypeDto.kt

@@ -1,14 +1,14 @@
 package com.wafflestudio.snutt.diary.dto
 
-import com.wafflestudio.snutt.diary.data.DiaryActivityType
+import com.wafflestudio.snutt.diary.data.DiaryActivity
 
 data class DiaryActivityTypeDto(
     val id: String,
     val name: String,
 )
 
-fun DiaryActivityTypeDto(diaryActivityType: DiaryActivityType) =
+fun DiaryActivityTypeDto(diaryActivity: DiaryActivity) =
     DiaryActivityTypeDto(
-        id = diaryActivityType.id!!,
-        name = diaryActivityType.name,
+        id = diaryActivity.id!!,
+        name = diaryActivity.name,
     )

core/src/main/kotlin/diary/repository/DiaryActivityTypeRepository.kt

@@ -1,12 +1,12 @@
 package com.wafflestudio.snutt.diary.repository
 
-import com.wafflestudio.snutt.diary.data.DiaryActivityType
+import com.wafflestudio.snutt.diary.data.DiaryActivity
 import org.springframework.data.repository.kotlin.CoroutineCrudRepository
 
-interface DiaryActivityTypeRepository : CoroutineCrudRepository<DiaryActivityType, String> {
-    suspend fun findAllByActiveTrue(): List<DiaryActivityType>
+interface DiaryActivityTypeRepository : CoroutineCrudRepository<DiaryActivity, String> {
+    suspend fun findAllByActiveTrue(): List<DiaryActivity>
 
-    suspend fun findByName(name: String): DiaryActivityType?
+    suspend fun findByName(name: String): DiaryActivity?
 
-    suspend fun findByNameIn(names: List<String>): List<DiaryActivityType>
+    suspend fun findByNameIn(names: List<String>): List<DiaryActivity>
 }

core/src/main/kotlin/diary/repository/DiaryQuestionRepository.kt

@@ -1,11 +1,11 @@
 package com.wafflestudio.snutt.diary.repository
 
-import com.wafflestudio.snutt.diary.data.DiaryActivityType
+import com.wafflestudio.snutt.diary.data.DiaryActivity
 import com.wafflestudio.snutt.diary.data.DiaryQuestion
 import org.springframework.data.repository.kotlin.CoroutineCrudRepository
 
 interface DiaryQuestionRepository : CoroutineCrudRepository<DiaryQuestion, String> {
-    suspend fun findByTargetActivityTypesContainsAndActiveTrue(activityTypes: List<DiaryActivityType>): List<DiaryQuestion>
+    suspend fun findByTargetActivityTypesContainsAndActiveTrue(activityTypes: List<DiaryActivity>): List<DiaryQuestion>
 
     suspend fun findAllByActiveTrue(): List<DiaryQuestion>
 

core/src/main/kotlin/diary/service/DiaryService.kt

@@ -2,7 +2,7 @@ package com.wafflestudio.snutt.diary.service
 
 import com.wafflestudio.snutt.common.exception.DiaryActivityTypeNotFoundException
 import com.wafflestudio.snutt.common.exception.DiaryQuestionNotFoundException
-import com.wafflestudio.snutt.diary.data.DiaryActivityType
+import com.wafflestudio.snutt.diary.data.DiaryActivity
 import com.wafflestudio.snutt.diary.data.DiaryQuestion
 import com.wafflestudio.snutt.diary.data.DiarySubmission
 import com.wafflestudio.snutt.diary.dto.DiaryShortQuestionReply
@@ -39,9 +39,9 @@ class DiaryService(
             .take(3)
     }
 
-    suspend fun getActiveActivityTypes(): List<DiaryActivityType> = diaryActivityTypeRepository.findAllByActiveTrue()
+    suspend fun getActiveActivityTypes(): List<DiaryActivity> = diaryActivityTypeRepository.findAllByActiveTrue()
 
-    suspend fun getAllActivityTypes(): List<DiaryActivityType> = diaryActivityTypeRepository.findAll().toList()
+    suspend fun getAllActivityTypes(): List<DiaryActivity> = diaryActivityTypeRepository.findAll().toList()
 
     suspend fun getActiveQuestions(): List<DiaryQuestion> = diaryQuestionRepository.findAllByActiveTrue()
 
@@ -90,7 +90,7 @@ class DiaryService(
     }
 
     suspend fun addOrEnableActivityType(name: String) {
-        val activityType = diaryActivityTypeRepository.findByName(name) ?: DiaryActivityType(name = name, active = true)
+        val activityType = diaryActivityTypeRepository.findByName(name) ?: DiaryActivity(name = name, active = true)
         activityType.active = true
         diaryActivityTypeRepository.save(activityType)
     }