Skip to content

Commit

Permalink
merge: (#763) 학생 목록 검색 에러 해결
Browse files Browse the repository at this point in the history
  • Loading branch information
4mjeo authored Sep 22, 2024
2 parents ce033fa + dfbbf1b commit 9fb2f83
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 88 deletions.
2 changes: 0 additions & 2 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,4 @@ object Dependencies {

// slack
const val SLACK = "com.slack.api:slack-api-client:${DependencyVersions.SLACK_VERSION}"

const val CACHE = "org.springframework.boot:spring-boot-starter-cache"
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
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 @@ -49,17 +46,17 @@ data class StudentNameResponse(
val name: String
)

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 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 RoomMate(
val id: UUID,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package team.aliens.dms.domain.tag.dto
import team.aliens.dms.domain.tag.model.Tag
import java.util.UUID


data class TagResponse(
val id: UUID,
val name: String?,
Expand Down
2 changes: 0 additions & 2 deletions dms-infrastructure/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ dependencies {
// notification
implementation(Dependencies.FCM)

//cache
implementation(Dependencies.CACHE)
}

tasks.getByName<Jar>("jar") {
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ import jakarta.validation.Valid
import jakarta.validation.constraints.Email
import jakarta.validation.constraints.NotBlank
import jakarta.validation.constraints.NotNull
import org.springframework.cache.annotation.CacheConfig
import org.springframework.cache.annotation.CacheEvict
import org.springframework.cache.annotation.Cacheable
import org.springframework.http.HttpStatus
import org.springframework.validation.annotation.Validated
import org.springframework.web.bind.annotation.DeleteMapping
Expand Down

0 comments on commit 9fb2f83

Please sign in to comment.