From 6370fdb51ffb6581a1ad9ef9b9ed814b10b21c40 Mon Sep 17 00:00:00 2001 From: SEO JOO WON <85955988+joowojr@users.noreply.github.com> Date: Tue, 23 Jan 2024 12:21:59 +0900 Subject: [PATCH 1/7] :sparkles: add Record Repositories --- .../sc/bsafe/repository/AIRecordRepository.java | 11 +++++++++++ .../sc/bsafe/repository/BasicRecordRepository.java | 12 ++++++++++++ .../sc/bsafe/repository/HelpRecordRepository.java | 12 ++++++++++++ .../gdsc/sc/bsafe/repository/RecordRepository.java | 14 ++++++++++++++ 4 files changed, 49 insertions(+) create mode 100644 src/main/java/gdsc/sc/bsafe/repository/AIRecordRepository.java create mode 100644 src/main/java/gdsc/sc/bsafe/repository/BasicRecordRepository.java create mode 100644 src/main/java/gdsc/sc/bsafe/repository/HelpRecordRepository.java create mode 100644 src/main/java/gdsc/sc/bsafe/repository/RecordRepository.java diff --git a/src/main/java/gdsc/sc/bsafe/repository/AIRecordRepository.java b/src/main/java/gdsc/sc/bsafe/repository/AIRecordRepository.java new file mode 100644 index 0000000..0e25ba3 --- /dev/null +++ b/src/main/java/gdsc/sc/bsafe/repository/AIRecordRepository.java @@ -0,0 +1,11 @@ +package gdsc.sc.bsafe.repository; + +import gdsc.sc.bsafe.domain.AIRecord; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface AIRecordRepository extends JpaRepository { + @Override + Optional findById(Long recordId); +} diff --git a/src/main/java/gdsc/sc/bsafe/repository/BasicRecordRepository.java b/src/main/java/gdsc/sc/bsafe/repository/BasicRecordRepository.java new file mode 100644 index 0000000..99dff12 --- /dev/null +++ b/src/main/java/gdsc/sc/bsafe/repository/BasicRecordRepository.java @@ -0,0 +1,12 @@ +package gdsc.sc.bsafe.repository; + +import gdsc.sc.bsafe.domain.BasicRecord; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface BasicRecordRepository extends JpaRepository { + + @Override + Optional findById(Long recordId); +} diff --git a/src/main/java/gdsc/sc/bsafe/repository/HelpRecordRepository.java b/src/main/java/gdsc/sc/bsafe/repository/HelpRecordRepository.java new file mode 100644 index 0000000..bea41b8 --- /dev/null +++ b/src/main/java/gdsc/sc/bsafe/repository/HelpRecordRepository.java @@ -0,0 +1,12 @@ +package gdsc.sc.bsafe.repository; + +import gdsc.sc.bsafe.domain.mapping.HelpRecord; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface HelpRecordRepository extends JpaRepository { + + @Override + Optional findById(Long helpId); +} diff --git a/src/main/java/gdsc/sc/bsafe/repository/RecordRepository.java b/src/main/java/gdsc/sc/bsafe/repository/RecordRepository.java new file mode 100644 index 0000000..b3614ea --- /dev/null +++ b/src/main/java/gdsc/sc/bsafe/repository/RecordRepository.java @@ -0,0 +1,14 @@ +package gdsc.sc.bsafe.repository; + +import gdsc.sc.bsafe.domain.Record; +import org.springframework.data.jpa.repository.JpaRepository; +import java.util.Optional; + +public interface RecordRepository extends JpaRepository { + + @Override + Optional findById(Long recordId); + + +} + From 9ec8d2d8134e99e485251bf77944fa4b8a300798 Mon Sep 17 00:00:00 2001 From: SEO JOO WON <85955988+joowojr@users.noreply.github.com> Date: Tue, 23 Jan 2024 12:23:17 +0900 Subject: [PATCH 2/7] :sparkles: add Record Responses --- .../web/dto/response/AIRecordResponse.java | 31 +++++++++++++++++++ .../web/dto/response/BasicRecordResponse.java | 29 +++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 src/main/java/gdsc/sc/bsafe/web/dto/response/AIRecordResponse.java create mode 100644 src/main/java/gdsc/sc/bsafe/web/dto/response/BasicRecordResponse.java diff --git a/src/main/java/gdsc/sc/bsafe/web/dto/response/AIRecordResponse.java b/src/main/java/gdsc/sc/bsafe/web/dto/response/AIRecordResponse.java new file mode 100644 index 0000000..a436f74 --- /dev/null +++ b/src/main/java/gdsc/sc/bsafe/web/dto/response/AIRecordResponse.java @@ -0,0 +1,31 @@ +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 +@NoArgsConstructor +@AllArgsConstructor +public class AIRecordResponse { + private Long recordId; + + @Enumerated(value = EnumType.STRING) + private RecordType type = RecordType.AI; + + private Long userId; + + private String image; + + private String title; + + private String detail; + + private String category; + + private Integer grade; +} diff --git a/src/main/java/gdsc/sc/bsafe/web/dto/response/BasicRecordResponse.java b/src/main/java/gdsc/sc/bsafe/web/dto/response/BasicRecordResponse.java new file mode 100644 index 0000000..2a3ca8e --- /dev/null +++ b/src/main/java/gdsc/sc/bsafe/web/dto/response/BasicRecordResponse.java @@ -0,0 +1,29 @@ +package gdsc.sc.bsafe.web.dto.response; + +import gdsc.sc.bsafe.domain.User; +import gdsc.sc.bsafe.domain.enums.RecordType; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +@AllArgsConstructor +public class BasicRecordResponse { + private Long recordId; + + @Enumerated(value = EnumType.STRING) + private RecordType type = RecordType.BASIC; + + private Long userId; + + private String image; + + private String title; + + private String detail; + + private String category; + +} From 8ba0d15f8448723cdd927fd6aeb89bde5d84dcef Mon Sep 17 00:00:00 2001 From: SEO JOO WON <85955988+joowojr@users.noreply.github.com> Date: Tue, 23 Jan 2024 12:23:44 +0900 Subject: [PATCH 3/7] :sparkles: add RecordType enum class --- src/main/java/gdsc/sc/bsafe/domain/enums/RecordType.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/main/java/gdsc/sc/bsafe/domain/enums/RecordType.java diff --git a/src/main/java/gdsc/sc/bsafe/domain/enums/RecordType.java b/src/main/java/gdsc/sc/bsafe/domain/enums/RecordType.java new file mode 100644 index 0000000..be73548 --- /dev/null +++ b/src/main/java/gdsc/sc/bsafe/domain/enums/RecordType.java @@ -0,0 +1,9 @@ +package gdsc.sc.bsafe.domain.enums; + +public enum RecordType { + AI("AI"), + BASIC("BASIC"); + + private String description; + RecordType(String description){this.description=description;} +} From 8ff9d11f572ba95a71ac8879b6ab0fcd8f0afa77 Mon Sep 17 00:00:00 2001 From: SEO JOO WON <85955988+joowojr@users.noreply.github.com> Date: Wed, 24 Jan 2024 01:04:03 +0900 Subject: [PATCH 4/7] :sparkles: add HelperUser entity --- .../gdsc/sc/bsafe/domain/enums/Authority.java | 2 +- .../sc/bsafe/domain/enums/HelperType.java | 15 +++++++++ .../sc/bsafe/domain/mapping/HelperUser.java | 33 +++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 src/main/java/gdsc/sc/bsafe/domain/enums/HelperType.java create mode 100644 src/main/java/gdsc/sc/bsafe/domain/mapping/HelperUser.java diff --git a/src/main/java/gdsc/sc/bsafe/domain/enums/Authority.java b/src/main/java/gdsc/sc/bsafe/domain/enums/Authority.java index 056fdfc..93eb3d6 100644 --- a/src/main/java/gdsc/sc/bsafe/domain/enums/Authority.java +++ b/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") ; diff --git a/src/main/java/gdsc/sc/bsafe/domain/enums/HelperType.java b/src/main/java/gdsc/sc/bsafe/domain/enums/HelperType.java new file mode 100644 index 0000000..11d0be0 --- /dev/null +++ b/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;} +} diff --git a/src/main/java/gdsc/sc/bsafe/domain/mapping/HelperUser.java b/src/main/java/gdsc/sc/bsafe/domain/mapping/HelperUser.java new file mode 100644 index 0000000..a53447f --- /dev/null +++ b/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; + +} From 6a4ae44caedc908990e29ee5dc0dcc365c0eb41d Mon Sep 17 00:00:00 2001 From: SEO JOO WON <85955988+joowojr@users.noreply.github.com> Date: Wed, 24 Jan 2024 01:04:36 +0900 Subject: [PATCH 5/7] :sparkles: add HelperGroup entity --- .../gdsc/sc/bsafe/domain/HelperGroup.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/main/java/gdsc/sc/bsafe/domain/HelperGroup.java diff --git a/src/main/java/gdsc/sc/bsafe/domain/HelperGroup.java b/src/main/java/gdsc/sc/bsafe/domain/HelperGroup.java new file mode 100644 index 0000000..540d2b3 --- /dev/null +++ b/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; + +} From 3978f46998db42719b1259d2c1cb0757dc5ad951 Mon Sep 17 00:00:00 2001 From: SEO JOO WON <85955988+joowojr@users.noreply.github.com> Date: Wed, 24 Jan 2024 01:05:50 +0900 Subject: [PATCH 6/7] :pencil2: fix 'VOLUNTEER' to 'HELPER' --- src/main/java/gdsc/sc/bsafe/domain/enums/RequestStatus.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/gdsc/sc/bsafe/domain/enums/RequestStatus.java b/src/main/java/gdsc/sc/bsafe/domain/enums/RequestStatus.java index 37dd31e..5254bfd 100644 --- a/src/main/java/gdsc/sc/bsafe/domain/enums/RequestStatus.java +++ b/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;} From 98f0638607ecb8d163b9fc7edf1c368ecb7f81ec Mon Sep 17 00:00:00 2001 From: SEO JOO WON <85955988+joowojr@users.noreply.github.com> Date: Wed, 24 Jan 2024 01:06:38 +0900 Subject: [PATCH 7/7] :pencil2: fix variable name --- .../sc/bsafe/domain/mapping/HelpRecord.java | 4 ++-- .../web/dto/response/AIRecordResponse.java | 19 +++++++++++-------- .../web/dto/response/BasicRecordResponse.java | 13 ++++++++++--- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/main/java/gdsc/sc/bsafe/domain/mapping/HelpRecord.java b/src/main/java/gdsc/sc/bsafe/domain/mapping/HelpRecord.java index 72f6233..02da650 100644 --- a/src/main/java/gdsc/sc/bsafe/domain/mapping/HelpRecord.java +++ b/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) diff --git a/src/main/java/gdsc/sc/bsafe/web/dto/response/AIRecordResponse.java b/src/main/java/gdsc/sc/bsafe/web/dto/response/AIRecordResponse.java index 6bbc2d6..47e6803 100644 --- a/src/main/java/gdsc/sc/bsafe/web/dto/response/AIRecordResponse.java +++ b/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; @@ -28,8 +25,14 @@ public class AIRecordResponse { private String category; private Integer grade; -<<<<<<< HEAD -======= ->>>>>>> origin/develop + 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; + } } diff --git a/src/main/java/gdsc/sc/bsafe/web/dto/response/BasicRecordResponse.java b/src/main/java/gdsc/sc/bsafe/web/dto/response/BasicRecordResponse.java index 2a3ca8e..7104407 100644 --- a/src/main/java/gdsc/sc/bsafe/web/dto/response/BasicRecordResponse.java +++ b/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; + } }