Merge pull request #373 from softeerbootcamp-2nd/dev

Revert "오류"

.github/workflows/test.yml

@@ -29,16 +29,20 @@ jobs:
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
 
-    - name: Test with Gradle
+    - name: Run Coverage
       working-directory: ${{ env.wd }}
-      run: ./gradlew test
-
+      run: |
+        chmod +x gradlew
+        ./gradlew testCoverage
+
     - name: Add coverage to PR
       id: jacoco
-      uses: madrapps/jacoco-report@v1.2
+      uses: madrapps/jacoco-report@v1.6.1
       with:
         paths: ${{ github.workspace }}/backend/build/reports/jacoco/test/jacocoTestReport.xml
         token: ${{ secrets.GITHUB_TOKEN }}
         title: 📊 테스트 커버리지 결과
-        min-coverage-overall: 80
-        min-coverage-changed-files: 80
+        min-coverage-overall: 50
+        min-coverage-changed-files: 50
+        update-comment: true
+        continue-on-error: true

backend/build.gradle

@@ -44,36 +44,22 @@ jacoco {
     toolVersion = '0.8.9'
 }
 
-test {
-	useJUnitPlatform()
-	finalizedBy jacocoTestReport
-}
-
 jacocoTestReport {
     dependsOn test
     reports {
         xml.required = true
+        html.required = true
+        csv.required = false
     }
-	finalizedBy 'jacocoTestCoverageVerification'
 }
 
-jacocoTestCoverageVerification {
-	violationRules {
-		rule {
-			limit {
-				counter = 'LINE'
-				value = 'COVEREDRATIO'
-				minimum = 0.8
-			}
-			limit {
-				counter = 'METHOD'
-				value = 'COVEREDRATIO'
-				minimum = 0.8
-			}
-		}
-	}
-}
+tasks.register('testCoverage', Test) {
+    group 'verification'
+    description 'Runs the tests with covarage (Create JaCoCo report)'
 
+    dependsOn test, jacocoTestReport
+    tasks['jacocoTestReport'].mustRunAfter(tasks['test'])
+}
 jar {
     enabled = false
 }

backend/src/main/java/autoever2/cartag/controller/CarController.java → backend/src/main/java/autoever2/cartag/controller/TrimController.java

@@ -3,12 +3,8 @@
 import autoever2.cartag.domain.car.BoughtCarDto;
 import autoever2.cartag.domain.car.CarDefaultDto;
 import autoever2.cartag.domain.car.CarDto;
-<<<<<<< HEAD:backend/src/main/java/autoever2/cartag/controller/TrimController.java
 import autoever2.cartag.domain.share.QuoteIdList;
 import autoever2.cartag.domain.share.QuoteInfoDto;
-=======
-import autoever2.cartag.domain.car.CarTypeDto;
->>>>>>> 57c527d6b6e527b4e91eff53de6936fa62b8d654:backend/src/main/java/autoever2/cartag/controller/CarController.java
 import autoever2.cartag.service.CarService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -18,34 +14,18 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-<<<<<<< HEAD:backend/src/main/java/autoever2/cartag/controller/TrimController.java
 import org.springframework.web.bind.annotation.*;
-=======
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
->>>>>>> 57c527d6b6e527b4e91eff53de6936fa62b8d654:backend/src/main/java/autoever2/cartag/controller/CarController.java
 
 import java.util.List;
 
 @RestController
 @RequestMapping("api/cars")
 @RequiredArgsConstructor
-@Tag(name = "CarController", description = "트림 반환 api")
-public class CarController {
+@Tag(name = "TrimController", description = "트림 반환 api")
+public class TrimController {
 
     private final CarService service;
 
-    @Operation(summary = "차종 리스트 조회", description = "차종명 + 이미지 리스트 조회")
-    @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "성공", content = @Content(schema = @Schema(implementation = CarTypeDto.class)))
-    })
-    @GetMapping("/list")
-    public List<CarTypeDto> getCarTypeList() {
-        return service.getAllCarTypes();
-    }
-
     @Operation(summary = "trim 조회", description = "trim 조회 method")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "조회 성공", content = @Content(schema = @Schema(implementation = CarDto.class))),

backend/src/main/java/autoever2/cartag/repository/CarRepository.java

@@ -2,12 +2,8 @@
 
 import autoever2.cartag.domain.car.CarInfoDto;
 import autoever2.cartag.domain.car.CarPriceDto;
-<<<<<<< HEAD
 import autoever2.cartag.domain.car.TrimInfoDto;
 import org.springframework.dao.DataAccessException;
-=======
-import autoever2.cartag.domain.car.CarTypeDto;
->>>>>>> 57c527d6b6e527b4e91eff53de6936fa62b8d654
 import org.springframework.dao.support.DataAccessUtils;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.RowMapper;
@@ -35,11 +31,11 @@ public List<CarInfoDto> findCarByCarType(int carType) {
 
         SqlParameterSource param = new MapSqlParameterSource()
                 .addValue("carType", carType);
-        return template.query(sql, param, carRowMapper());
+        return template.query(sql, param, CarRowMapper());
 
     }
 
