From cab11aed401a259e9e69098319190f2158013405 Mon Sep 17 00:00:00 2001 From: shkisme Date: Fri, 23 Dec 2022 09:00:41 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20CtfChallengeHasCtfChallengeCategoryList?= =?UTF-8?q?=20=EC=97=90=20Entity=EB=A5=BC=20add=20=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=B6=94=EA=B0=80=20issue:=20#47?= =?UTF-8?q?1=20pr:=20#472?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../homepage/ctf/entity/CtfChallengeEntity.java | 5 +++++ .../homepage/ctf/service/CtfAdminService.java | 12 +++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/keeper/project/homepage/ctf/entity/CtfChallengeEntity.java b/src/main/java/keeper/project/homepage/ctf/entity/CtfChallengeEntity.java index df79af77..873dcc6b 100644 --- a/src/main/java/keeper/project/homepage/ctf/entity/CtfChallengeEntity.java +++ b/src/main/java/keeper/project/homepage/ctf/entity/CtfChallengeEntity.java @@ -60,6 +60,7 @@ public class CtfChallengeEntity { @Builder.Default @OneToMany(mappedBy = "challenge", cascade = CascadeType.REMOVE) List ctfChallengeHasCtfChallengeCategoryList = new ArrayList<>(); + @Column(nullable = false) @Setter Long score; @@ -89,4 +90,8 @@ public class CtfChallengeEntity { @PrimaryKeyJoinColumn @Setter CtfDynamicChallengeInfoEntity dynamicChallengeInfoEntity; + + public void addCtfChallengeHasCtfChallengeCategory(CtfChallengeHasCtfChallengeCategoryEntity ctfChallengeHasCtfChallengeCategoryEntity) { + this.getCtfChallengeHasCtfChallengeCategoryList().add(ctfChallengeHasCtfChallengeCategoryEntity); + } } diff --git a/src/main/java/keeper/project/homepage/ctf/service/CtfAdminService.java b/src/main/java/keeper/project/homepage/ctf/service/CtfAdminService.java index 15225481..8d7ef33b 100644 --- a/src/main/java/keeper/project/homepage/ctf/service/CtfAdminService.java +++ b/src/main/java/keeper/project/homepage/ctf/service/CtfAdminService.java @@ -5,9 +5,7 @@ import static keeper.project.homepage.util.service.CtfUtilService.VIRTUAL_TEAM_ID; import java.nio.file.AccessDeniedException; -import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import keeper.project.homepage.ctf.dto.CtfChallengeAdminDto; import keeper.project.homepage.ctf.dto.CtfChallengeCategoryDto; @@ -338,17 +336,17 @@ private CtfChallengeEntity createChallengeEntityWithFileEntity( private void setChallengeCategory(CtfChallengeEntity challenge, CtfChallengeAdminDto challengeAdminDto) { - List ctfChallengeCategoryEntityList = challengeAdminDto.getCategory() + List ctfChallengeCategoryEntityList = challengeAdminDto.getCategories() .stream() .map(CtfChallengeCategoryDto::toEntity).toList(); for (CtfChallengeCategoryEntity ctfChallengeCategory : ctfChallengeCategoryEntityList) { - CtfChallengeHasCtfChallengeCategoryEntity save = ctfChallengeHasCtfChallengeCategoryRepository.save( - CtfChallengeHasCtfChallengeCategoryEntity.builder() + challenge.addCtfChallengeHasCtfChallengeCategory(ctfChallengeHasCtfChallengeCategoryRepository + .save(CtfChallengeHasCtfChallengeCategoryEntity + .builder() .challenge(challenge) .category(ctfChallengeCategory) - .build()); - challenge.getCtfChallengeHasCtfChallengeCategoryList().add(save); + .build())); } }