Skip to content

Commit 9857674

Browse files
committed
refactor: sprint7 수정
1 parent 54e44fa commit 9857674

37 files changed

+5146
-1128
lines changed

.idea/gradle.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.logs/application.log

Lines changed: 4727 additions & 0 deletions
Large diffs are not rendered by default.

build.gradle

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ plugins {
22
id 'java-library'
33
id 'org.springframework.boot' version '3.4.2'
44
id 'io.spring.dependency-management' version '1.1.7'
5+
id 'jacoco'
56
}
67

78
group = 'com.sprint.mission'
@@ -26,15 +27,32 @@ dependencies {
2627
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
2728
implementation 'org.postgresql:postgresql:42.7.4'
2829
implementation 'org.mapstruct:mapstruct:1.6.3'
30+
implementation 'org.springframework.boot:spring-boot-starter-validation'
31+
implementation 'org.springframework.boot:spring-boot-starter-actuator'
32+
implementation 'org.apache.httpcomponents.client5:httpclient5:5.4.2'
2933
compileOnly 'org.projectlombok:lombok'
3034
annotationProcessor 'org.projectlombok:lombok'
3135
annotationProcessor 'org.mapstruct:mapstruct-processor:1.6.3'
3236
testImplementation 'org.springframework.boot:spring-boot-starter-test'
3337
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
3438
testImplementation platform('org.junit:junit-bom:5.10.0')
3539
testImplementation 'org.junit.jupiter:junit-jupiter'
40+
testImplementation 'com.h2database:h2'
41+
}
42+
43+
jacocoTestReport {
44+
dependsOn test
45+
reports {
46+
xml.required = true
47+
html.required = true
48+
}
3649
}
3750

3851
test {
3952
useJUnitPlatform()
53+
finalizedBy jacocoTestReport
54+
}
55+
56+
springBoot {
57+
buildInfo()
4058
}

src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
66

