Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #57

Merged
merged 32 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c79b73b
chore: ํ™˜๊ฒฝ๋ณ€์ˆ˜ ์„ธํŒ…
Mar 29, 2024
562a909
Merge branch 'chore/#2-aws_settings' of https://github.com/KAU2024-SAโ€ฆ
Mar 29, 2024
cae4c98
chore: aws secret manager ์„ค์ •
Apr 1, 2024
fbd8664
Merge pull request #11 from KAU2024-SANHAK/chore/#2-aws_settings
hoeun0723 Apr 1, 2024
1b3f0ee
[chore] CI/CD settings (#13)
hoeun0723 Apr 3, 2024
e32370f
feat/14-entity develop๋ธŒ๋žœ์น˜์— merge
jms0324 Apr 10, 2024
b810ab8
Feat/#14 entity (#15)
jms0324 Apr 10, 2024
4959fa4
refactor: entity์— ๊ฐ์ •,์กฐ์–ธ ๋ถ„๋ฆฌ
jms0324 Apr 10, 2024
92f38b2
refactor:์ˆ˜์ •์™„๋ฃŒ
jms0324 Apr 10, 2024
acf5dae
Merge branch 'develop' into refactor/#17-entity-retouch
jms0324 Apr 10, 2024
ba7962f
Merge pull request #18 from KAU2024-SANHAK/refactor/#17-entity-retouch
jms0324 Apr 10, 2024
a378d32
refactor: feelingํด๋ž˜์Šค ๊ฐ์ •์ถ”๊ฐ€
jms0324 Apr 12, 2024
bd24f25
feat: summary์—”ํ‹ฐํ‹ฐ๋”ฐ๋กœ์ƒ์„ฑ ํ›„ member์™€ ๋‹ค๋Œ€์ผ์–‘๋ฐฉํ–ฅ๊ด€๊ณ„์ƒ์„ฑ
jms0324 Apr 12, 2024
d8429e4
worried ์ŠคํŽ ๋ง์ˆ˜์ •
jms0324 Apr 12, 2024
2bfa311
Merge pull request #23 from KAU2024-SANHAK/refactor/#22-entity-feelinโ€ฆ
jms0324 Apr 12, 2024
e326417
feat: ์นด์นด์˜ค ๋กœ๊ทธ์ธ ๊ตฌํ˜„+s3์„œ๋ฒ„ ์„ธํŒ… (#31)
hoeun0723 Apr 29, 2024
d6645e8
Merge branch 'main' into develop
hoeun0723 Apr 29, 2024
58aa184
fix: build.gradle ํŒŒ์ผ ์ตœ์‹ ํ™”
Apr 29, 2024
acb9ade
Feat/#30 slowtype save api (#32)
jms0324 Apr 30, 2024
a776f79
fix: bootstarp ํŒŒ์ผ์ด ์—†๋Š” ์˜ค๋ฅ˜ ํ•ด๊ฒฐ
Apr 30, 2024
4219070
Merge branch 'develop' of https://github.com/KAU2024-SANHAK/SANHAK_Seโ€ฆ
Apr 30, 2024
4d614a2
refactor: ์นด์นด์˜ค ์ธ๊ฐ€์ฝ”๋“œ ํ”„๋ก ํŠธ์ธก์—ซ์„œ ๋ฐ›์•„์˜ค๋Š” ๋ฐฉ์‹์œผ๋กœ ์ˆ˜์ • (#36)
hoeun0723 Apr 30, 2024
6364cfb
[refactor] kakao login ๊ธฐ์กด ํ”„๋ก ํŠธ๊ฐ€ ํ† ํฐ ๊ฐ€์ ธ์˜ค๋Š” ๋ฐฉ์‹์œผ๋กœ ์ˆ˜์ • (#38)
hoeun0723 May 2, 2024
f17b08e
Merge branch 'main' into develop
hoeun0723 May 2, 2024
d2b6f8c
Refactor/#40 slow type diary retry (#41)
jms0324 May 4, 2024
8debb90
Refactor/#40 slow type diary retry (#44)
jms0324 May 4, 2024
67f46db
Merge branch 'main' into develop
jms0324 May 4, 2024
4fcf436
Refactor/#46 choose diary type api retry (#47)
jms0324 May 5, 2024
4f39a5e
feeling๋ณ„ diary list์กฐํšŒ api์ˆ˜์ • (#50)
jms0324 May 6, 2024
c6cacf6
refactor:content api์ฝ”๋“œ์ˆ˜์ •๋ฐ responseDto ์ˆ˜์ • (#53)
jms0324 May 7, 2024
cc50f3d
Refactor/#55 list calendar api retry (#56)
jms0324 May 9, 2024
0ace7b3
Merge branch 'main' into develop
jms0324 May 9, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.io.IOException;
import java.security.Principal;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.List;
import java.util.Map;
import java.util.Optional;
Expand Down Expand Up @@ -116,8 +117,14 @@ public ResponseEntity<ApiResponse<?>> getDiariesByMonth(@RequestBody CurrentDate
return ResponseEntity.ok().body(ApiResponse.success(SuccessType.PROCESS_SUCCESSED, responseMap));*/

@PostMapping("/api/diary/list/calendar")
public ResponseEntity<ApiResponse<?>> getDiariesByMonth(Principal principal,@RequestBody CurrentDateRequestDto requestDto){
Long memberId= JwtProvider.getUserFromPrincipal(principal);
public ResponseEntity<ApiResponse<?>> getDiariesByMonth(@RequestHeader("Authorization") String authHeader,@RequestBody CurrentDateRequestDto requestDto){

String accessToken = null;
if (authHeader != null && authHeader.startsWith("Bearer ")) {
accessToken = authHeader.substring(7);
}
Long memberId= jwtProvider.getUserFromJwt(accessToken);

LocalDateTime currentDate = requestDto.getCurrentDate();

List<Diary> diaries = diaryService.findDiariesByMonthAndMemberId(currentDate, memberId);
Expand Down Expand Up @@ -168,6 +175,7 @@ public ResponseEntity<ApiResponse<?>> getDiariesByFeeling( @RequestHeader(value
accessToken = authHeader.substring(7);
}


Long memberId= jwtProvider.getUserFromJwt(accessToken);
Feeling feeling=Feeling.valueOf(requestDto.getFeeling());
List<Diary> diaries = diaryService.findDiariesByMemberIdAndFeeling(memberId,feeling);
Expand Down Expand Up @@ -207,22 +215,25 @@ public ResponseEntity<ApiResponse<?>> createSlowTypeDiary(@RequestPart("imageurl
}
}*/
@PostMapping("/api/diary/create/slow")
public ResponseEntity<ApiResponse<?>> createSlowTypeDiary(@RequestHeader(value = "Authorization") String authHeader, @RequestPart(value = "imageurl")MultipartFile image,
@RequestPart(value = "diaryTitle") String diaryTitle,
@RequestPart(value = "diaryContent") String diaryContent){

try {
String accessToken = null;
if (authHeader != null && authHeader.startsWith("Bearer ")) {
accessToken = authHeader.substring(7);
}
String imageUrl = s3UploaderService.upload(image);
Long memberId= jwtProvider.getUserFromJwt(accessToken);
Member member= memberService.findByIdOrThrow(memberId);
Diary diary = new Diary();
diary.setTitle(diaryTitle);
diary.setMember(member);
diary.setContent(diaryContent);
public ResponseEntity<ApiResponse<?>> createSlowTypeDiary(@RequestHeader(value = "Authorization") String authHeader, @RequestPart(value = "imageurl")MultipartFile image,
@RequestPart(value = "diaryTitle") String diaryTitle,
@RequestPart(value = "diaryContent") String diaryContent){

try {
String accessToken = null;
if (authHeader != null && authHeader.startsWith("Bearer ")) {
accessToken = authHeader.substring(7);
}
String imageUrl = s3UploaderService.upload(image);
Long memberId= jwtProvider.getUserFromJwt(accessToken);
Member member= memberService.findByIdOrThrow(memberId);
Diary diary = new Diary();
diary.setTitle(diaryTitle);
diary.setMember(member);
diary.setContent(diaryContent);
System.out.println(LocalDateTime.now());
diary.setWritedAt(LocalDateTime.now()); //์ด๋ถ€๋ถ„์ถ”๊ฐ€
System.out.println(diary.getWritedAt());
diary.setImageurl(imageUrl);

Diary savedDiary=diaryService.saveDiary(diary);
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/application-dev1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ spring:
config:
activate:
on-profile: dev1
servlet:
multipart:
max-file-size: 15MB
max-request-size: 20MB

datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/application-dev2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ spring:
config:
activate:
on-profile: dev2
servlet:
multipart:
max-file-size: 15MB
max-request-size: 20MB

datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ spring:
activate:
on-profile: local
import: optional:application-secret.properties
servlet:
multipart:
max-file-size: 15MB
max-request-size: 20MB

datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
spring:
profiles:
active: local
servlet:
multipart:
max-file-size: 15MB
max-request-size: 20MB


cloud:
Expand Down
Loading