-    private RowMapper<CarInfoDto> carRowMapper() {
+    private RowMapper<CarInfoDto> CarRowMapper() {
         return BeanPropertyRowMapper.newInstance(CarInfoDto.class);
     }
 
@@ -74,26 +70,11 @@ public List<CarPriceDto> findCarPriceAndCount() {
                 "on Car.car_id = SalesHistory.car_id inner join SubOptionData " +
                 "on SubOptionData.car_id = Car.car_id group by SalesHistory.history_id";
 
-        return template.query(sql, carPriceRowMapper());
+        return template.query(sql, CarPriceRowMapper());
     }
 
-<<<<<<< HEAD
 
     private RowMapper<CarPriceDto> CarPriceRowMapper() {
-=======
-    public List<CarTypeDto> findAllCarType() {
-        String sql = "select ct.car_type_id, ct.car_type_name, ct.car_type_image " +
-                "from CarType ct ";
-
-        return template.query(sql, carTypeDtoRowMapper());
-    }
-
-    private RowMapper<CarTypeDto> carTypeDtoRowMapper() {
-        return BeanPropertyRowMapper.newInstance(CarTypeDto.class);
-    }
-
-    private RowMapper<CarPriceDto> carPriceRowMapper() {
->>>>>>> 57c527d6b6e527b4e91eff53de6936fa62b8d654
         return (rs, rowNum) -> CarPriceDto
                 .builder()
                 .optionList(rs.getString("SalesHistory.sold_options_id"))

backend/src/main/java/autoever2/cartag/service/CarService.java

@@ -33,10 +33,6 @@ public class CarService {
 
     private final ModelRepository modelRepository;
 
-    public List<CarTypeDto> getAllCarTypes() {
-        return carRepository.findAllCarType();
-    }
-
     // TODO Optional로 감싸진 값이 empty일 경우 어떤 예외 발생시킬지 정하기
     public List<CarDto> findCarByCarType(int carType) {
         List<CarInfoDto> carInfos = carRepository.findCarByCarType(carType);

backend/src/test/java/autoever2/cartag/CartagApplicationTests.java

@@ -0,0 +1,13 @@
+package autoever2.cartag;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class CartagApplicationTests {
+
+	@Test
+	void contextLoads() {
+	}
+
+}

backend/src/test/java/autoever2/cartag/controller/CarControllerTest.java → backend/src/test/java/autoever2/cartag/controller/TrimControllerTest.java

@@ -1,7 +1,6 @@
 package autoever2.cartag.controller;
 
 import autoever2.cartag.domain.car.CarDto;
-import autoever2.cartag.domain.car.CarTypeDto;
 import autoever2.cartag.domain.car.TrimDefaultOptionDto;
 import autoever2.cartag.service.CarService;
 import org.junit.jupiter.api.BeforeEach;
@@ -21,8 +20,8 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@WebMvcTest(CarController.class)
-class CarControllerTest {
+@WebMvcTest(TrimController.class)
+class TrimControllerTest {
     @Autowired
     MockMvc mockMvc;
 
@@ -120,33 +119,4 @@ void getTrimList() throws Exception {
                 .andExpect(jsonPath("$[3].wheelImage").isEmpty());
 
     }
-
-    @Test
-    @DisplayName("차종 리스트 호출 API")
-    void getCarTypeList() throws Exception {
-        List<CarTypeDto> carTypeList = new ArrayList<>();
-        carTypeList.add(CarTypeDto.builder()
-                .carTypeId(1)
-                .carTypeName("펠리세이드")
-                .carTypeImage("image_1")
-                .build());
-        carTypeList.add(CarTypeDto.builder()
-                .carTypeId(2)
-                .carTypeImage("/cartype/santafe.png")
-                .carTypeName("싼타페")
-                .build());
-        carTypeList.add(CarTypeDto.builder()
-                .carTypeId(3)
-                .carTypeImage("/cartype/the-all-new-kona-hybrid.png")
-                .carTypeName("디 올 뉴 코나 Hybrid")
-                .build());
-        given(service.getAllCarTypes()).willReturn(carTypeList);
-
-        ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders.get("/api/cars/list"));
-
-        resultActions.andExpect(status().isOk())
-                .andExpect(jsonPath("$[0].carTypeId").value(1))
-                .andExpect(jsonPath("$[1].carTypeImage").value("/cartype/santafe.png"))
-                .andExpect(jsonPath("$[2].carTypeName").value("디 올 뉴 코나 Hybrid"));
-    }
 }

backend/src/test/java/autoever2/cartag/integration/DefaultTest.java

@@ -1,6 +1,6 @@
 package autoever2.cartag.integration;
 
-import autoever2.cartag.controller.CarController;
+import autoever2.cartag.controller.TrimController;
 import autoever2.cartag.domain.car.CarDefaultDto;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -19,10 +19,10 @@
 public class DefaultTest {
 
     @Autowired
-    CarController controller;
+    TrimController controller;
 
     @Test
-    @DisplayName("/api/cars/infos/defaults?carid=1 테스트")
+    @DisplayName("차량 기본 정보들을 반환")
     void defaultCarInfos(){
         CarDefaultDto carDefaultDto = controller.carDefaultDto(1);
         assertEquals("디젤2.2", carDefaultDto.getPowerTrainName());