-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #25 from kakao-tech-campus-2nd-step3/weekly/4
merge: 4주차 작업 master에 반영
- Loading branch information
Showing
53 changed files
with
1,834 additions
and
170 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| name: weekly 브랜치 PR에 대한 CI 테스트 | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: | ||
| - 'weekly/**' | ||
|
|
||
| jobs: | ||
| ci: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| permissions: | ||
| checks: write | ||
| pull-requests: write | ||
|
|
||
| steps: | ||
| - name: 프로젝트 코드를 CI 서버로 옮겨오기 | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: JDK 21 설치 | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: 'corretto' | ||
| java-version: '21' | ||
|
|
||
| - name: AWS S3 관련 정보를 설정 파일에 주입 | ||
| uses: microsoft/variable-substitution@v1 | ||
| with: | ||
| files: ./src/main/resources/application-prod.yml | ||
| env: | ||
| aws.s3.bucket: ${{ secrets.AWS_S3_BUCKET }} | ||
| aws.s3.accessKey: ${{ secrets.AWS_S3_ACCESS_KEY }} | ||
| aws.s3.secretKey: ${{ secrets.AWS_S3_SECRET_KEY }} | ||
|
|
||
| - name: 빌드 테스트 수행 | ||
| run: | | ||
| chmod +x ./gradlew | ||
| ./gradlew clean build | ||
| - name: 테스트 수행 결과 보고 | ||
| uses: EnricoMi/publish-unit-test-result-action@v2 | ||
| if: always() | ||
| with: | ||
| files: '**/build/test-results/test/TEST-*.xml' | ||
|
|
||
| - name: 테스트 실패 시, 실패한 코드 라인에 코멘트 자동 등록 | ||
| uses: mikepenz/action-junit-report@v3 | ||
| if: always() | ||
| with: | ||
| report_paths: '**/build/test-results/test/TEST-*.xml' | ||
| token: ${{ github.token }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
src/main/java/com/potatocake/everymoment/config/AwsS3Properties.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package com.potatocake.everymoment.config; | ||
|
|
||
| import org.springframework.boot.context.properties.ConfigurationProperties; | ||
|
|
||
| @ConfigurationProperties(prefix = "aws.s3") | ||
| public record AwsS3Properties( | ||
| String accessKey, | ||
| String secretKey, | ||
| String region, | ||
| String bucket | ||
| ) { | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
83 changes: 83 additions & 0 deletions
83
src/main/java/com/potatocake/everymoment/controller/FriendController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| package com.potatocake.everymoment.controller; | ||
|
|
||
| import com.potatocake.everymoment.dto.SuccessResponse; | ||
| import com.potatocake.everymoment.dto.response.FriendListResponse; | ||
| import com.potatocake.everymoment.dto.response.OneFriendDiariesResponse; | ||
| import com.potatocake.everymoment.service.FriendService; | ||
| import java.time.LocalDate; | ||
| import org.springframework.format.annotation.DateTimeFormat; | ||
| import org.springframework.http.HttpStatus; | ||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.web.bind.annotation.DeleteMapping; | ||
| import org.springframework.web.bind.annotation.GetMapping; | ||
| import org.springframework.web.bind.annotation.PatchMapping; | ||
| import org.springframework.web.bind.annotation.PathVariable; | ||
| import org.springframework.web.bind.annotation.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RequestParam; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
|
|
||
| @RestController | ||
| @RequestMapping("api/friends") | ||
| public class FriendController { | ||
| private final FriendService friendService; | ||
|
|
||
| public FriendController(FriendService friendService) { | ||
| this.friendService = friendService; | ||
| } | ||
|
|
||
| //특정 친구 일기 전체 조회 | ||
| @GetMapping("/{id}/diaries") | ||
| public ResponseEntity<SuccessResponse<OneFriendDiariesResponse>> getOneFriendDiaries( | ||
| @PathVariable Long id, | ||
| @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, | ||
| @RequestParam(defaultValue = "0") int key, | ||
| @RequestParam(defaultValue = "10") int size) { | ||
| OneFriendDiariesResponse diaries = friendService.OneFriendDiariesResponse(id, date, key, size); | ||
| SuccessResponse<OneFriendDiariesResponse> response = SuccessResponse.<OneFriendDiariesResponse>builder() | ||
| .code(HttpStatus.OK.value()) | ||
| .message("success") | ||
| .info(diaries) | ||
| .build(); | ||
| return ResponseEntity.ok(response); | ||
| } | ||
|
|
||
| //내 친구 목록 조회 | ||
| @GetMapping("/friends") | ||
| public ResponseEntity<SuccessResponse<FriendListResponse>> getFriendList( | ||
| @RequestParam(required = false) String nickname, | ||
| @RequestParam(required = false) String email, | ||
| @RequestParam(defaultValue = "0") int key, | ||
| @RequestParam(defaultValue = "10") int size) { | ||
| FriendListResponse friendList = friendService.getFriendList(nickname, email, key, size); | ||
| SuccessResponse<FriendListResponse> response = SuccessResponse.<FriendListResponse>builder() | ||
| .code(HttpStatus.OK.value()) | ||
| .message("success") | ||
| .info(friendList) | ||
| .build(); | ||
| return ResponseEntity.ok(response); | ||
| } | ||
|
|
||
| //내 친구 삭제 | ||
| @DeleteMapping("/{id}") | ||
| public ResponseEntity<SuccessResponse<Void>> deleteFriend(@PathVariable Long id) { | ||
| friendService.deleteFriend(id); | ||
| SuccessResponse<Void> response = SuccessResponse.<Void>builder() | ||
| .code(HttpStatus.OK.value()) | ||
| .message("success") | ||
| .info(null) | ||
| .build(); | ||
| return ResponseEntity.ok(response); | ||
| } | ||
|
|
||
| //친한 친구 설정 | ||
| @PatchMapping("/{id}/bookmark") | ||
| public ResponseEntity<SuccessResponse<Void>> toggleCloseFriend(@PathVariable Long id) { | ||
| friendService.toggleCloseFriend(id); | ||
| SuccessResponse<Void> response = SuccessResponse.<Void>builder() | ||
| .code(HttpStatus.OK.value()) | ||
| .message("success") | ||
| .info(null) | ||
| .build(); | ||
| return ResponseEntity.ok(response); | ||
| } | ||
| } |
Oops, something went wrong.