From fdceae13c7a9e59997656fe99737bea85efb4671 Mon Sep 17 00:00:00 2001
From: gosu <q63530@naver.com>
Date: Fri, 31 May 2024 17:38:06 +0900
Subject: [PATCH] =?UTF-8?q?[fix]=20:=20group=20=EA=B6=8C=ED=95=9C=20?=
=?UTF-8?q?=EC=B2=B4=ED=81=AC=20=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../jolvre/group/entity/GroupExhibit.java | 7 ++-
.../example/jolvre/group/entity/Manager.java | 43 -------------------
.../group/repository/ManagerRepository.java | 7 ---
.../group/GroupExhibitServiceTest.java | 2 -
4 files changed, 3 insertions(+), 56 deletions(-)
delete mode 100644 src/main/java/com/example/jolvre/group/entity/Manager.java
delete mode 100644 src/main/java/com/example/jolvre/group/repository/ManagerRepository.java
diff --git a/src/main/java/com/example/jolvre/group/entity/GroupExhibit.java b/src/main/java/com/example/jolvre/group/entity/GroupExhibit.java
index ed87aeb..35c175c 100644
--- a/src/main/java/com/example/jolvre/group/entity/GroupExhibit.java
+++ b/src/main/java/com/example/jolvre/group/entity/GroupExhibit.java
@@ -1,7 +1,6 @@
package com.example.jolvre.group.entity;
import com.example.jolvre.common.entity.BaseTimeEntity;
-import com.example.jolvre.common.error.user.UserNotFoundException;
import com.example.jolvre.exhibition.entity.Exhibit;
import com.example.jolvre.group.dto.GroupExhibitDTO.GroupUpdateRequest;
import com.example.jolvre.user.entity.User;
@@ -61,7 +60,7 @@ public GroupExhibit(String name, String period, String selectedItem, String intr
this.introduction = introduction;
this.thumbnail = thumbnail;
}
-
+
public void addMember(Member member) {
member.setGroupExhibit(this);
this.members.add(member);
@@ -75,7 +74,7 @@ public void addExhibit(RegisteredExhibit exhibit) {
public boolean checkManager(User user) {
Member userMember = this.getMembers().stream()
.filter(member -> Objects.equals(member.getUser().getId(), user.getId())).findFirst()
- .orElseThrow(UserNotFoundException::new);
+ .orElse(Member.builder().build());
return userMember.getGroupRole() == GroupRole.MANAGER;
}
@@ -83,7 +82,7 @@ public boolean checkManager(User user) {
public boolean checkMember(User user) {
Member userMember = this.getMembers().stream()
.filter(member -> Objects.equals(member.getUser().getId(), user.getId())).findFirst()
- .orElseThrow(UserNotFoundException::new);
+ .orElse(Member.builder().build());
return userMember.getGroupRole() == GroupRole.MEMBER;
}
diff --git a/src/main/java/com/example/jolvre/group/entity/Manager.java b/src/main/java/com/example/jolvre/group/entity/Manager.java
deleted file mode 100644
index 8da6419..0000000
--- a/src/main/java/com/example/jolvre/group/entity/Manager.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.example.jolvre.group.entity;
-
-import com.example.jolvre.user.entity.User;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@Entity
-@Getter
-@AllArgsConstructor
-@NoArgsConstructor
-@Setter
-public class Manager {
-
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name = "manager_id")
- private Long id;
-
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "user_id")
- private User user;
-
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "group_exhibit_id")
- private GroupExhibit groupExhibit;
-
- @Builder
- public Manager(User user, GroupExhibit groupExhibit) {
- this.user = user;
- this.groupExhibit = groupExhibit;
- }
-}
diff --git a/src/main/java/com/example/jolvre/group/repository/ManagerRepository.java b/src/main/java/com/example/jolvre/group/repository/ManagerRepository.java
deleted file mode 100644
index 7681d8c..0000000
--- a/src/main/java/com/example/jolvre/group/repository/ManagerRepository.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.example.jolvre.group.repository;
-
-import com.example.jolvre.group.entity.Manager;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface ManagerRepository extends JpaRepository<Manager, Long> {
-}
diff --git a/src/test/java/service/group/GroupExhibitServiceTest.java b/src/test/java/service/group/GroupExhibitServiceTest.java
index f4ef80f..df17caf 100644
--- a/src/test/java/service/group/GroupExhibitServiceTest.java
+++ b/src/test/java/service/group/GroupExhibitServiceTest.java
@@ -13,10 +13,8 @@
import com.example.jolvre.group.dto.GroupExhibitDTO.GroupExhibitInfoResponses;
import com.example.jolvre.group.dto.GroupExhibitDTO.GroupExhibitUserResponses;
import com.example.jolvre.group.entity.GroupExhibit;
-import com.example.jolvre.group.entity.Manager;
import com.example.jolvre.group.entity.Member;
import com.example.jolvre.group.repository.GroupExhibitRepository;
-import com.example.jolvre.group.repository.ManagerRepository;
import com.example.jolvre.group.repository.MemberRepository;
import com.example.jolvre.group.service.GroupExhibitService;
import com.example.jolvre.user.entity.User;