Textroad 13 script member mapping

src/main/java/com/example/Back/controller/ScriptController.java

@@ -29,16 +29,33 @@ public ResponseEntity<?> writeScript(@Valid @RequestBody ScriptRequestDto.Regist
         return scriptService.writeScript(script);
     }
 
+    // id 삭제
+    /*
+    @GetMapping
+    public ResponseEntity<?> readScript() {
+
+        return scriptService.getScriptContents();
+    }
+     */
+
+    // 특정 id를 가진 사람의 scripts들 모두
     @GetMapping("/{id}")
     public ResponseEntity<?> readScript(@PathVariable("id") Long id) {
-
         return scriptService.getScriptContents(id);
     }
 
+
+
     @DeleteMapping("/{id}")
     public ResponseEntity<?> deleteScript(@PathVariable Long id) {
         return scriptService.deleteScript(id);
     }
 
+    @GetMapping("/all/{socialId}")
+    public ResponseEntity<?> readAllScript(@PathVariable("socialId") String socialId) {
+
+        return scriptService.getAllScriptContents(socialId);
+    }
+
 
 }

src/main/java/com/example/Back/domain/Script.java

@@ -25,10 +25,10 @@ public class Script extends BaseEntity {
     @Column(name="script_id")
     private Long scriptId;
 
-    // @ManyToOne(fetch = FetchType.LAZY)
-    // @JoinColumn(name = "member_id")
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "member_id")
     // @JsonBackReference
-    // private Member memberId;
+    private Member memberId;
 
     @Column
     private String title;

src/main/java/com/example/Back/dto/request/ScriptRequestDto.java

@@ -13,17 +13,14 @@ public class ScriptRequestDto {
     @Setter
     public static class Register {
 
-        // @NotNull(message = "user id는 필수 입력값입니다.")
-        // private Long memberId;
+        @NotNull(message = "user id는 필수 입력값입니다.")
+        private String memberId;
 
         @NotNull(message = "title은 필수 입력값입니다.")
         private String script_title;
 
         private ArrayList<ParagraphReq> contents;
 
-        // @NotNull(message = "type은 필수 입력값입니다.")
-        // private String type;
-
     }
 
     @Getter
@@ -33,8 +30,7 @@ public static class Update {
         @NotNull(message = "title은 필수 입력값입니다.")
         private String title;
 
-        // @NotNull(message = "type은 필수 입력값입니다.")
-        // private String type;
+        private ArrayList<ParagraphReq> contents;
 
     }
 }

src/main/java/com/example/Back/dto/response/ScriptResponseDto.java

