Feat/#2

.github/workflows/github-actions.yml

@@ -53,65 +53,66 @@ jobs:
       - name: Publish image to docker hub
         run: docker push ${{ secrets.DOCKER_USERNAME }}/qpin_server:latest
 
-  deploy:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set Target IP
-        run: |
-          STATUS=$(curl -o /dev/null -w "%{http_code}" "http://${{ secrets.QPIN_SERVER_IP }}/env")
-          echo $STATUS
-          if [ $STATUS = 200 ]; then
-            CURRENT_UPSTREAM=$(curl -s "http://${{ secrets.QPIN_SERVER_IP }}/env")
-          else
-            CURRENT_UPSTREAM=green
-          fi
-          echo CURRENT_UPSTREAM=$CURRENT_UPSTREAM >> $GITHUB_ENV
-          if [ $CURRENT_UPSTREAM = blue ]; then
-            echo "CURRENT_PORT=8080" >> $GITHUB_ENV
-            echo "STOPPED_PORT=8081" >> $GITHUB_ENV
-            echo "TARGET_UPSTREAM=green" >> $GITHUB_ENV
-          else
-            echo "CURRENT_PORT=8081" >> $GITHUB_ENV
-            echo "STOPPED_PORT=8080" >> $GITHUB_ENV
-            echo "TARGET_UPSTREAM=blue" >> $GITHUB_ENV
-          fi
-
-      - name: Docker Compose
-        uses: appleboy/ssh-action@master
-        with:
-          username: ubuntu
-          host: ${{ secrets.QPIN_SERVER_IP }}
-          key: ${{ secrets.EC2_SSH_KEY }}
-          script_stop: true
-          script: |
-            sudo docker pull ${{ secrets.DOCKER_USERNAME }}/qpin_server:latest
-            sudo docker-compose -f docker-compose-${{env.TARGET_UPSTREAM}}.yml up -d
-
-      - name: Check deploy server URL
-        uses: jtalk/url-health-check-action@v3
-        with:
-          url: http://${{ secrets.QPIN_SERVER_IP }}:${{ env.STOPPED_PORT }}/env
-          max-attempts: 5
-          retry-delay: 10s
-
-      - name: Change nginx upstream
-        uses: appleboy/ssh-action@master
-        with:
-          username: ubuntu
-          host: ${{ secrets.QPIN_SERVER_IP }}
-          key: ${{ secrets.EC2_SSH_KEY }}
-          script_stop: true
-          script: |
-            sudo docker exec -i nginxserver bash -c 'echo "set \$service_url ${{env.TARGET_UPSTREAM}};" > etc/nginx/conf.d/service-env.inc && nginx -s reload'
-
-      - name: Stop current server
-        uses: appleboy/ssh-action@master
-        with:
-          username: ubuntu
-          host: ${{ secrets.QPIN_SERVER_IP }}
-          key: ${{ secrets.EC2_SSH_KEY }}
-          script_stop: true
-          script: |
-            sudo docker stop ${{ env.CURRENT_UPSTREAM }}
-            sudo docker rm ${{ env.CURRENT_UPSTREAM }}
+# CD 임시 삭제
+#  deploy:
+#    needs: build
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Set Target IP
+#        run: |
+#          STATUS=$(curl -o /dev/null -w "%{http_code}" "http://${{ secrets.QPIN_SERVER_IP }}/env")
+#          echo $STATUS
+#          if [ $STATUS = 200 ]; then
+#            CURRENT_UPSTREAM=$(curl -s "http://${{ secrets.QPIN_SERVER_IP }}/env")
+#          else
+#            CURRENT_UPSTREAM=green
+#          fi
+#          echo CURRENT_UPSTREAM=$CURRENT_UPSTREAM >> $GITHUB_ENV
+#          if [ $CURRENT_UPSTREAM = blue ]; then
+#            echo "CURRENT_PORT=8080" >> $GITHUB_ENV
+#            echo "STOPPED_PORT=8081" >> $GITHUB_ENV
+#            echo "TARGET_UPSTREAM=green" >> $GITHUB_ENV
+#          else
+#            echo "CURRENT_PORT=8081" >> $GITHUB_ENV
+#            echo "STOPPED_PORT=8080" >> $GITHUB_ENV
+#            echo "TARGET_UPSTREAM=blue" >> $GITHUB_ENV
+#          fi
+#
+#      - name: Docker Compose
+#        uses: appleboy/ssh-action@master
+#        with:
+#          username: ubuntu
+#          host: ${{ secrets.QPIN_SERVER_IP }}
+#          key: ${{ secrets.EC2_SSH_KEY }}
+#          script_stop: true
+#          script: |
+#            sudo docker pull ${{ secrets.DOCKER_USERNAME }}/qpin_server:latest
+#            sudo docker-compose -f docker-compose-${{env.TARGET_UPSTREAM}}.yml up -d
+#
+#      - name: Check deploy server URL
+#        uses: jtalk/url-health-check-action@v3
+#        with:
+#          url: http://${{ secrets.QPIN_SERVER_IP }}:${{ env.STOPPED_PORT }}/env
+#          max-attempts: 5
+#          retry-delay: 10s
+#
+#      - name: Change nginx upstream
+#        uses: appleboy/ssh-action@master
+#        with:
+#          username: ubuntu
+#          host: ${{ secrets.QPIN_SERVER_IP }}
+#          key: ${{ secrets.EC2_SSH_KEY }}
+#          script_stop: true
+#          script: |
+#            sudo docker exec -i nginxserver bash -c 'echo "set \$service_url ${{env.TARGET_UPSTREAM}};" > etc/nginx/conf.d/service-env.inc && nginx -s reload'
+#
+#      - name: Stop current server
+#        uses: appleboy/ssh-action@master
+#        with:
+#          username: ubuntu
+#          host: ${{ secrets.QPIN_SERVER_IP }}
+#          key: ${{ secrets.EC2_SSH_KEY }}
+#          script_stop: true
+#          script: |
+#            sudo docker stop ${{ env.CURRENT_UPSTREAM }}
+#            sudo docker rm ${{ env.CURRENT_UPSTREAM }}

