[BE] hotfix 로 인한 운영서버 변경 사항 개발서버에 적용

.github/workflows/be-merge-prod.yml

@@ -52,7 +52,7 @@ jobs:
 
       - name: Docker Image Build
         working-directory: backend
-        run: docker build --platform linux/arm64/v8 -t mapbefine/mapbefine -f Dockerfile-dev .
+        run: docker build --platform linux/arm64/v8 -t mapbefine/mapbefine -f Dockerfile-prod .
 
       - name: Docker Hub Push
         run: docker push mapbefine/mapbefine

.github/workflows/fe-merge-dev.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
 
   pull_request:
-    branches: [develop-FE-2]
+    branches: [develop-FE]
     types: [closed]
     paths: frontend/**
 
@@ -35,6 +35,7 @@ jobs:
         working-directory: frontend
         env:
           REACT_APP_GOOGLE_ANALYTICS: ${{ secrets.REACT_APP_GOOGLE_ANALYTICS }}
+          REACT_APP_TMAP_API_KEY: ${{ secrets.REACT_APP_TMAP_API_KEY }}
           APP_URL: "https://mapbefine.kro.kr/api"
 
       - name: upload to artifact

.github/workflows/fe-merge-prod.yml

@@ -35,6 +35,7 @@ jobs:
         working-directory: frontend
         env:
           REACT_APP_GOOGLE_ANALYTICS: ${{ secrets.REACT_APP_GOOGLE_ANALYTICS }}
+          REACT_APP_TMAP_API_KEY: ${{ secrets.REACT_APP_TMAP_API_KEY }}
           APP_URL: "https://mapbefine.com/api"
 
       - name: upload to artifact

.github/workflows/fe-pull-request.yml

@@ -3,7 +3,7 @@ name: Frontend CI For Test Validation
 on:
   # pull request open과 reopen 시 실행한다.
   pull_request:
-    branches: [main, develop-FE-2]
+    branches: [main, develop-FE]
     paths: frontend/**
 
 defaults:

backend/Dockerfile-prod

@@ -1,3 +1,3 @@
-FROM openjdk:17
-COPY build/libs/mapbefine.jar mapbefine.jar
+FROM openjdk:17 
+COPY build/libs/mapbefine.jar mapbefine.jar 
 ENTRYPOINT ["java", "-jar","-Dspring.profiles.active=prod", "mapbefine.jar"]

backend/src/main/java/com/mapbefine/mapbefine/admin/application/AdminCommandService.java

@@ -117,6 +117,7 @@ public void deletePin(Long pinId) {
                 .orElseThrow(() -> new PinNotFoundException(PIN_NOT_FOUND, pinId));
 
         pin.decreaseTopicPinCount();
+        pinRepository.flush();
         pinImageRepository.deleteAllByPinId(pinId);
         pinRepository.deleteById(pin.getId());
     }

backend/src/test/java/com/mapbefine/mapbefine/admin/AdminIntegrationTest.java

@@ -1,6 +1,6 @@
 package com.mapbefine.mapbefine.admin;
 
-import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.*;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.http.HttpHeaders.AUTHORIZATION;
 
@@ -23,7 +23,8 @@
 import com.mapbefine.mapbefine.topic.TopicFixture;
 import com.mapbefine.mapbefine.topic.domain.Topic;
 import com.mapbefine.mapbefine.topic.domain.TopicRepository;
-import io.restassured.common.mapper.TypeRef;
+import io.restassured.common.mapper.*;
+import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -32,8 +33,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
-import java.util.List;
-
 class AdminIntegrationTest extends IntegrationTest {
 
     @Autowired
@@ -124,15 +123,13 @@ void findMemberDetail_Success() {
                 .extract()
                 .as(new TypeRef<>() {
                 });
-        System.out.println("====" + topic.getPinCount());
-        //then
 
+        //then
         AdminMemberDetailResponse expected = AdminMemberDetailResponse.of(
                 member,
                 member.getCreatedTopics(),
                 member.getCreatedPins()
         );
-
         assertThat(response).usingRecursiveComparison()
                 .ignoringFields("updatedAt")
                 .ignoringFields("topics.updatedAt")
@@ -218,6 +215,9 @@ void deletePin_Success() {
                 .when().delete("/admin/pins/" + pin.getId())
                 .then().log().all()
                 .statusCode(HttpStatus.NO_CONTENT.value());
+
+        Topic updatedTopic = topicRepository.findById(topic.getId()).get();
+        assertThat(updatedTopic.getPinCount()).isEqualTo(0);
     }
 
     @Test

backend/src/test/java/com/mapbefine/mapbefine/admin/application/AdminCommandServiceTest.java

@@ -160,6 +160,20 @@ void deletePin_Success() {
         assertThat(pinRepository.existsById(pin.getId())).isFalse();
     }
 
+    @DisplayName("핀 삭제 시, 토픽의 핀 개수를 1 감소시킨다.")
+    @Test
+    void deletePin_Success_decreaseTopicPinCount() {
+        //given
+        assertThat(pin.isDeleted()).isFalse();
+        int pinCountBeforeDelete = topic.getPinCount();
+
+        //when
+        adminCommandService.deletePin(pin.getId());
+
+        //then
+        assertThat(topic.getPinCount()).isEqualTo(pinCountBeforeDelete - 1);
+    }
+
     @DisplayName("Admin인 경우, 핀 이미지를 삭제할 수 있다.")
     @Test
     void deletePinImage_Success() {

frontend/.eslintrc.js

@@ -19,6 +19,27 @@ module.exports = {
     ],
     'simple-import-sort/imports': 'error',
     'simple-import-sort/exports': 'error',
+    'no-undef': 'off',
+    'no-unused-vars': 'off',
+    '@typescript-eslint/no-unused-vars': 'off',
+    'import/prefer-default-export': 'off',
+    'no-use-before-define': 'off',
+    'react/require-default-props': 'off',
+    'react/destructuring-assignment': 'off',
+    'react/jsx-no-constructed-context-values': 'off',
+    'no-restricted-globals': 'off',
+    'no-shadow': 'off',
+    'consistent-return': 'off',
+    'no-restricted-syntax': 'off',
+    'no-await-in-loop': 'off',
+    'no-param-reassign': 'off',
+    'jsx-a11y/tabindex-no-positive': 'off',
+    'react/no-array-index-key': 'off',
+    'react/jsx-no-useless-fragment': 'off',
+    'no-unused-expressions': 'off',
+    'react/jsx-props-no-spreading': 'off',
+    'react/no-unused-prop-types': 'off',
+    'import/no-extraneous-dependencies': 'off',
   },
   settings: {
     'import/resolver': {