Skip to content

Commit 183e30c

Browse files
jiixonjiixon
committed
S3config 설정
1 parent ee53b82 commit 183e30c

14 files changed

Lines changed: 141 additions & 170 deletions

File tree

‎build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ dependencies {
3333
runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.5'
3434
runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.5'
3535

36+
implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
3637

3738
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
3839
implementation 'mysql:mysql-connector-java:8.0.31'

‎src/main/java/com/itsu/threedays/InitialUserLoader.java‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎src/main/java/com/itsu/threedays/config/S3Config.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package com.itsu.threedays.config;
2+
3+
import com.amazonaws.auth.AWSStaticCredentialsProvider;
4+
import com.amazonaws.auth.BasicAWSCredentials;
5+
import com.amazonaws.services.s3.AmazonS3Client;
6+
import com.amazonaws.services.s3.AmazonS3ClientBuilder;
7+
import org.springframework.beans.factory.annotation.Value;
8+
import org.springframework.context.annotation.Bean;
9+
import org.springframework.context.annotation.Configuration;
10+
11+
@Configuration
12+
public class S3Config {
13+
@Value("${cloud.aws.credentials.access-key}")
14+
private String accessKey;
15+
@Value("${cloud.aws.credentials.secret-key}")
16+
private String secretKey;
17+
@Value("${cloud.aws.region.static}")
18+
private String region;
19+
20+
@Bean
21+
public AmazonS3Client amazonS3Client() {
22+
BasicAWSCredentials awsCredentials= new BasicAWSCredentials(accessKey, secretKey);
23+
return (AmazonS3Client) AmazonS3ClientBuilder.standard()
24+
.withRegion(region)
25+
.withCredentials(new AWSStaticCredentialsProvider(awsCredentials))
26+
.build();
27+
}
28+
}

‎src/main/java/com/itsu/threedays/config/jwt/JwtConfig.java‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎src/main/java/com/itsu/threedays/config/jwt/JwtTokenProvider.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,12 @@ public Authentication getAuthentication(String token) {
9191

9292
return new UsernamePasswordAuthenticationToken(principal, token, authorities);
9393
}
94+
95+
public String resolveToken(HttpServletRequest request){
96+
String bearerToken = request.getHeader("authorization");
97+
if(StringUtils.hasText(bearerToken) && bearerToken.startsWith("Bearer ")) {
98+
return bearerToken.substring(7);
99+
}
100+
return null;
101+
}
94102
}

