Hubobe 51 be 포토 포인트

.github/workflows/opened-pr-test.yml

@@ -12,7 +12,136 @@ jobs:
   test:
     runs-on: ubuntu-latest
 
+    services:
+      mysql:
+        image: mysql:8.0.33
+        env:
+          MYSQL_DATABASE: ${{ secrets.MYSQL_DATABASE }}
+          MYSQL_ROOT_HOST: '%'
+          MYSQL_ROOT_PASSWORD: ${{ secrets.MYSQL_ROOT_PASSWORD }}
+          TZ: Asia/Seoul
+          MYSQL_CHARACTER_SET_SERVER: utf8mb4
+          MYSQL_COLLATION_SERVER: utf8mb4_unicode_ci
+        ports:
+          - 3306:3306
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
+
+      redis:
+        image: redis:latest
+        ports:
+          - 6379:6379
+
+      elasticsearch:
+        image: docker.elastic.co/elasticsearch/elasticsearch:8.5.3
+        env:
+          discovery.type: single-node
+          xpack.security.enabled: true
+          ELASTIC_PASSWORD: ${{ secrets.MYSQL_ROOT_PASSWORD }}
+          xpack.security.authc.api_key.enabled: true
+          xpack.security.transport.ssl.enabled: false
+        ports:
+          - 9200:9200
+
+      mongodb:
+        image: mongo:latest
+        env:
+          MONGO_INITDB_ROOT_USERNAME: ${{ secrets.MONGO_ROOT_USERNAME }}
+          MONGO_INITDB_ROOT_PASSWORD: ${{ secrets.MONGO_ROOT_PASSWORD }}
+        ports:
+          - 27017:27017
+        options: >-
+          --health-cmd "mongosh --eval 'db.runCommand({ping:1})'"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+
     steps:
+      - name: Wait for Elasticsearch
+        run: |
+          timeout 600 bash -c '
+          while ! curl -s -u elastic:${{ secrets.MYSQL_ROOT_PASSWORD }} -o /dev/null -w "%{http_code}" http://127.0.0.1:9200 | grep -q "200"; do
+            echo "Waiting for Elasticsearch..."
+            sleep 5
+          done
+          '
+
+      - name: Verify Elasticsearch Health
+        run: |
+          curl -u elastic:${{ secrets.MYSQL_ROOT_PASSWORD }} http://127.0.0.1:9200/_cluster/health
+
+      - name: Install Elasticsearch plugin
+        run: |
+          docker exec $(docker ps -q --filter "name=elasticsearch") \
+          /usr/share/elasticsearch/bin/elasticsearch-plugin install --batch analysis-nori
+
+      - name: Restart Elasticsearch
+        run: |
+          docker restart $(docker ps -q --filter "name=elasticsearch")
+
+      - name: Wait for Elasticsearch after restart
+        run: |
+          timeout 600 bash -c '
+          until curl -s -u elastic:${{ secrets.MYSQL_ROOT_PASSWORD }} http://127.0.0.1:9200/_cluster/health | grep -q "status\":\"[green|yellow]"; do
+            echo "Waiting for Elasticsearch to be operational..."
+            sleep 15
+          done
+          '
+
+      - name: Verify Elasticsearch Health
+        run: |
+          curl -u elastic:${{ secrets.MYSQL_ROOT_PASSWORD }} http://127.0.0.1:9200/_cluster/health
+
+      - name: MySQL connection health check
+        run: |
+          for i in {30..0}; do
+            if mysqladmin ping -h 127.0.0.1 --silent; then
+              break
+            fi
+            echo 'MySQL을 기다리는 중...'
+            sleep 1
+          done
+          if [ $i -eq 0 ]; then
+            echo 'MySQL이 30초 내에 시작되지 않았습니다.'
+            exit 1
+          fi
+
+      - name: Verify MySQL connection and configure access
+        run: |
+          echo "Showing initial databases:"
+          mysql --host 127.0.0.1 --port 3306 -uroot -p${{ secrets.MYSQL_ROOT_PASSWORD }} -e "SHOW DATABASES;" || echo "Failed to show initial databases"
+
+          echo "Creating hubo database:"
+          mysql --host 127.0.0.1 --port 3306 -uroot -p${{ secrets.MYSQL_ROOT_PASSWORD }} -e "CREATE DATABASE IF NOT EXISTS hubo;" || echo "Failed to create hubo database"
+
+          echo "Creating root user:"
+          mysql --host 127.0.0.1 --port 3306 -uroot -p${{ secrets.MYSQL_ROOT_PASSWORD }} -e "CREATE USER IF NOT EXISTS 'root'@'%' IDENTIFIED BY '${{ secrets.MYSQL_ROOT_PASSWORD }}';" || echo "Failed to create root user"
+
+          echo "Granting privileges:"
+          mysql --host 127.0.0.1 --port 3306 -uroot -p${{ secrets.MYSQL_ROOT_PASSWORD }} -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;" || echo "Failed to grant privileges"
+
+          echo "Flushing privileges:"
+          mysql --host 127.0.0.1 --port 3306 -uroot -p${{ secrets.MYSQL_ROOT_PASSWORD }} -e "FLUSH PRIVILEGES;" || echo "Failed to flush privileges"
+
+          echo "Showing final databases:"
+          mysql --host 127.0.0.1 --port 3306 -uroot -p${{ secrets.MYSQL_ROOT_PASSWORD }} -e "SHOW DATABASES;" || echo "Failed to show final databases"
+
+
+      - name: Debug Elasticsearch before tests
+        run: |
+          echo "Checking Elasticsearch status before running tests..."
+          curl -s -u elastic:${{ secrets.MYSQL_ROOT_PASSWORD }} http://127.0.0.1:9200/_cluster/health | jq .
+          echo "Listing Elasticsearch indices..."
+          curl -s -u elastic:${{ secrets.MYSQL_ROOT_PASSWORD }} http://127.0.0.1:9200/_cat/indices?v
+          echo "Checking Elasticsearch plugins..."
+          curl -s -u elastic:${{ secrets.MYSQL_ROOT_PASSWORD }} http://127.0.0.1:9200/_cat/plugins?v
+          echo "Checking Elasticsearch settings..."
+          curl -s -u elastic:${{ secrets.MYSQL_ROOT_PASSWORD }} http://127.0.0.1:9200/_cluster/settings?pretty
+
       - name: Checkout secret code
         uses: actions/checkout@v3
         with:
