feat: 특정 방문 기록 삭제 API 구현 #26

.github/workflows/backend-ci-cd-dev.yml

@@ -0,0 +1,59 @@
+name: Backend CI/CD dev
+
+on:
+  push:
+    branches: [ "develop-be" ]
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        shell: bash
+        working-directory: ./backend
+
+    permissions:
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Setup with Gradle
+        uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
+
+      - name: Build with Gradle
+        run: ./gradlew clean build
+
+      - name: Login to Docker Hub
+        uses: docker/[email protected]
+        with:
+          username: ${{ secrets.DOCKERHUB_DEPLOY_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_DEPLOY_TOKEN }}
+
+      - name: Docker Image Build
+        run: |
+          docker build --platform linux/arm64 -t hotea990/staccato -f Dockerfile .
+
+      - name: Docker Hub Push
+        run: docker push hotea990/staccato
+
+  cd:
+    needs: ci
+    runs-on: self-hosted
+    steps:
+      - name: Pull Docker image
+        run: |
+          sudo docker login --username ${{ secrets.DOCKERHUB_DEPLOY_USERNAME }} --password ${{ secrets.DOCKERHUB_DEPLOY_TOKEN }}
+          sudo docker pull hotea990/staccato
+
+      - name: Docker Compose up
+        run: sudo docker-compose -f /home/ubuntu/staccato/docker-compose.yml up -d

backend/.gitignore

@@ -0,0 +1,7 @@
+.env
+
+.idea
+
+.gradle
+
+mysql

backend/Dockerfile

