Merge pull request #21 from prgrms-web-devcourse-final-project/chore/git

Chore/git

Author: DooHyoJeong

.github/workflows/create-branch.yml

@@ -43,7 +43,10 @@ jobs:
           SANITIZED_TITLE=$(echo "$ISSUE_TITLE" | iconv -t ascii//translit | tr '[:upper:]' '[:lower:]' | tr -cs 'a-z0-9' '-')
           
           if [ -n "${{ steps.custom.outputs.custom_name }}" ]; then
-            BRANCH_NAME="${{ steps.prefix.outputs.prefix }}/${ISSUE_NUMBER}-${{ steps.custom.outputs.custom_name }}"
+            RAW_NAME="${{ steps.custom.outputs.custom_name }}"
+            # 앞뒤 공백 제거
+            CUSTOM_NAME=$(echo "$RAW_NAME" | xargs)
+            BRANCH_NAME="${{ steps.prefix.outputs.prefix }}/${ISSUE_NUMBER}-${CUSTOM_NAME}"
           else
             BRANCH_NAME="${{ steps.prefix.outputs.prefix }}/${ISSUE_NUMBER}-${SANITIZED_TITLE}"
           fi

backend/src/main/java/com/ai/lawyer/global/exception/GlobalExceptionHandler.java

@@ -1,7 +1,6 @@
 package com.ai.lawyer.global.exception;
 
 import com.ai.lawyer.global.exception.ServiceException;
-import com.ai.lawyer.global.rsData.RsData;
 import jakarta.validation.ConstraintViolationException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -23,100 +22,5 @@
 @RestControllerAdvice
 @RequiredArgsConstructor
 public class GlobalExceptionHandler {
-    @ExceptionHandler(NoSuchElementException.class)
-    public ResponseEntity<RsData<Void>> handle(NoSuchElementException ex) {
-        return new ResponseEntity<>(
-                new RsData<>(
-                        "404-1",
-                        "해당 데이터가 존재하지 않습니다."
-                ),
-                NOT_FOUND
-        );
-    }
 
-
-    @ExceptionHandler(ConstraintViolationException.class)
-    public ResponseEntity<RsData<Void>> handle(ConstraintViolationException ex) {
-        String message = ex.getConstraintViolations()
-                .stream()
-                .map(violation -> {
-                    String field = violation.getPropertyPath().toString().split("\\.", 2)[1];
-                    String[] messageTemplateBits = violation.getMessageTemplate()
-                            .split("\\.");
-                    String code = messageTemplateBits[messageTemplateBits.length - 2];
-                    String _message = violation.getMessage();
-
-                    return "%s-%s-%s".formatted(field, code, _message);
-                })
-                .sorted(Comparator.comparing(String::toString))
-                .collect(Collectors.joining("\n"));
-
-        return new ResponseEntity<>(
-                new RsData<>(
-                        "400-1",
-                        message
-                ),
-                BAD_REQUEST
-        );
-    }
-
-    @ExceptionHandler(MethodArgumentNotValidException.class)
-    public ResponseEntity<RsData<Void>> handle(MethodArgumentNotValidException ex) {
-        String message = ex.getBindingResult()
-                .getAllErrors()
-                .stream()
-                .filter(error -> error instanceof FieldError)
-                .map(error -> (FieldError) error)
-                .map(error -> error.getField() + "-" + error.getCode() + "-" + error.getDefaultMessage())
-                .sorted(Comparator.comparing(String::toString))
-                .collect(Collectors.joining("\n"));
-
-        return new ResponseEntity<>(
-                new RsData<>(
-                        "400-1",
-                        message
-                ),
-                BAD_REQUEST
-        );
-    }
-
-    @ExceptionHandler(HttpMessageNotReadableException.class)
-    public ResponseEntity<RsData<Void>> handle(HttpMessageNotReadableException ex) {
-        return new ResponseEntity<>(
-                new RsData<>(
-                        "400-1",
-                        "요청 본문이 올바르지 않습니다."
-                ),
-                BAD_REQUEST
-        );
-    }
-
-    @ExceptionHandler(MissingRequestHeaderException.class)
-    public ResponseEntity<RsData<Void>> handle(MissingRequestHeaderException ex) {
-        return new ResponseEntity<>(
-                new RsData<>(
-                        "400-1",
-                        "%s-%s-%s".formatted(
-                                ex.getHeaderName(),
-                                "NotBlank",
-                                ex.getLocalizedMessage()
-                        )
-                ),
-                BAD_REQUEST
-        );
-    }
-
-    @ExceptionHandler(ServiceException.class)
-    @ResponseStatus(BAD_REQUEST)
-    public ResponseEntity<RsData<Void>> handle(ServiceException ex) {
-        RsData<Void> rsData = ex.getRsData();
-
-        return new ResponseEntity<>(
-                rsData,
-                ResponseEntity
-                        .status(rsData.statusCode())
-                        .build()
-                        .getStatusCode()
-        );
-    }
 }

backend/src/main/java/com/ai/lawyer/global/exception/ServiceException.java

@@ -1,6 +1,5 @@
 package com.ai.lawyer.global.exception;
 
-import com.ai.lawyer.global.rsData.RsData;
 
 public class ServiceException extends RuntimeException {
     private final String resultCode;
@@ -12,7 +11,4 @@ public ServiceException(String resultCode, String msg) {
         this.msg = msg;
     }
 
-    public RsData<Void> getRsData() {
-        return new RsData<>(resultCode, msg, null);
-    }
 }