@@ -57,34 +186,34 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Start test environment on remote server
-        uses: appleboy/ssh-action@master
-        with:
-          host: ${{ secrets.BE_HOST }}
-          username: ${{ secrets.BE_USER }}
-          port: ${{ secrets.BE_PORT }}
-          password: ${{ secrets.BE_PW }}
-          script: |
-            cd ~/hubo/test
-            ./start-test-docker-compose.sh
+      #      - name: Start test environment on remote server
+      #        uses: appleboy/ssh-action@master
+      #        with:
+      #          host: ${{ secrets.BE_HOST }}
+      #          username: ${{ secrets.BE_USER }}
+      #          port: ${{ secrets.BE_PORT }}
+      #          password: ${{ secrets.BE_PW }}
+      #          script: |
+      #            cd ~/hubo/test
+      #            ./start-test-docker-compose.sh
 
       - name: Grant execute permission for gradlew
         run: chmod +x ./gradlew
 
       - name: Test with Gradle
         run: ./gradlew test -Dspring.profiles.active=test
 
-      - name: Stop test environment on remote server
-        if: always() # 무조건 실행
-        uses: appleboy/ssh-action@master
-        with:
-          host: ${{ secrets.BE_HOST }}
-          username: ${{ secrets.BE_USER }}
-          port: ${{ secrets.BE_PORT }}
-          password: ${{ secrets.BE_PW }}
-          script: |
-            cd ~/hubo/test
-            ./stop-test-docker-compose.sh
+      #      - name: Stop test environment on remote server
+      #        if: always() # 무조건 실행
+      #        uses: appleboy/ssh-action@master
+      #        with:
+      #          host: ${{ secrets.BE_HOST }}
+      #          username: ${{ secrets.BE_USER }}
+      #          port: ${{ secrets.BE_PORT }}
+      #          password: ${{ secrets.BE_PW }}
+      #          script: |
+      #            cd ~/hubo/test
+      #            ./stop-test-docker-compose.sh
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4