src/main/java/org/example/qpin/domain/member/entity/Member.java

@@ -6,7 +6,6 @@
 import org.example.qpin.domain.scrap.entity.Scrap;
 import org.example.qpin.global.common.BaseEntity;
 
-import java.security.Timestamp;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -69,4 +68,13 @@ public Member (String name, String password, String role){
         this.role = role;
 //        this.phoneNumber = phoneNumber;
     }
+
+    // 주차 여부
+    @Column(nullable = false)
+    private boolean isParking;
+
+    // 주차 여부를 설정
+    public void setParking(boolean isParking) {
+        this.isParking = isParking;
+    }
 }

src/main/java/org/example/qpin/domain/parking/controller/ParkingController.java

@@ -1,14 +1,13 @@
 package org.example.qpin.domain.parking.controller;
 
 import lombok.RequiredArgsConstructor;
+import org.example.qpin.domain.parking.dto.ParkingInfoResDto;
 import org.example.qpin.domain.parking.dto.ParkingSearchReqDto;
 import org.example.qpin.domain.parking.dto.ParkingSearchResDto;
 import org.example.qpin.domain.parking.service.ParkingService;
 import org.example.qpin.global.common.response.CommonResponse;
 import org.example.qpin.global.common.response.ResponseCode;
 import org.json.simple.parser.ParseException;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -19,38 +18,37 @@ public class ParkingController {
 
     private final ParkingService parkingService;
 
-    /**
-     * 주변 주차장 정보 탐색
-     */
+    // [Get] 주변 주차장 검색
     @GetMapping("/parking/selectList")
-    public ResponseEntity<List<ParkingSearchResDto>> findParkingNearby(@RequestBody ParkingSearchReqDto parkingSearchReqDto) throws ParseException {
+    public CommonResponse<List<ParkingSearchResDto>> findParkingNearby(@RequestParam ParkingSearchReqDto parkingSearchReqDto) throws ParseException {
 
-        double latitude=parkingSearchReqDto.getLatitude();
-        double longitude=parkingSearchReqDto.getLongtitude();
-        double distance=parkingSearchReqDto.getDistance();
+        Double latitude=parkingSearchReqDto.getLatitude();
+        Double longitude=parkingSearchReqDto.getLongitude();
+        Double distance=parkingSearchReqDto.getDistance();
         String regionCode=parkingSearchReqDto.getRegionCode();
-        return ResponseEntity.status(HttpStatus.OK).body(parkingService.findParkingNearby(latitude, longitude, distance,regionCode ));
+
+        List<ParkingSearchResDto> parkingList = parkingService.findParkingNearby(latitude, longitude, distance, regionCode);
+        return new CommonResponse<>(ResponseCode.SUCCESS, parkingList);
     }
 
-    // [Post] 주차하기 버튼
+    // [Post] 주차 등록
     @PostMapping("/parking/{parkingAreaId}/{memberId}")
-    @ResponseBody
-    public CommonResponse<?> parking(@PathVariable("memberId") Long memberId, @PathVariable("parkingAreaId") String parkingAreaId) {
-        parkingService.postParking(memberId, parkingAreaId);
-        return new CommonResponse<>(ResponseCode.SUCCESS);
+    public CommonResponse<String> parking(@PathVariable("memberId") Long memberId, @PathVariable("parkingAreaId") Long parkingAreaId, @RequestBody String type) {
+        parkingService.postParking(memberId, parkingAreaId, type);
+        return new CommonResponse<>(ResponseCode.SUCCESS, "주차가 완료되었습니다.");
     }
 
-    // [Delete] 주차하기 버튼 해제
+    // [Delete] 주차 해제
     @DeleteMapping("/parking/{parkingAreaId}/{memberId}")
     @ResponseBody
-    public CommonResponse<?> deleteParking(@PathVariable("memberId") Long memberId, @PathVariable("parkingAreaId") String parkingAreaId) {
+    public CommonResponse<String> deleteParking(@PathVariable("memberId") Long memberId, @PathVariable("parkingAreaId") Long parkingAreaId) {
         parkingService.deleteParking(memberId, parkingAreaId);
-        return new CommonResponse<>(ResponseCode.SUCCESS);
+        return new CommonResponse<>(ResponseCode.SUCCESS, "주차 해제가 완료되었습니다.");
     }
 
-    // [Get] 간편 주차 주차장 정보
-    @GetMapping("/parking/select/{parkingAreaId}/{memberId}")
-    public CommonResponse<?> parkingInfo(@PathVariable("memberId") Long memberId, @PathVariable("parkingAreaId") String parkingAreaId) {
-        return new CommonResponse<>(ResponseCode.SUCCESS, parkingService.getParkingInfo(memberId, parkingAreaId));
+    // [Get] 현재 주차한 주차장 정보
+    @GetMapping("/parking/select/{memberId}")
+    public CommonResponse<ParkingInfoResDto> parkingInfo(@PathVariable("memberId") Long memberId) {
+        return new CommonResponse<>(ResponseCode.SUCCESS, parkingService.getParkingInfo(memberId));
     }
 }

src/main/java/org/example/qpin/domain/parking/dto/ParkingInfoResDto.java

@@ -13,9 +13,8 @@
 @Builder
 public class ParkingInfoResDto {
 
-    private boolean parkingStatus;
-    private boolean scrapStatus;
-    private LocalDateTime parkingDate;
-    private int parkingTime;
-
+    private LocalDateTime parkingDate;  // 주차 시작 시간
+    private int parkingTime;  // 주차한 시간(분 단위)
+    private Long parkingAreaId;  // 주차장 ID
+    private String parkingType;  // 주차장 유형
 }

src/main/java/org/example/qpin/domain/parking/dto/ParkingSearchReqDto.java

@@ -2,15 +2,14 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
 @Getter
-@Setter
 @Builder
+// 주차장 검색 요청
 public class ParkingSearchReqDto {
-    private double latitude;
-    private double longtitude;
-    private double distance;
-    private String regionCode; //지역코드 5자리 문자열
+    private Double latitude; // 위도
+    private Double longitude; // 경도
+    private Double distance; // 검색 기준 거리
+    private String regionCode; // 지역코드 5자리 문자열
 
-}
+}

src/main/java/org/example/qpin/domain/parking/dto/ParkingSearchResDto.java

@@ -7,21 +7,21 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+// 주차장 검색 응답
 public class ParkingSearchResDto {
+    private Double longitude; // 경도
+    private Double latitude; // 위도
+    private String address; // 도로명주소
+    private String name; // 주차장명
+    private String price; // 가격
+    private Long parkId; //주차장 아이디
+    private Double parkingDistance; // 현위치와의 거리
 
-    private double longtitude; //경도
-    private double latitude; //위도
-    private String address; //도로명주소
-    private String name; //주차장명
-    private String price; //무료,유료
-    private Long parkId;
-    private double parkingDistance;
-
-    private String weekStartTime;
-    private String weekEndTime;
-    private String SaturdayStartTime;
-    private String SaturdayEndTime;
-    private String HolidayStartTime;
-    private String HolidayEndTime;
+    private String weekStartTime; // 평일 오픈
+    private String weekEndTime; // 평일 마감
+    private String SaturdayStartTime; // 토요일 오픈
+    private String SaturdayEndTime; // 토요일 마감
+    private String HolidayStartTime; // 공휴일/일요일 오픈
+    private String HolidayEndTime; // 공휴일/일요일 마감
 
 }

src/main/java/org/example/qpin/domain/parking/entity/Parking.java

@@ -1,8 +1,10 @@
 package org.example.qpin.domain.parking.entity;
 
-import jakarta.persistence.*;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import lombok.*;
-import org.example.qpin.domain.member.entity.Member;
 import org.example.qpin.global.common.BaseEntity;
 
 @Entity
@@ -14,13 +16,7 @@ public class Parking extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long parkingId;
+    private Long parkingAreaId;
 
-    @Column(length = 50, nullable = false)
-    private String parkingAreaId;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "member_id")
-    private Member member;
-
-}
+    private String type;
+}