refactor: Archive 관련 매핑 테이블 추상 클래스 삭제 & SharingArchive 매핑 테이블 연동.

Author: Kimgooner

src/main/java/org/tuna/zoopzoop/backend/domain/archive/archive/entity/Archive.java

@@ -1,12 +1,10 @@
 package org.tuna.zoopzoop.backend.domain.archive.archive.entity;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Inheritance;
-import jakarta.persistence.InheritanceType;
+import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.tuna.zoopzoop.backend.domain.archive.archive.enums.ArchiveType;
 import org.tuna.zoopzoop.backend.global.jpa.entity.BaseEntity;
 
 @Getter
@@ -16,9 +14,10 @@
 @Inheritance(strategy = InheritanceType.JOINED)
 public class Archive extends BaseEntity {
     @Column
-    private String archiveType;
+    @Enumerated(EnumType.STRING)
+    private ArchiveType archiveType;
 
-    public Archive(String archiveType) {
+    public Archive(ArchiveType archiveType) {
         this.archiveType = archiveType;
     }
 }

src/main/java/org/tuna/zoopzoop/backend/domain/archive/archive/entity/ArchiveMapping.java

@@ -1,24 +1,31 @@
 package org.tuna.zoopzoop.backend.domain.archive.archive.entity;
 
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.OneToOne;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.tuna.zoopzoop.backend.domain.archive.archive.enums.ArchiveType;
 import org.tuna.zoopzoop.backend.domain.member.entity.Member;
+import org.tuna.zoopzoop.backend.global.jpa.entity.BaseEntity;
 
 @Getter
 @Setter
 @Entity
 @NoArgsConstructor
-public class PersonalArchive extends ArchiveMapping {
+public class PersonalArchive extends BaseEntity {
+    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true)
+    @JoinColumn(name = "archive_id", nullable = false)
+    public Archive archive;
+
     @OneToOne
     @JoinColumn(name = "member_id", nullable = false)
     private Member member;
 
     public PersonalArchive(Member member) {
         this.member = member;
-        this.archive = new Archive("개인");
+        this.archive = new Archive(ArchiveType.PERSONAL);
     }
 }

src/main/java/org/tuna/zoopzoop/backend/domain/archive/archive/entity/PersonalArchive.java

@@ -1,17 +1,31 @@
 package org.tuna.zoopzoop.backend.domain.archive.archive.entity;
 
-import jakarta.persistence.*;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.tuna.zoopzoop.backend.domain.archive.archive.enums.ArchiveType;
 import org.tuna.zoopzoop.backend.domain.space.space.entity.Space;
+import org.tuna.zoopzoop.backend.global.jpa.entity.BaseEntity;
 
 @Getter
 @Setter
 @Entity
 @NoArgsConstructor
-public class SharingArchive extends ArchiveMapping {
+public class SharingArchive extends BaseEntity {
+    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true)
+    @JoinColumn(name = "archive_id", nullable = false)
+    public Archive archive;
+
     @OneToOne
     @JoinColumn(name = "space_id", nullable = false)
     private Space space;
+
+    public SharingArchive(Space space) {
+        this.space = space;
+        this.archive = new Archive(ArchiveType.SHARED);
+    }
 }

src/main/java/org/tuna/zoopzoop/backend/domain/archive/archive/entity/SharingArchive.java

@@ -0,0 +1,7 @@
+package org.tuna.zoopzoop.backend.domain.space.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.tuna.zoopzoop.backend.domain.space.space.entity.Space;
+
+public interface SpaceRepository extends JpaRepository<Space, Integer> {
+}

src/main/java/org/tuna/zoopzoop/backend/domain/space/repository/SpaceRepository.java

@@ -1,13 +1,10 @@
 package org.tuna.zoopzoop.backend.domain.space.space.entity;
 
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
+import jakarta.persistence.*;
 import lombok.Builder;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.tuna.zoopzoop.backend.domain.archive.archive.entity.SharingArchive;
 import org.tuna.zoopzoop.backend.domain.space.membership.entity.MemberShip;
 import org.tuna.zoopzoop.backend.global.jpa.entity.BaseEntity;
 
@@ -16,7 +13,6 @@
 @Getter
 @Setter
 @Entity
-@NoArgsConstructor
 public class Space extends BaseEntity {
     //Space 이름
     @Column(unique = true, nullable = false)
@@ -27,14 +23,22 @@ public class Space extends BaseEntity {
     @Column(nullable = false)
     private boolean active = true;
 
+    @OneToOne(mappedBy = "space", cascade = CascadeType.ALL, orphanRemoval = true)
+    private SharingArchive sharingArchive;
+
     //연결된 MemberShip
     //Space 삭제시 cascade.all
     @OneToMany(mappedBy = "space", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<MemberShip> memberShips;
 
+    public Space() {
+        this.sharingArchive = new SharingArchive(this);
+    }
+
     @Builder
     public Space(String name, Boolean active) {
         this.name = name;
         this.active = active;
+        this.sharingArchive = new SharingArchive(this);
     }
 }

src/main/java/org/tuna/zoopzoop/backend/domain/space/space/entity/Space.java

@@ -10,11 +10,14 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.tuna.zoopzoop.backend.domain.member.entity.Member;
 import org.tuna.zoopzoop.backend.domain.member.repository.MemberRepository;
+import org.tuna.zoopzoop.backend.domain.space.repository.SpaceRepository;
+import org.tuna.zoopzoop.backend.domain.space.space.entity.Space;
 
 @Configuration
 @RequiredArgsConstructor
 public class BaseInitData {
     private final MemberRepository memberRepository;
+    private final SpaceRepository spaceRepository;
 
     @Autowired
     @Lazy
@@ -43,8 +46,21 @@ public void initalizeData() {
                     .profileImageUrl("https://example.com/bob.png")
                     .build();
 
+            Space space1 = Space.builder()
+                    .name("Space1")
+                    .active(true)
+                    .build();
+
+            Space space2 = Space.builder()
+                    .name("Space2")
+                    .active(true)
+                    .build();
+
             memberRepository.save(member1);
             memberRepository.save(member2);
+
+            spaceRepository.save(space1);
+            spaceRepository.save(space2);
         } catch (Exception e) {
             System.err.println("초기 데이터 생성 중 오류 발생: " + e.getMessage());
         }