Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions .github/workflows/deploy-swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,17 @@ on:
branches:
- develop

paths:
- 'src/test/**/*Controller*.java'

jobs:
build-and-deploy:
runs-on: ubuntu-latest

concurrency:
group: swagger-deploy
cancel-in-progress: true

steps:
- name: 리포지토리 체크아웃
uses: actions/checkout@v4
Expand Down Expand Up @@ -35,17 +43,11 @@ jobs:
- name: Gradle build
run: ./gradlew build

- name: Swagger UI 생성
uses: Legion2/swagger-ui-action@v1
with:
output: swagger-ui
spec-file: build/api-spec/openapi3.yaml
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Cloudflare Pages에 배포
uses: cloudflare/wrangler-action@v3
- name: Cloudflare Pages에 Swagger 배포
uses: DongminL/swagger-to-cloudflare-pages@v1
with:
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
command: pages deploy swagger-ui --project-name="signal-buddy-api-docs"
gitHubToken: ${{ secrets.GITHUB_TOKEN }}
spec-file-path: build/api-spec/openapi3.yaml
cloudflare-account-id: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
cloudflare-api-token: ${{ secrets.CLOUDFLARE_API_TOKEN }}
project-name: signal-buddy-api-docs
github-token: ${{ secrets.GITHUB_TOKEN }}
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@
import lombok.RequiredArgsConstructor;
import org.programmers.signalbuddyfinal.domain.admin.dto.AdminJoinRequest;
import org.programmers.signalbuddyfinal.domain.admin.service.AdminService;
import org.programmers.signalbuddyfinal.domain.member.dto.MemberJoinRequest;
import org.programmers.signalbuddyfinal.domain.member.dto.MemberResponse;
import org.programmers.signalbuddyfinal.global.response.ApiResponse;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
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.RequestPart;
import org.springframework.web.bind.annotation.RestController;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.programmers.signalbuddyfinal.domain.admin.controller;

import java.time.LocalDateTime;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import org.programmers.signalbuddyfinal.domain.admin.dto.AdminPostItResponse;
import org.programmers.signalbuddyfinal.domain.admin.dto.PostItFilterRequest;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
package org.programmers.signalbuddyfinal.domain.admin.service;

import java.time.LocalDateTime;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import org.programmers.signalbuddyfinal.domain.admin.dto.AdminPostItResponse;
import org.programmers.signalbuddyfinal.domain.admin.dto.PostItFilterRequest;
import org.programmers.signalbuddyfinal.domain.admin.exception.AdminErrorCode;
import org.programmers.signalbuddyfinal.domain.member.entity.Member;
import org.programmers.signalbuddyfinal.domain.member.repository.MemberRepository;
import org.programmers.signalbuddyfinal.domain.postit.dto.PostItResponse;
import org.programmers.signalbuddyfinal.domain.postit.entity.Postit;
import org.programmers.signalbuddyfinal.domain.postit.mapper.PostItMapper;
import org.programmers.signalbuddyfinal.domain.postit.repository.PostItRepository;
import org.programmers.signalbuddyfinal.domain.postit.service.PostItComplete;
import org.programmers.signalbuddyfinal.domain.postitsolve.entity.PostitSolve;
import org.programmers.signalbuddyfinal.domain.postitsolve.repository.PostitSolveRepository;
import org.programmers.signalbuddyfinal.global.dto.PageResponse;
Expand All @@ -26,7 +22,6 @@
public class AdminPostItService {
// TODO : 만료일만 변경하는 기능 추가,,,
private final PostItRepository postItRepository;
private final MemberRepository memberRepository;
private final PostitSolveRepository postitSolveRepository;

public PageResponse<AdminPostItResponse> getAllPostIt(Pageable pageable) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.sl.draw.geom.GuideIf.Op;
import org.programmers.signalbuddyfinal.domain.air_quality.dto.AirQuality;
import org.programmers.signalbuddyfinal.domain.air_quality.dto.AirQualityItems;
import org.programmers.signalbuddyfinal.domain.air_quality.dto.Result;
import org.programmers.signalbuddyfinal.domain.air_quality.exception.AirQualityErrorCode;
import org.programmers.signalbuddyfinal.global.exception.BusinessException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package org.programmers.signalbuddyfinal.domain.member.dto;

import jakarta.validation.constraints.Email;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import org.springframework.web.multipart.MultipartFile;

@Getter
@Builder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import com.fasterxml.jackson.annotation.JsonCreator;
import lombok.Getter;
import org.programmers.signalbuddyfinal.global.exception.BusinessException;
import org.springframework.http.converter.HttpMessageNotReadableException;

@Getter
public enum Provider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import org.programmers.signalbuddyfinal.domain.term.exception.TermErrorCode;
import org.programmers.signalbuddyfinal.domain.term_version.entity.TermVersion;
import org.programmers.signalbuddyfinal.domain.term_version.repository.CustomTermVersionRepositoryImpl;
import org.programmers.signalbuddyfinal.domain.term_version.repository.TermVersionRepository;
import org.programmers.signalbuddyfinal.global.exception.BusinessException;
import org.programmers.signalbuddyfinal.global.response.ApiResponse;
import org.springframework.http.ResponseEntity;
Expand All @@ -18,7 +17,6 @@
public class TermService {

private final CustomTermVersionRepositoryImpl customTermVersionRepository;
private final TermVersionRepository termVersionRepository;

public ResponseEntity<ApiResponse<TermResponse>> getTerm(TermCategory termCategory) {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,28 +1,23 @@
package org.programmers.signalbuddyfinal.domain.trafficSignal.controller;

import java.io.IOException;
import lombok.RequiredArgsConstructor;
import org.programmers.signalbuddyfinal.domain.trafficSignal.service.TrafficCsvService;
import org.programmers.signalbuddyfinal.global.annotation.CurrentUser;
import org.programmers.signalbuddyfinal.global.dto.CustomUser2Member;
import org.programmers.signalbuddyfinal.global.response.ApiResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.io.File;
import java.io.IOException;
import java.util.regex.Pattern;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

@Validated
@RestController
@RequestMapping("/api/traffic")
@RequiredArgsConstructor
public class TrafficController {

@Autowired
private TrafficCsvService trafficCsvService;
private final TrafficCsvService trafficCsvService;

@PostMapping("/save")
public ResponseEntity<ApiResponse<Object>> saveTrafficData(
Expand All @@ -33,6 +28,4 @@ public ResponseEntity<ApiResponse<Object>> saveTrafficData(

return ResponseEntity.ok(ApiResponse.createSuccess("파일이 성공적으로 저장되었습니다."));
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.time.LocalDate;
import java.time.LocalTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ void searchCommentList() throws Exception {
)
.queryParameters(
parameterWithName("page").type(SimpleType.NUMBER)
.description("페이지 번호 (기본값 : 0, 0부터 시작)").optional(),
.description("페이지 번호 (기본값 : 0, 0번부터 시작)").optional(),
parameterWithName("size").type(SimpleType.NUMBER)
.description("페이지 크기 (기본값 : 7)").optional()
)
Expand Down