77
@SpringBootApplication
8-
@EnableJpaAuditing
98
public class DiscodeitApplication {
109

1110
public static void main(String[] args) {

src/main/java/com/sprint/mission/discodeit/controller/AuthController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.sprint.mission.discodeit.dto.user.AuthRequestDto;
55
import com.sprint.mission.discodeit.dto.user.UserDto;
66
import com.sprint.mission.discodeit.service.Interface.AuthService;
7+
import jakarta.validation.Valid;
78
import lombok.RequiredArgsConstructor;
89
import org.springframework.http.HttpStatus;
910
import org.springframework.http.ResponseEntity;
@@ -19,7 +20,7 @@ public class AuthController implements AuthApi {
1920

2021
@Override
2122
@PostMapping(value = "/login")
22-
public ResponseEntity<UserDto> login(@RequestBody AuthRequestDto request) {
23+
public ResponseEntity<UserDto> login(@Valid @RequestBody AuthRequestDto request) {
2324
return ResponseEntity.status(HttpStatus.OK).body(authService.login(request));
2425
}
2526
}

src/main/java/com/sprint/mission/discodeit/controller/ChannelController.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.sprint.mission.discodeit.dto.channel.PrivateChannelCreateRequestDto;
77
import com.sprint.mission.discodeit.dto.channel.PublicChannelCreateRequestDto;
88
import com.sprint.mission.discodeit.service.Interface.ChannelService;
9+
import jakarta.validation.Valid;
910
import lombok.RequiredArgsConstructor;
1011
import org.springframework.http.HttpStatus;
1112
import org.springframework.http.ResponseEntity;
@@ -24,23 +25,23 @@ public class ChannelController implements ChannelApi {
2425
@Override
2526
@PostMapping("/public")
2627
public ResponseEntity<ChannelDto> createChannel(
27-
@RequestBody PublicChannelCreateRequestDto request) {
28+
@Valid @RequestBody PublicChannelCreateRequestDto request) {
2829
return ResponseEntity.status(HttpStatus.CREATED)
2930
.body(channelService.createPublicChannel(request));
3031
}
3132

3233
@Override
3334
@PostMapping("/private")
3435
public ResponseEntity<ChannelDto> createChannel(
35-
@RequestBody PrivateChannelCreateRequestDto request) {
36+
@Valid @RequestBody PrivateChannelCreateRequestDto request) {
3637
return ResponseEntity.status(HttpStatus.CREATED)
3738
.body(channelService.createPrivateChannel(request));
3839
}
3940

4041
@Override
4142
@PatchMapping("/{channelId}")
4243
public ResponseEntity<ChannelDto> updateChannel(@PathVariable UUID channelId,
43-
@RequestBody ChannelUpdateRequestDto request) {
44+
@Valid @RequestBody ChannelUpdateRequestDto request) {
4445
return ResponseEntity.ok(channelService.updateChannel(channelId, request));
4546
}
4647

src/main/java/com/sprint/mission/discodeit/controller/MessageController.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.sprint.mission.discodeit.dto.message.MessageDto;
88
import com.sprint.mission.discodeit.dto.response.PageResponse;
99
import com.sprint.mission.discodeit.service.Interface.MessageService;
10+
import jakarta.validation.Valid;
1011
import java.time.Instant;
1112
import lombok.RequiredArgsConstructor;
1213
import org.springframework.http.HttpStatus;
@@ -29,7 +30,7 @@ public class MessageController implements MessageApi {
2930
@Override
3031
@PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
3132
public ResponseEntity<MessageDto> createMessage(
32-
@RequestPart("messageCreateRequest") CreateMessageRequestDto messageCreateRequest,
33+
@Valid @RequestPart("messageCreateRequest") CreateMessageRequestDto messageCreateRequest,
3334
@RequestPart(value = "attachments", required = false) List<MultipartFile> attachments) {
3435

3536
List<BinaryContentDto> attachmentRequests = attachments != null
@@ -47,7 +48,7 @@ public ResponseEntity<MessageDto> createMessage(
4748
@Override
4849
@PatchMapping("/{messageId}")
4950
public ResponseEntity<MessageDto> updateMessage(@PathVariable("messageId") UUID messageId,
50-
@RequestBody UpdateMessageRequestDto request) {
51+
@Valid @RequestBody UpdateMessageRequestDto request) {
5152
MessageDto updatedMessage = messageService.updateMessage(messageId, request);
5253
return ResponseEntity.status(HttpStatus.OK).body(updatedMessage);
5354
}

src/main/java/com/sprint/mission/discodeit/controller/ReadStatusController.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.sprint.mission.discodeit.dto.readstatus.ReadStatusDto;
66
import com.sprint.mission.discodeit.dto.readstatus.UpdateReadStatusRequestDto;
77
import com.sprint.mission.discodeit.service.Interface.ReadStatusService;
8+
import jakarta.validation.Valid;
89
import lombok.RequiredArgsConstructor;
910
import org.springframework.http.HttpStatus;
1011
import org.springframework.http.ResponseEntity;
@@ -23,15 +24,15 @@ public class ReadStatusController implements ReadStatusApi {
2324
@Override
2425
@PostMapping
2526
public ResponseEntity<ReadStatusDto> createReadStatus(
26-
@RequestBody CreateReadStatusRequestDto request) {
27+
@Valid @RequestBody CreateReadStatusRequestDto request) {
2728
ReadStatusDto readStatus = readStatusService.create(request);
2829
return ResponseEntity.ok(readStatus);
2930
}
3031

3132
@Override
3233
@PatchMapping("/{readStatusId}")
3334
public ResponseEntity<ReadStatusDto> updateReadStatus(@PathVariable UUID readStatusId,
34-
@RequestBody UpdateReadStatusRequestDto request) {
35+
@Valid @RequestBody UpdateReadStatusRequestDto request) {
3536
ReadStatusDto updatedReadStatus = readStatusService.update(readStatusId, request);
3637
return ResponseEntity.ok(updatedReadStatus);
3738
}

src/main/java/com/sprint/mission/discodeit/controller/UserController.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.sprint.mission.discodeit.entity.UserStatus;
99
import com.sprint.mission.discodeit.service.Interface.UserService;
1010
import com.sprint.mission.discodeit.service.Interface.UserStatusService;
11+
import jakarta.validation.Valid;
1112
import lombok.RequiredArgsConstructor;
1213
import org.springframework.http.HttpStatus;
1314
import org.springframework.http.MediaType;
@@ -29,7 +30,7 @@ public class UserController implements UserApi {
2930
@Override
3031
@PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
3132
public ResponseEntity<UserDto> createUser(
32-
@RequestPart("userCreateRequest") UserCreateRequestDto userCreateRequest,
33+
@Valid @RequestPart("userCreateRequest") UserCreateRequestDto userCreateRequest,
3334
@RequestPart(value = "profile", required = false) MultipartFile profile) {
3435

3536
UserDto createdUser = userService.createUser(userCreateRequest, profile);
@@ -48,7 +49,7 @@ public ResponseEntity<List<UserDto>> findAll() {
4849
MediaType.MULTIPART_FORM_DATA_VALUE}, produces = MediaType.APPLICATION_JSON_VALUE)
4950
public ResponseEntity<UserDto> updateUser(
5051
@PathVariable("userId") UUID userId,
51-
@RequestPart("userUpdateRequest") UserUpdateRequestDto userUpdateRequest,
52+
@Valid @RequestPart("userUpdateRequest") UserUpdateRequestDto userUpdateRequest,
5253
@RequestPart(value = "profile", required = false) MultipartFile profile
5354
) {
5455

src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelUpdateRequestDto.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package com.sprint.mission.discodeit.dto.channel;
22

3+
import jakarta.validation.constraints.Size;
34
import lombok.Getter;
45

56
@Getter
67
public class ChannelUpdateRequestDto {
78

9+
@Size(min = 1, max = 20, message = "채널 이름은 한 글자 이상 20자 이하")
810
private String newName;
911
private String NewDescription;
1012

0 commit comments

Comments
 (0)