Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
ilyoil2 committed Sep 22, 2024
2 parents 8ce6bbb + de82bb0 commit 2e1d6c3
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 13 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
build
--build-cache
--no-daemon
--stacktrace
- name: Run Detekt Domain
run: ./gradlew :dms-core:detekt
run: ./gradlew :dms-core:detekt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import team.aliens.dms.domain.outing.spi.QueryOutingTypePort
import team.aliens.dms.domain.outing.spi.vo.CurrentOutingApplicationVO
import team.aliens.dms.domain.outing.spi.vo.OutingCompanionDetailsVO
import team.aliens.dms.domain.outing.spi.vo.OutingHistoryVO

import java.time.DayOfWeek
import java.time.LocalDate
import java.util.UUID
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package team.aliens.dms.domain.student.dto

import com.fasterxml.jackson.annotation.JsonCreator
import com.fasterxml.jackson.annotation.JsonIgnoreProperties
import com.fasterxml.jackson.annotation.JsonProperty
import team.aliens.dms.domain.manager.spi.vo.StudentWithTag
import team.aliens.dms.domain.student.model.Sex
import team.aliens.dms.domain.student.model.Student
Expand Down Expand Up @@ -46,17 +49,17 @@ data class StudentNameResponse(
val name: String
)

data class StudentDetailsResponse(
val id: UUID,
val name: String,
val gcn: String,
val profileImageUrl: String,
val sex: Sex? = null,
val bonusPoint: Int? = null,
val minusPoint: Int? = null,
val roomNumber: String? = null,
val roomMates: List<RoomMate>? = null,
val tags: List<TagResponse>? = null
data class StudentDetailsResponse @JsonCreator constructor(
@JsonProperty("id") val id: UUID,
@JsonProperty("name") val name: String,
@JsonProperty("gcn") val gcn: String,
@JsonProperty("profileImageUrl") val profileImageUrl: String,
@JsonProperty("sex") val sex: Sex? = null,
@JsonProperty("bonusPoint") val bonusPoint: Int? = null,
@JsonProperty("minusPoint") val minusPoint: Int? = null,
@JsonProperty("roomNumber") val roomNumber: String? = null,
@JsonProperty("roomMates") val roomMates: List<RoomMate>? = null,
@JsonProperty("tags") val tags: List<TagResponse>? = null
) {
data class RoomMate(
val id: UUID,
Expand Down

0 comments on commit 2e1d6c3

Please sign in to comment.