Skip to content

Commit

Permalink
Merge pull request #174 from GSM-MSG/delete/dream_book
Browse files Browse the repository at this point in the history
πŸ”€ :: 173 - ν•™μƒμ—μ„œ λ“œλ¦ΌλΆ 정보 μ‚­μ œ
  • Loading branch information
Huuuunee authored Aug 17, 2023
2 parents 4801c48 + d0103ca commit b3c852d
Show file tree
Hide file tree
Showing 14 changed files with 2 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ data class SignUpRequestData(
val region: List<String>,
val salary: Int,
val languageCertificate: List<LanguageCertificateRequestData>,
val dreamBookFileUrl: String,
val militaryService: MilitaryService,
val certificate: List<String>,
val projects: List<ProjectRequestData>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ import team.msg.sms.domain.student.model.Department
import team.msg.sms.domain.student.model.FormOfEmployment
import team.msg.sms.domain.student.model.MilitaryService

class DetailStudentInfoTeacherResponseData(
data class DetailStudentInfoTeacherResponseData(
val name: String,
val introduce: String,
val dreamBookFileUrl: String?,
val portfolioUrl: String?,
val grade: Int,
val classNum: Int,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ data class Student(
val gsmAuthenticationScore: Int,
val militaryService: MilitaryService,
val portfolioUrl: String?,
val dreamBookFileUrl: String?,
val salary: Int,
val profileImgUrl: String,
val userId: UUID
Expand All @@ -30,7 +29,6 @@ data class Student(
val gsmAuthenticationScore: Int,
val militaryService: MilitaryService,
val portfolioUrl: String?,
val dreamBookFileUrl: String?,
val salary: Int,
val name: String,
val profileImgUrl: String,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ class SignUpUseCase(
contactEmail = signUpData.contactEmail,
major = signUpData.major,
portfolioUrl = signUpData.portfolioUrl,
dreamBookFileUrl = signUpData.dreamBookFileUrl,
gsmAuthenticationScore = signUpData.gsmAuthenticationScore,
salary = signUpData.salary,
formOfEmployment = signUpData.formOfEmployment,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ class StudentInfoTeacherUseCase(
return DetailStudentInfoTeacherResponseData(
name = student.name,
introduce = student.introduce,
dreamBookFileUrl = student.dreamBookFileUrl,
portfolioUrl = student.portfolioUrl,
grade = student.stuNum.substring(0, 1).toInt(),
classNum = student.stuNum.substring(1, 2).toInt(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import team.msg.sms.domain.student.model.MilitaryService
data class UserProfileDetailResponseData(
val name: String,
val introduce: String,
val dreamBookFileUrl: String?,
val portfolioUrl: String?,
val grade: Int,
val classNum: Int,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ class QueryCurrentUserProfileDetailUseCase(
UserProfileDetailResponseData(
name = student.name,
introduce = student.introduce,
dreamBookFileUrl = student.dreamBookFileUrl,
portfolioUrl = student.portfolioUrl,
grade = student.stuNum.substring(0, 1).toInt(),
classNum = student.stuNum.substring(1, 2).toInt(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ class StudentJpaEntity(
@Column(nullable = true)
val portfolioUrl: String?,

@Column(nullable = true)
val dreamBookFileUrl: String?,

@Enumerated(EnumType.STRING)
@Column
val formOfEmployment: FormOfEmployment,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ fun StudentJpaEntity.toDomain() =
contactEmail = contactEmail,
major = major,
portfolioUrl = portfolioUrl,
dreamBookFileUrl = dreamBookFileUrl,
gsmAuthenticationScore = gsmAuthenticationScore,
salary = salary,
formOfEmployment = formOfEmployment,
Expand All @@ -31,7 +30,6 @@ fun Student.toEntity(
contactEmail = contactEmail,
major = major,
portfolioUrl = portfolioUrl,
dreamBookFileUrl = dreamBookFileUrl,
gsmAuthenticationScore = gsmAuthenticationScore,
salary = salary,
formOfEmployment = formOfEmployment,
Expand All @@ -53,7 +51,6 @@ fun StudentJpaEntity.toDomainWithUserInfo(): Student.StudentWithUserInfo =
gsmAuthenticationScore = gsmAuthenticationScore,
militaryService = militaryService,
portfolioUrl = portfolioUrl,
dreamBookFileUrl = dreamBookFileUrl,
salary = salary,
name = user.name,
profileImgUrl = profileImgUrl,
Expand Down Expand Up @@ -82,7 +79,6 @@ fun Student.StudentWithUserInfo.toEntity(user: UserJpaEntity): StudentJpaEntity
contactEmail = contactEmail,
major = major,
portfolioUrl = portfolioUrl,
dreamBookFileUrl = dreamBookFileUrl,
gsmAuthenticationScore = gsmAuthenticationScore,
salary = salary,
formOfEmployment = formOfEmployment,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ class StudentWebAdapter(
department = this.department,
major = this.major,
profileImg = this.profileImg,
dreamBookFileUrl = this.dreamBookFileUrl,
contactEmail = this.contactEmail,
studentTechStacks = this.studentTechStacks,
formOfEmployment = this.formOfEmployment,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ data class SignUpWebRequest(

val languageCertificate: List<LanguageCertificateWebRequest>,

@field:NotBlank
@field:Pattern(regexp = "^https://.*")
val dreamBookFileUrl: String,

val militaryService: MilitaryService,

val certificate: List<String>,
Expand All @@ -64,7 +60,6 @@ data class SignUpWebRequest(
region = region,
salary = salary,
languageCertificate = languageCertificate.map { it.toData() },
dreamBookFileUrl = dreamBookFileUrl,
militaryService = militaryService,
certificate = certificate,
projects = projects,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ import team.msg.sms.domain.student.model.Department
import team.msg.sms.domain.student.model.FormOfEmployment
import team.msg.sms.domain.student.model.MilitaryService

class DetailStudentInfoTeacherWebResponse(
data class DetailStudentInfoTeacherWebResponse(
val name: String,
val introduce: String,
val dreamBookFileUrl: String?,
val portfolioUrl: String?,
val grade: Int,
val classNum: Int,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ class UserWebAdapter(
UserProfileDetailWebResponse(
name = this.name,
introduce = this.introduce,
dreamBookFileUrl = this.dreamBookFileUrl,
portfolioUrl = this.portfolioUrl,
grade = this.grade,
classNum = this.classNum,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import team.msg.sms.domain.student.model.MilitaryService
data class UserProfileDetailWebResponse(
val name: String,
val introduce: String,
val dreamBookFileUrl: String?,
val portfolioUrl: String?,
val grade: Int,
val classNum: Int,
Expand Down

0 comments on commit b3c852d

Please sign in to comment.