Skip to content

Commit

Permalink
cascade 제거 (#321)
Browse files Browse the repository at this point in the history
* cascade 제거

* 이미지 제거 추가
  • Loading branch information
leeeryboy authored Sep 23, 2024
1 parent 2ded285 commit 20c134e
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import jakarta.persistence.*

@Entity(name = "about_language")
class AboutLanguageEntity(
@OneToOne(fetch = FetchType.LAZY, cascade = [CascadeType.ALL], orphanRemoval = true)
@OneToOne
@JoinColumn(name = "korean_id")
val koAbout: AboutEntity,

@OneToOne(fetch = FetchType.LAZY, cascade = [CascadeType.ALL], orphanRemoval = true)
@OneToOne
@JoinColumn(name = "english_id")
val enAbout: AboutEntity
) : BaseTimeEntity()
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ class AboutServiceImpl(
clubs.forEach { mainImageService.uploadMainImage(it, mainImage) }
}

aboutRepository.save(clubs[0])
aboutRepository.save(clubs[1])
aboutLanguageRepository.save(AboutLanguageEntity(clubs[0], clubs[1]))
}

Expand Down Expand Up @@ -187,6 +189,8 @@ class AboutServiceImpl(
}

aboutLanguageRepository.delete(aboutLanguage)
aboutRepository.delete(aboutLanguage.koAbout)
aboutRepository.delete(aboutLanguage.enAbout)
}

@Transactional(readOnly = true)
Expand Down Expand Up @@ -239,7 +243,8 @@ class AboutServiceImpl(
if (mainImage != null) {
facilities.forEach { mainImageService.uploadMainImage(it, mainImage) }
}

aboutRepository.save(facilities[0])
aboutRepository.save(facilities[1])
aboutLanguageRepository.save(AboutLanguageEntity(facilities[0], facilities[1]))
}

Expand Down Expand Up @@ -295,7 +300,13 @@ class AboutServiceImpl(
LanguageType.EN -> aboutLanguageRepository.findByEnAbout(facility)
}

aboutLanguageRepository.delete(facilityLanguage!!)
listOf(facilityLanguage!!.koAbout, facilityLanguage.enAbout).forEach {
it.mainImage?.let { image -> mainImageService.removeImage(image) }
}

aboutLanguageRepository.delete(facilityLanguage)
aboutRepository.delete(facilityLanguage.koAbout)
aboutRepository.delete(facilityLanguage.enAbout)
}

@Transactional(readOnly = true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import jakarta.persistence.*

@Entity(name = "scholarship_language")
class ScholarshipLanguageEntity(
@OneToOne(fetch = FetchType.LAZY, cascade = [CascadeType.ALL], orphanRemoval = true)
@OneToOne
@JoinColumn(name = "korean_id")
val koScholarship: ScholarshipEntity,

@OneToOne(fetch = FetchType.LAZY, cascade = [CascadeType.ALL], orphanRemoval = true)
@OneToOne
@JoinColumn(name = "english_id")
val enScholarship: ScholarshipEntity
) : BaseTimeEntity()
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,8 @@ class AcademicsServiceImpl(
academicsSearch = AcademicsSearchEntity.create(this)
}

scholarshipRepository.save(koScholarship)
scholarshipRepository.save(enScholarship)
scholarshipLanguageRepository.save(ScholarshipLanguageEntity(koScholarship, enScholarship))
}

Expand Down Expand Up @@ -465,6 +467,8 @@ class AcademicsServiceImpl(
}

scholarshipLanguageRepository.delete(scholarshipLanguage!!)
scholarshipRepository.delete(scholarshipLanguage.koScholarship)
scholarshipRepository.delete(scholarshipLanguage.enScholarship)
}

private fun makeStringToAcademicsStudentType(postType: String): AcademicsStudentType {
Expand Down

0 comments on commit 20c134e

Please sign in to comment.