@@ -0,0 +1,5 @@
+FROM openjdk:17
+EXPOSE 8080
+ARG JAR_FILE=./build/libs/*-SNAPSHOT.jar
+COPY ${JAR_FILE} app.jar
+ENTRYPOINT ["java", "-jar","-Dspring.profiles.active=dev","app.jar"]

backend/build.gradle

@@ -29,8 +29,12 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	compileOnly 'org.projectlombok:lombok'
 	runtimeOnly 'com.h2database:h2'
+	runtimeOnly 'com.mysql:mysql-connector-j'
 	annotationProcessor 'org.projectlombok:lombok'
+
+	testImplementation 'io.rest-assured:rest-assured:5.3.1'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testImplementation 'io.rest-assured:rest-assured:5.3.1'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 

backend/docker-compose.yml

@@ -0,0 +1,35 @@
+version: "3.8"
+services:
+  database:
+    container_name: staccato-database
+    image: mysql:8.0.30
+    environment:
+      - MYSQL_DATABASE=staccato
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+    volumes:
+      - ./mysql:/var/lib/mysql
+    ports:
+      - "3306:3306"
+    restart: always
+    networks:
+      - springboot-mysql-network
+  application:
+    container_name: staccato-backend-app
+    image: ${STACCATO_IMAGE}
+    depends_on:
+      - database
+    environment:
+      - SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL}
+      - SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME}
+      - SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD}
+    ports:
+      - "80:8080"
+    restart: always
+    networks:
+      - springboot-mysql-network
+
+networks:
+  springboot-mysql-network:
+    driver: bridge

backend/src/main/java/com/staccato/StaccatoApplication.java

@@ -6,8 +6,8 @@
 @SpringBootApplication
 public class StaccatoApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(StaccatoApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(StaccatoApplication.class, args);
+    }
 
 }

backend/src/main/java/com/staccato/config/WebMvcConfig.java

@@ -0,0 +1,17 @@
+package com.staccato.config;
+
+import java.util.List;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import com.staccato.config.auth.MemberIdArgumentResolver;
+
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
+        resolvers.add(new MemberIdArgumentResolver());
+    }
+}

backend/src/main/java/com/staccato/config/auth/MemberId.java

@@ -0,0 +1,11 @@
+package com.staccato.config.auth;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MemberId {
+}

backend/src/main/java/com/staccato/config/auth/MemberIdArgumentResolver.java

@@ -0,0 +1,25 @@
+package com.staccato.config.auth;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+import org.springframework.core.MethodParameter;
+import org.springframework.http.HttpHeaders;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.ModelAndViewContainer;
+
+@Component
+public class MemberIdArgumentResolver implements HandlerMethodArgumentResolver {
+    @Override
+    public boolean supportsParameter(MethodParameter parameter) {
+        return parameter.hasParameterAnnotation(MemberId.class);
+    }
+
+    @Override
+    public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) {
+        HttpServletRequest request = (HttpServletRequest) webRequest.getNativeRequest();
+        return Long.parseLong(request.getHeader(HttpHeaders.AUTHORIZATION));
+    }
+}

backend/src/main/java/com/staccato/exception/GlobalExceptionHandler.java

@@ -1,17 +1,49 @@
 package com.staccato.exception;
 
 import java.time.format.DateTimeParseException;
+import java.util.Optional;
 
+import jakarta.validation.ConstraintViolationException;
+
+import org.springframework.context.support.DefaultMessageSourceResolvable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 @RestControllerAdvice
 public class GlobalExceptionHandler {
     @ExceptionHandler(DateTimeParseException.class)
-    public ResponseEntity<ExceptionResponse> handleDateTimeParseException(DateTimeParseException e) {
+    public ResponseEntity<ExceptionResponse> handleDateTimeParseException() {
         return ResponseEntity.badRequest()
                 .body(new ExceptionResponse(HttpStatus.BAD_REQUEST.toString(), "올바르지 않은 날짜 형식입니다."));
     }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<ExceptionResponse> handleValidationException(MethodArgumentNotValidException e) {
+        String message = Optional.ofNullable(e.getBindingResult().getFieldError())
+                .map(DefaultMessageSourceResolvable::getDefaultMessage)
+                .orElse("요청 형식이 잘못되었습니다.");
+        return ResponseEntity.badRequest()
+                .body(new ExceptionResponse(HttpStatus.BAD_REQUEST.toString(), message));
+    }
+
+    @ExceptionHandler(ConstraintViolationException.class)
+    public ResponseEntity<ExceptionResponse> handleConstraintViolationException(ConstraintViolationException e) {
+        return ResponseEntity.badRequest()
+                .body(new ExceptionResponse(HttpStatus.BAD_REQUEST.toString(), e.getMessage()));
+    }
+
+    @ExceptionHandler(StaccatoException.class)
+    public ResponseEntity<ExceptionResponse> handleStaccatoException(StaccatoException e) {
+        return ResponseEntity.badRequest()
+                .body(new ExceptionResponse(HttpStatus.BAD_REQUEST.toString(), e.getMessage()));
+    }
+
+    @ExceptionHandler(RuntimeException.class)
+    public ResponseEntity<ExceptionResponse> handleInternalServerErrorException() {
+        return ResponseEntity.internalServerError()
+                .body(new ExceptionResponse(HttpStatus.INTERNAL_SERVER_ERROR.toString(), "예기치 못한 서버 오류입니다. 다시 시도해주세요."));
+    }
 }

backend/src/main/java/com/staccato/exception/StaccatoException.java

@@ -0,0 +1,19 @@
+package com.staccato.exception;
+
+public class StaccatoException extends RuntimeException {
+    public StaccatoException() {
+        super();
+    }
+
+    public StaccatoException(String message) {
+        super(message);
+    }
+
+    public StaccatoException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public StaccatoException(Throwable cause) {
+        super(cause);
+    }
+}

backend/src/main/java/com/staccato/member/domain/Member.java

@@ -1,19 +1,27 @@
 package com.staccato.member.domain;
 
+import java.util.List;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 
 import org.hibernate.annotations.SQLDelete;
 
 import com.staccato.config.domain.BaseEntity;
+import com.staccato.travel.domain.TravelMember;
 
 import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.NonNull;
 
 @Entity
+@Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @SQLDelete(sql = "UPDATE member SET is_deleted = true WHERE id = ?")
 public class Member extends BaseEntity {
@@ -24,4 +32,10 @@ public class Member extends BaseEntity {
     private String nickname;
     @Column(columnDefinition = "TEXT")
     private String imageUrl;
+
+    @Builder
+    public Member(@NonNull String nickname, String imageUrl) {
+        this.nickname = nickname;
+        this.imageUrl = imageUrl;
+    }
 }

backend/src/main/java/com/staccato/member/repository/MemberRepository.java

@@ -0,0 +1,8 @@
+package com.staccato.member.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.staccato.member.domain.Member;
+
+public interface MemberRepository extends JpaRepository<Member, Long> {
+}

backend/src/main/java/com/staccato/pin/domain/Pin.java

@@ -11,7 +11,9 @@
 import com.staccato.config.domain.BaseEntity;
 
 import lombok.AccessLevel;
+import lombok.Builder;
 import lombok.NoArgsConstructor;
+import lombok.NonNull;
 
 @Entity
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -24,4 +26,10 @@ public class Pin extends BaseEntity {
     private String place;
     @Column(nullable = false)
     private String address;
+
+    @Builder
+    public Pin(@NonNull String place, @NonNull String address) {
+        this.place = place;
+        this.address = address;
+    }
 }

backend/src/main/java/com/staccato/pin/repository/PinRepository.java

@@ -0,0 +1,8 @@
+package com.staccato.pin.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.staccato.pin.domain.Pin;
+
+public interface PinRepository extends JpaRepository<Pin, Long> {
+}

backend/src/main/java/com/staccato/travel/controller/TravelController.java

@@ -1,9 +1,19 @@
 package com.staccato.travel.controller;
 
+import java.net.URI;
+
+import jakarta.validation.Valid;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.staccato.config.auth.MemberId;
 import com.staccato.travel.service.TravelService;
+import com.staccato.travel.service.dto.request.TravelRequest;
+import com.staccato.travel.service.dto.response.TravelResponse;
 
 import lombok.RequiredArgsConstructor;
 
@@ -12,4 +22,10 @@
 @RequiredArgsConstructor
 public class TravelController {
     private final TravelService travelService;
+
+    @PostMapping
+    public ResponseEntity<Void> createTravel(@Valid @RequestBody TravelRequest travelRequest, @MemberId Long memberId) {
+        TravelResponse travelResponse = travelService.createTravel(travelRequest, memberId);
+        return ResponseEntity.created(URI.create("/travels/" + travelResponse.travelId())).build();
+    }
 }