🔀 merge pull request #14 from feature/entity

[Feature] Entity 추가 및 데이터명 수정

src/main/java/gdsc/sc/bsafe/domain/HelperGroup.java

@@ -0,0 +1,21 @@
+package gdsc.sc.bsafe.domain;
+
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Table(name= "helper_group")
+public class HelperGroup {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "helper_group_id")
+    private Long recordId;
+
+    @Column(nullable = false)
+    private String name;
+
+}

src/main/java/gdsc/sc/bsafe/domain/enums/Authority.java

@@ -8,7 +8,7 @@
 public enum Authority {
 
     USER ("ROLE_USER"),
-    VOLUNTEER ("ROLE_VOLUNTEER"),
+    HELPER ("ROLE_HELPER"),
     ADMIN("ROLE_ADMIN")
     ;
 

src/main/java/gdsc/sc/bsafe/domain/enums/HelperType.java

@@ -0,0 +1,15 @@
+package gdsc.sc.bsafe.domain.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum HelperType {
+
+    SINGLE("개인 봉사자"),
+    GROUP("기관 봉사자");
+
+    private String description;
+    HelperType(String description){this.description=description;}
+}

src/main/java/gdsc/sc/bsafe/domain/enums/RequestStatus.java

@@ -1,9 +1,9 @@
 package gdsc.sc.bsafe.domain.enums;
 
 public enum RequestStatus {
-    REQUESTED("요청"),
+    REQUEST("요청"),
     PROCEEDING("진행"),
-    COMPLETED("완료");
+    COMPLETE("완료");
 
     private String description;
     RequestStatus(String description){this.description=description;}

src/main/java/gdsc/sc/bsafe/domain/mapping/HelpRecord.java

@@ -19,8 +19,8 @@
 public class HelpRecord extends BaseTimeEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "help_id")
-    private Long helpId;
+    @Column(name = "help_record_id")
+    private Long helpRecordId;
 
     @ManyToOne
     @JoinColumn(name = "record_id", nullable = false)

src/main/java/gdsc/sc/bsafe/domain/mapping/HelperUser.java

@@ -0,0 +1,33 @@
+package gdsc.sc.bsafe.domain.mapping;
+
+import gdsc.sc.bsafe.domain.HelperGroup;
+import gdsc.sc.bsafe.domain.User;
+import gdsc.sc.bsafe.domain.common.BaseTimeEntity;
+import gdsc.sc.bsafe.domain.enums.HelperType;
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Table(name = "helper_user")
+public class HelperUser extends BaseTimeEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "helper_user_id")
+    private Long helperId;
+
+    @OneToOne
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
+
+    @Column(nullable = false)
+    private HelperType type;
+
+    @ManyToOne
+    @JoinColumn(name = "group_id", nullable = false)
+    private HelperGroup helperGroup;
+
+}

src/main/java/gdsc/sc/bsafe/repository/RecordRepository.java

@@ -11,5 +11,7 @@ public interface RecordRepository<T extends Record> extends JpaRepository<T, Lon
 
     @Override
     Optional<T> findById(Long recordId);
+
+
 }
 

src/main/java/gdsc/sc/bsafe/web/dto/response/AIRecordResponse.java

@@ -1,23 +1,20 @@
 package gdsc.sc.bsafe.web.dto.response;
 
 import gdsc.sc.bsafe.domain.enums.RecordType;
-import jakarta.persistence.Column;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
-@AllArgsConstructor
 @NoArgsConstructor
 public class AIRecordResponse {
-    private Long recordId;
+    private Long record_id;
 
     @Enumerated(value = EnumType.STRING)
     private RecordType type = RecordType.AI;
 
-    private Long userId;
+    private Long user_id;
 
     private String image;
 
@@ -29,4 +26,13 @@ public class AIRecordResponse {
 
     private Integer grade;
 
+    public AIRecordResponse(Long recordId, Long userId, String image, String title, String detail, String category, Integer grade) {
+        this.record_id = recordId;
+        this.user_id = userId;
+        this.image = image;
+        this.title = title;
+        this.detail = detail;
+        this.category = category;
+        this.grade = grade;
+    }
 }

src/main/java/gdsc/sc/bsafe/web/dto/response/BasicRecordResponse.java

@@ -9,14 +9,13 @@
 
 @Getter
 @NoArgsConstructor
-@AllArgsConstructor
 public class BasicRecordResponse {
-    private Long recordId;
+    private Long record_id;
 
     @Enumerated(value = EnumType.STRING)
     private RecordType type = RecordType.BASIC;
 
-    private Long userId;
+    private Long user_id;
 
     private String image;
 
@@ -26,4 +25,12 @@ public class BasicRecordResponse {
 
     private String category;
 
+    public BasicRecordResponse(Long recordId, Long userId, String image, String title, String detail, String category) {
+        this.record_id = recordId;
+        this.user_id = userId;
+        this.image = image;
+        this.title = title;
+        this.detail = detail;
+        this.category = category;
+    }
 }