Skip to content

Commit

Permalink
Fix : 파이프라인 스크립트 & Config 수정 (#58)
Browse files Browse the repository at this point in the history
* Fix : 충돌 해결

* Fix : 대소문자 구분 해제

* Feat : Firebase SDK 추가하도록 변경

* Fix : 경로명 수정

* Fix : 경로명 수정

* Fix : 명령어 수정

* Fix : 파이프라인 수정

* Fix : 오타 수정

* Fix : 중복 클래스 수정

* Fix : 파이프라인 수정
  • Loading branch information
hyunw9 authored Jul 15, 2024
1 parent 4112c38 commit 155b002
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 40 deletions.
19 changes: 10 additions & 9 deletions src/main/java/com/donkeys_today/server/external/fcm/FcmConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,26 @@
import com.google.firebase.FirebaseApp;
import com.google.firebase.FirebaseOptions;
import com.google.firebase.messaging.FirebaseMessaging;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.ResourceUtils;
import org.springframework.core.io.ClassPathResource;

@Configuration
public class FcmConfig {

@Bean
public FirebaseApp firebaseApp() throws IOException {
FileInputStream aboutFirebaseFile = new FileInputStream(
String.valueOf(ResourceUtils.getFile("./secret/firebase-adminsdk.json")));
ClassPathResource resource = new ClassPathResource("firebase-adminsdk.json");

FirebaseOptions options = FirebaseOptions
.builder()
.setCredentials(GoogleCredentials.fromStream(aboutFirebaseFile))
.build();
return FirebaseApp.initializeApp(options);
try (InputStream aboutFirebaseFile = resource.getInputStream()) {
FirebaseOptions options = FirebaseOptions
.builder()
.setCredentials(GoogleCredentials.fromStream(aboutFirebaseFile))
.build();
return FirebaseApp.initializeApp(options);
}
}

@Bean
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
package com.donkeys_today.server.presentation.api;

import com.donkeys_today.server.common.constants.Constants;
import com.donkeys_today.server.presentation.diary.dto.request.DiaryRequest;
import com.donkeys_today.server.presentation.diary.dto.response.DiaryCalenderResponse;
import com.donkeys_today.server.presentation.diary.dto.response.DiaryCreatedResponse;
import com.donkeys_today.server.presentation.diary.dto.response.DiaryListResponse;
import com.donkeys_today.server.presentation.diary.dto.response.DiaryResponse;
import com.donkeys_today.server.support.dto.ApiResponse;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
Expand Down Expand Up @@ -39,4 +45,11 @@ ResponseEntity<ApiResponse<DiaryResponse>> getDiary(
@RequestParam @Parameter(name = "달", description = "조회할 달", required = true) final int month,
@RequestParam @Parameter(name = "일", description = "조회할 일", required = true) final int day
);

@Operation(summary = "일기 작성 ", description = "작성 일자와 일기 리스트를 이용해 일기를 작성하고, 답변을 요청합니다.")
@PostMapping("/dairy")
ResponseEntity<ApiResponse<DiaryCreatedResponse>> postDiary(
@RequestHeader(Constants.AUTHORIZATION) String accessToken,
@RequestBody @Parameter(name = "연도", description = "작성할 연도", required = true) final DiaryRequest request
);
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.donkeys_today.server.presentation.api.DiaryController;
import com.donkeys_today.server.presentation.diary.dto.request.DiaryRequest;
import com.donkeys_today.server.presentation.diary.dto.response.DiaryCalenderResponse;
import com.donkeys_today.server.presentation.diary.dto.response.DiaryCreatedResponse;
import com.donkeys_today.server.presentation.diary.dto.response.DiaryListResponse;
import com.donkeys_today.server.presentation.diary.dto.response.DiaryResponse;
import com.donkeys_today.server.support.dto.ApiResponse;
Expand Down Expand Up @@ -53,7 +54,7 @@ public ResponseEntity<ApiResponse<DiaryResponse>> getDiary(int year, int month,
}

@PostMapping("/diary")
public ResponseEntity<ApiResponse<?>> createDiary(@RequestHeader(Constants.AUTHORIZATION) String accessToken, @RequestBody DiaryRequest request) {
public ResponseEntity<ApiResponse<DiaryCreatedResponse>> postDiary(@RequestHeader(Constants.AUTHORIZATION) String accessToken, @RequestBody DiaryRequest request) {
return ResponseEntity.status(HttpStatus.OK)
.body(ApiResponse.success(SuccessType.CREATED_SUCCESS, diaryService.createDiary(request)));
}
Expand Down

0 comments on commit 155b002

Please sign in to comment.