@@ -19,8 +19,7 @@ public class ScriptResponseDto {
     private static class Body {
 
         private String result;
-
-        private Long memberId;
+        private String socialId;
         private Long script_id;
         private String message;
 
@@ -32,7 +31,7 @@ private static class ScriptBody {
 
         private String result;
 
-        private Long memberId;
+        private String socialId;
         private Long script_id;
 
         private String script_title;
@@ -41,12 +40,29 @@ private static class ScriptBody {
 
     }
 
+    @Getter
+    @Builder
+    private static class ScriptBody2 {
+
+        private String result;
+
+        private String socialId;
+        private Long script_id;
+
+        private String script_title;
+        private int content_cnt;
+        private String content;
+
+        private LocalDateTime modified_date;
+
+    }
+
     // script 최초 생성
     public ResponseEntity<?> scriptCreateSuccess(Script script) {
 
         Body body = Body.builder()
                 .result("success")
-                // .memberId(script.getMemberId().getId())
+                .socialId(script.getMemberId().getSocialId())
                 .script_id(script.getScriptId())
                 .message("script가 성공적으로 저장되었습니다.")
                 .build();
@@ -58,7 +74,7 @@ public ResponseEntity<?> scriptDeleteSuccess(Script script) {
 
         Body body = Body.builder()
                 .result("success")
-                // .memberId(script.getMemberId().getId())
+                .socialId(script.getMemberId().getSocialId())
                 .script_id(script.getScriptId())
                 .message("script가 성공적으로 삭제되었습니다.")
                 .build();
@@ -82,10 +98,9 @@ public ResponseEntity<?> scriptSuccess(Script script) {
             contents.add(info);
         }
 
-
         ScriptBody body = ScriptBody.builder()
                 .result("success")
-                //.memberId(script.getMemberId().getId())
+                .socialId(script.getMemberId().getSocialId())
                 .script_id(script.getScriptId())
                 .script_title(script.getTitle())
                 .content_cnt(script.getCnt())
@@ -97,6 +112,23 @@ public ResponseEntity<?> scriptSuccess(Script script) {
         return ResponseEntity.ok(body);
     }
 
+    // script 전체 내용 1줄만 보여주기 보여주기
+    public ResponseEntity<?> scriptSuccess2(Script script) {
+
+        List<Paragraph> paragraphs = script.getParagraphs();
+
+        ScriptBody2 body = ScriptBody2.builder()
+                .result("success")
+                // .socialId(script.getMemberId().getSocialId())
+                .script_id(script.getScriptId())
+                .script_title(script.getTitle())
+                .content_cnt(script.getCnt())   // 페이지 개수
+                .content(paragraphs.get(0).getContents())
+                .modified_date(script.getModifiedDate())
+                .build();
+        return ResponseEntity.ok(body);
+    }
+
     /*
     public ResponseEntity<?> success(Script script) {
 

src/main/java/com/example/Back/exception/ResponseException.java

@@ -0,0 +1,12 @@
+package com.example.Back.exception;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class ResponseException extends Exception{ //사용자정의 예외 던지기 위함
+    private ResponseTemplateStatus status;
+}

src/main/java/com/example/Back/exception/ResponseTemplate.java

@@ -0,0 +1,37 @@
+package com.example.Back.exception;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+@JsonPropertyOrder({"isSuccess", "code", "message", "data"})
+public class ResponseTemplate<T> {
+
+    @JsonProperty("isSuccess")
+    private final Boolean isSuccess;
+    private final String message; //메시지 전달
+    private final int code; //내부 코드
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private T data;
+
+    //요청 성공 시
+    public ResponseTemplate(T data) {
+        this.isSuccess = ResponseTemplateStatus.SUCCESS.isSuccess();
+        this.message = ResponseTemplateStatus.SUCCESS.getMessage();
+        this.code = ResponseTemplateStatus.SUCCESS.getCode();
+        this.data = data;
+
+    }
+
+    //요청 실패시
+    public ResponseTemplate(ResponseTemplateStatus status) {
+        this.isSuccess = status.isSuccess();
+        this.message = status.getMessage();
+        this.code = status.getCode();
+    }
+}

src/main/java/com/example/Back/exception/ResponseTemplateStatus.java

@@ -0,0 +1,22 @@
+package com.example.Back.exception;
+
+import lombok.Getter;
+
+@Getter
+public enum ResponseTemplateStatus {
+    SUCCESS(true, "요청 성공", 1000),
+    FAIL(false, "요청 실패", 1004),
+
+    //4000: 유저 부분 오류
+    USER_NOT_FOUND(false, "유저를 찾을 수 없습니다.", 4005);
+
+    private final boolean isSuccess;
+    private final String message;
+    private final int code;
+
+    private ResponseTemplateStatus(boolean isSuccess, String message, int code){
+        this.isSuccess = isSuccess;
+        this.code = code;
+        this.message = message;
+    }
+}

src/main/java/com/example/Back/repository/Impl/AssessmentQuestionRepositoryImpl.java

@@ -7,6 +7,7 @@
 import java.util.List;
 
 import static com.example.Back.domain.QAssessmentQuestion.assessmentQuestion;
+// import static com.example.Back.domain.AssessmentQuestion.assessmentQuestion;
 
 public class AssessmentQuestionRepositoryImpl implements AssessmentQuestionRepositoryCustom {