build.gradle

@@ -63,6 +63,8 @@ dependencies {
 
     // https://mvnrepository.com/artifact/junit/junit
     testImplementation 'junit:junit:4.13.1'
+    testImplementation 'org.projectlombok:lombok:1.18.28'
+    testImplementation 'org.projectlombok:lombok:1.18.28'
 
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
@@ -111,6 +113,10 @@ dependencies {
 
     implementation 'org.springframework.boot:spring-boot-starter-mail'
 
+    // https://mvnrepository.com/artifact/org.springframework.security/spring-security-test
+    implementation 'org.springframework.security:spring-security-test:6.1.9'
+
+
 }
 
 tasks.register('copyResources', Copy) {

src/main/java/com/hubo/gillajabi/city/domain/entity/City.java

@@ -13,6 +13,7 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
 @Table(uniqueConstraints = {@UniqueConstraint(columnNames = {"name", "province"})})
+@Builder
 public class City {
 
     @Id

src/main/java/com/hubo/gillajabi/course/application/dto/response/CoursePreview.java

@@ -10,5 +10,7 @@ public class CoursePreview {
     private Long id;
     private String name;
 
-
+    public static CoursePreview of(Long courseId, String courseName) {
+        return new CoursePreview(courseId, courseName);
+    }
 }

src/main/java/com/hubo/gillajabi/course/application/presenation/CourseBookMarkController.java

@@ -9,6 +9,8 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import static org.springframework.http.ResponseEntity.noContent;
+
 @RestController
 @RequestMapping("/api/course/bookmark")
 @Tag(name = "CourseBookmark", description = "코스 북마크 관련 API")
@@ -21,10 +23,18 @@ public class CourseBookMarkController {
     @Operation(summary = "코스 북마크 토글", description = "북마크를 추가하거나 삭제합니다.")
     @PostMapping("/{id}")
     @UserOnly
-    public ResponseEntity<String> toggleCourseBookmark(@PathVariable Long id) {
+    public ResponseEntity toggleCourseBookmark(@PathVariable Long id) {
+        String username = SecurityUtil.getCurrentUsername();
+        courseBookMarkService.toggleCourseBookmark(id, username);
+        return ResponseEntity.ok().body("북마크를 추가했습니다.");
+    }
+
+    @Operation(summary = "코스 북마크 해제", description =  "북마크를 제거 합니다")
+    @DeleteMapping("/{id}")
+    @UserOnly
+    public ResponseEntity deleteCourseBookmark(@PathVariable Long id){
         String username = SecurityUtil.getCurrentUsername();
-        boolean isBookmarked = courseBookMarkService.toggleCourseBookmark(id, username);
-        String message = isBookmarked ? "코스 북마크가 추가되었습니다." : "코스 북마크가 삭제되었습니다.";
-        return ResponseEntity.ok().body(message);
+        courseBookMarkService.deleteCourseBookmark(id, username);
+        return new ResponseEntity(noContent().build().getStatusCode());
     }
 }

src/main/java/com/hubo/gillajabi/course/domain/entity/CourseBookMark.java

@@ -5,17 +5,22 @@
 import com.hubo.gillajabi.member.domain.entity.Member;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLRestriction;
 
 @Getter
 @Entity
 @Table
 @AllArgsConstructor
 @NoArgsConstructor
+@SQLRestriction(value = "status != 'DELETED'")
+@Builder
 public class CourseBookMark extends BaseEntity {
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     @ManyToOne

src/main/java/com/hubo/gillajabi/course/domain/service/CourseBookMarkService.java

@@ -22,20 +22,32 @@ public class CourseBookMarkService {
     private final MemberRepository memberRepository;
 
     @Transactional
-    public boolean toggleCourseBookmark(Long courseId, String userName) {
+    public void toggleCourseBookmark(Long courseId, String userName) {
         Member member = memberRepository.getEntityByUserName(userName);
         Course course = courseRepository.findById(courseId)
                 .orElseThrow(() -> new EntityNotFoundException("코스 없음"));
 
         boolean existingBookmark = courseBookMarkRepository.existsByMemberAndCourse(member, course);
 
         if (existingBookmark) {
-            courseBookMarkRepository.deleteByMemberAndCourse(member, course);
-            return false;
-        } else {
-            CourseBookMark newBookmark = new CourseBookMark(member, course);
-            courseBookMarkRepository.save(newBookmark);
-            return true;
+            throw new RuntimeException("이미 북마크 중입니다");
         }
+
+        CourseBookMark newBookmark = new CourseBookMark(member, course);
+        courseBookMarkRepository.save(newBookmark);
+    }
+
+    @Transactional
+    public void deleteCourseBookmark(Long id, String username) {
+        Member member = memberRepository.getEntityByUserName(username);
+
+        CourseBookMark courseBookMark = courseBookMarkRepository.findById(id)
+                .orElseThrow(() -> new EntityNotFoundException("북마크 없음"));
+
+        if (!courseBookMark.getMember().equals(member)) {
+            throw new IllegalArgumentException("북마크 삭제 권한 없음");
+        }
+
+        courseBookMark.changeStatusToDeleted();
     }
 }

src/main/java/com/hubo/gillajabi/course/infrastructure/exception/CourseBookMarkException.java

@@ -0,0 +1,20 @@
+package com.hubo.gillajabi.course.infrastructure.exception;
+
+import lombok.Getter;
+
+@Getter
+public class CourseBookMarkException extends RuntimeException {
+
+    private final int errorCode;
+
+    private final String errorMessage;
+
+    private final int httpStatus;
+
+    public CourseBookMarkException(CourseBookMarkExceptionCode courseBookMarkExceptionCode) {
+        super(courseBookMarkExceptionCode.getErrorMessage());
+        this.errorCode = courseBookMarkExceptionCode.getErrorCode();
+        this.errorMessage = courseBookMarkExceptionCode.getErrorMessage();
+        this.httpStatus = courseBookMarkExceptionCode.getHttpStatus();
+    }
+}

src/main/java/com/hubo/gillajabi/course/infrastructure/exception/CourseBookMarkExceptionCode.java

@@ -0,0 +1,21 @@
+package com.hubo.gillajabi.course.infrastructure.exception;
+
+import lombok.Getter;
+
+@Getter
+public enum CourseBookMarkExceptionCode {
+
+    COURSE_BOOK_MARK_NOT_FOUND(1, "북마크를 찾을 수 없습니다.", 404),
+    COURSE_BOOK_MARK_ALREADY_EXISTS(2, "이미 북마크 중 입니다.", 400);
+
+    private final int errorCode;
+    private final String errorMessage;
+    private final int httpStatus;
+
+    CourseBookMarkExceptionCode(int errorCode, String errorMessage, int httpStatus) {
+        this.errorCode = errorCode;
+        this.errorMessage = errorMessage;
+        this.httpStatus = httpStatus;
+    }
+
+}

src/main/java/com/hubo/gillajabi/course/infrastructure/persistence/CourseBookMarkRepository.java

@@ -15,10 +15,6 @@ public interface CourseBookMarkRepository extends JpaRepository<CourseBookMark,
 
     void deleteByMemberAndCourse(Member member, Course course);
 
-    @Query("SELECT cb.course FROM CourseBookMark cb WHERE cb.member = :member")
-    List<Course> findAllBookMarkedCourse( Member member);
-
-    @Query("SELECT cb.id FROM CourseBookMark cb WHERE cb.member = :member")
-    Set<Long> findAllBookMarkedCourseIds(Member member);
-
+    @Query("SELECT cb.course.id FROM CourseBookMark cb WHERE cb.member = :member")
+    List<Long> findCourseIdsByMember(Member member);
 }

src/main/java/com/hubo/gillajabi/crawl/domain/entity/Course.java

@@ -73,6 +73,7 @@ public class Course extends BaseEntity {
     private Long totalRatingSum = 0L;
 
     @OneToMany(mappedBy = "course")
+    @Builder.Default
     private Set<CourseTag> courseTags = new HashSet<>();
 
     @Builder