‎src/main/java/com/itsu/threedays/controller/HabitController.java‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ ResponseEntity<List<HabitResponseDto>> getHabitList(@RequestParam("email") Strin
6969
HabitResponseDto responseDto = new HabitResponseDto();
7070
responseDto.setId(habit.getId());
7171
responseDto.setTitle(habit.getTitle());
72+
responseDto.setDuration(habit.getDuration());
7273
responseDto.setVisible(habit.isVisible());
7374
responseDto.setComboCount(habit.getComboCount());
7475
responseDto.setAchievementRate(habit.getAchievementRate());
@@ -79,28 +80,6 @@ ResponseEntity<List<HabitResponseDto>> getHabitList(@RequestParam("email") Strin
7980
return ResponseEntity.ok(habitResponseDtos);
8081
}
8182

82-
@GetMapping("habits/edit-list") //편집시 습관목록조회(중지일 포함)
83-
ResponseEntity<List<HabitEditResponseDto>> getHabitEditList(@RequestParam("email") String email) throws Exception{
84-
List<HabitEntity> habits = habitService.findUndeletedAndAllHabits(email);
85-
log.info("undeletedAndAllHabits: {}",habits);
86-
List<HabitEditResponseDto> habitEditListDto = habits.stream()
87-
.map(habitEntity -> {
88-
HabitEditResponseDto editResponseDto = new HabitEditResponseDto();
89-
editResponseDto.setId(habitEntity.getId());
90-
editResponseDto.setTitle(habitEntity.getTitle());
91-
editResponseDto.setDuration(habitEntity.getDuration());
92-
editResponseDto.setVisible(habitEntity.isVisible());
93-
editResponseDto.setComboCount(habitEntity.getComboCount());
94-
editResponseDto.setAchievementRate(habitEntity.getAchievementRate());
95-
editResponseDto.setAchievementCount(habitEntity.getAchievementCount());
96-
editResponseDto.setStopDate(habitEntity.getStopDate()); //중지일
97-
return editResponseDto;
98-
})
99-
.collect(Collectors.toList());
100-
return ResponseEntity.ok(habitEditListDto)
101-
}
102-
103-
10483

10584
@PutMapping("habits/{habitId}/edit") //습관수정(이름, 기간, 공개여부)
10685
ResponseEntity<HabitResponseDto> updateHabit(@PathVariable("habitId") Long habitId,
@@ -134,12 +113,26 @@ ResponseEntity<String> stopHabit(@PathVariable("habitId") Long habitId){
134113

135114
}
136115

137-
//습관 편집시 목록
138-
116+
@GetMapping("habits/edit-list") //편집시 습관목록조회(중지일 포함)
117+
ResponseEntity<List<HabitEditResponseDto>> getHabitEditList(@RequestParam("email") String email) throws Exception{
118+
List<HabitEntity> habits = habitService.findUndeletedAndAllHabits(email);
119+
log.info("undeletedAndAllHabits: {}",habits);
120+
List<HabitEditResponseDto> habitEditListDto = habits.stream()
121+
.map(habitEntity -> {
122+
HabitEditResponseDto editResponseDto = new HabitEditResponseDto();
123+
habitService.setCommonHabitFields(editResponseDto,habitEntity); //공통필드 설정
124+
editResponseDto.setStopDate(habitEntity.getStopDate()); //중지일
125+
return editResponseDto;
126+
})
127+
.collect(Collectors.toList());
128+
return ResponseEntity.ok(habitEditListDto);
129+
}
139130

140131
@GetMapping("habits/{habitId}/reset") //매주마다 달성횟수 리셋
141132
ResponseEntity<String> resetAchievement(@PathVariable("habitId") Long habitId){
142133
habitService.resetAchievement(habitId);
143134
return ResponseEntity.ok("Resetting the achievement count was successful.");
144135
}
136+
137+
145138
}

‎src/main/java/com/itsu/threedays/controller/KaKaoLoginController.java‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import org.springframework.web.client.HttpClientErrorException;
2222
import org.springframework.web.client.RestTemplate;
2323

24+
import javax.servlet.http.HttpServletRequest;
25+
2426
@RestController
2527
@RequiredArgsConstructor
2628
@RequestMapping("api")
@@ -109,20 +111,19 @@ ResponseEntity<?> responseJwtToken(@RequestBody UserDto userDto) { //파베 토
109111
return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
110112
}
111113

112-
// @GetMapping("/test")
113-
// public ResponseEntity<String> testApi(HttpServletRequest request) {
114-
// log.info("!!");
115-
// String jwt = tokenProvider.resolveToken(request);
116-
// log.info("testApi - jwt: {}",jwt);
117-
// if (jwt == null) {
118-
// return new ResponseEntity<>("JWT not found!", HttpStatus.BAD_REQUEST);
119-
// }
120-
//
121-
// if (tokenProvider.validateToken(jwt)) {
122-
// return new ResponseEntity<>("JWT is valid", HttpStatus.OK);
123-
// } else {
124-
// return new ResponseEntity<>("JWT is invalid", HttpStatus.UNAUTHORIZED);
125-
// }
126-
// }
114+
@GetMapping("/test")
115+
public ResponseEntity<String> testApi(HttpServletRequest request) {
116+
String jwt = tokenProvider.resolveToken(request);
117+
log.info("testApi - jwt: {}",jwt);
118+
if (jwt == null) {
119+
return new ResponseEntity<>("JWT not found!", HttpStatus.BAD_REQUEST);
120+
}
121+
122+
if (tokenProvider.validateToken(jwt)) {
123+
return new ResponseEntity<>("JWT is valid", HttpStatus.OK);
124+
} else {
125+
return new ResponseEntity<>("JWT is invalid", HttpStatus.UNAUTHORIZED);
126+
}
127+
}
127128

128129
}

‎src/main/java/com/itsu/threedays/dto/HabitEditResponseDto.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,8 @@
88
import java.time.LocalDateTime;
99

1010
@Data
11-
@Builder
1211
@AllArgsConstructor
1312
@NoArgsConstructor
14-
public class HabitEditResponseDto {
15-
Long id;
16-
String title;
17-
int duration;
18-
boolean visible;
19-
int comboCount;
20-
int achievementRate;
21-
int achievementCount;
13+
public class HabitEditResponseDto extends HabitResponseDto{
2214
LocalDateTime stopDate;
2315
}

‎src/main/java/com/itsu/threedays/dto/HabitResponseDto.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@ public class HabitResponseDto {
1919
int comboCount;
2020
int achievementRate;
2121
int achievementCount;
22+
23+
//추가할 것
24+
2225
}

‎src/main/java/com/itsu/threedays/repository/HabitRepository.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public interface HabitRepository extends JpaRepository<HabitEntity,Long> {
1313
List<HabitEntity> findAllByUserId(UserEntity userId);
1414
List<HabitEntity> findAllByUserIdAndDeleteYnAndStopDateIsNull(UserEntity userId, boolean deleteYn);
1515

16-
List<HabitEntity> findAllByUserIdAndDeleteYn(boolean deleteYn);
16+
List<HabitEntity> findAllByDeleteYn(boolean deleteYn);
1717

1818
Optional<HabitEntity> findById(Long habitId);
1919

0 commit comments

Comments
 (0)