Merge remote-tracking branch 'origin/master'

# Conflicts: # dodam-application/dodam-rest-api/src/main/java/b1nd/dodam/restapi/member/application/MemberQueryUseCase.java
Team-B1ND · Aug 22, 2024 · b1a2044 · b1a2044
2 parents afd8988 + 1f1e886
commit b1a2044
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/...-rest-api/src/main/java/b1nd/dodam/restapi/member/application/data/res/MemberInfoRes.java b/...-rest-api/src/main/java/b1nd/dodam/restapi/member/application/data/res/MemberInfoRes.java
@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 public record MemberInfoRes(
@@ -28,7 +29,7 @@ public record MemberInfoRes(
  @JsonSerialize(using = LocalDateTimeSerializer.class)
  @JsonDeserialize(using = LocalDateTimeDeserializer.class)
  LocalDateTime modifiedAt
-) {
+) implements Serializable {
  public static MemberInfoRes of(Member member, Student student, Teacher teacher) {
  return new MemberInfoRes(
  member.getId(),

diff --git a/...dam-rest-api/src/main/java/b1nd/dodam/restapi/member/application/data/res/StudentRes.java b/...dam-rest-api/src/main/java/b1nd/dodam/restapi/member/application/data/res/StudentRes.java
@@ -2,12 +2,14 @@
 
 import b1nd.dodam.domain.rds.member.entity.Student;
 
+import java.io.Serializable;
+
 public record StudentRes(
  int id,
  String name,
  Integer grade,
  Integer room,
- Integer number) {
+ Integer number) implements Serializable {
  public static StudentRes of(Student student) {
  if(student == null) {
  return null;

diff --git a/...dam-rest-api/src/main/java/b1nd/dodam/restapi/member/application/data/res/TeacherRes.java b/...dam-rest-api/src/main/java/b1nd/dodam/restapi/member/application/data/res/TeacherRes.java
@@ -2,7 +2,9 @@
 
 import b1nd.dodam.domain.rds.member.entity.Teacher;
 
-public record TeacherRes(String name, String tel, String position) {
+import java.io.Serializable;
+
+public record TeacherRes(String name, String tel, String position) implements Serializable {
  public static TeacherRes of(Teacher teacher) {
  if(teacher == null) {
  return null;

diff --git a/...dodam-rest-api/src/main/java/b1nd/dodam/restapi/member/presentation/MemberController.java b/...dodam-rest-api/src/main/java/b1nd/dodam/restapi/member/presentation/MemberController.java
@@ -92,7 +92,7 @@ public ResponseData<List<MemberInfoRes>> getDeactivateMembers() {
 
  @GetMapping("/all")
  public ResponseData<List<MemberInfoRes>> getAll() {
- return queryUseCase.getAll();
+ return ResponseData.ok("모든 멤버 정보 조회 성공", queryUseCase.getAll());
  }
 
  @GetMapping("/check/broadcast-club-member")