Skip to content

Commit 088d6f4

Browse files
committed
rename to targetActivityTypes
1 parent 25f097b commit 088d6f4

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ data class DiaryQuestion(
1111
val shortQuestion: String,
1212
val answers: List<String>,
1313
val shortAnswers: List<String>,
14-
val targetTopics: List<DiaryActivityType>,
14+
val targetActivityTypes: List<DiaryActivityType>,
1515
var active: Boolean = true,
1616
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.wafflestudio.snutt.diary.data.DiaryQuestion
55
import org.springframework.data.repository.kotlin.CoroutineCrudRepository
66

77
interface DiaryQuestionRepository : CoroutineCrudRepository<DiaryQuestion, String> {
8-
suspend fun findByTargetTopicsContainsAndActiveTrue(activityTypes: List<DiaryActivityType>): List<DiaryQuestion>
8+
suspend fun findByTargetActivityTypesContainsAndActiveTrue(activityTypes: List<DiaryActivityType>): List<DiaryQuestion>
99

1010
suspend fun findAllByActiveTrue(): List<DiaryQuestion>
1111

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import com.wafflestudio.snutt.diary.repository.DiaryActivityTypeRepository
1212
import com.wafflestudio.snutt.diary.repository.DiaryQuestionRepository
1313
import com.wafflestudio.snutt.diary.repository.DiarySubmissionRepository
1414
import com.wafflestudio.snutt.lectures.service.LectureService
15-
import kotlinx.coroutines.flow.map
1615
import kotlinx.coroutines.flow.toList
1716
import org.springframework.stereotype.Service
1817

@@ -29,7 +28,7 @@ class DiaryService(
2928
activityTypeNames: List<String>,
3029
): List<DiaryQuestion> {
3130
val activityTypes = diaryActivityTypeRepository.findByNameIn(activityTypeNames)
32-
val questions = diaryQuestionRepository.findByTargetTopicsContainsAndActiveTrue(activityTypes)
31+
val questions = diaryQuestionRepository.findByTargetActivityTypesContainsAndActiveTrue(activityTypes)
3332
val answeredQuestionIds =
3433
diarySubmissionRepository.findAllByUserIdOrderByCreatedAt(userId)
3534
.filter { it.lectureId == lectureId }
@@ -111,7 +110,7 @@ class DiaryService(
111110
shortAnswers = request.shortAnswers,
112111
question = request.question,
113112
shortQuestion = request.shortQuestion,
114-
targetTopics = diaryActivityTypeRepository.findByNameIn(request.targetActivityTypes),
113+
targetActivityTypes = diaryActivityTypeRepository.findByNameIn(request.targetActivityTypes),
115114
)
116115
diaryQuestionRepository.save(question)
117116
}

0 commit comments

Comments
 (0)