Skip to content

Commit 9979811

Browse files
authored
Merge pull request #32 from classic-daramg/feature/28-post-update
Feature/28 post update
2 parents 6887b81 + 9c198e4 commit 9979811

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1999
-215
lines changed

โ€Žbuild.gradleโ€Ž

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ test {
7979

8080
afterTest { desc, result ->
8181
if (result.resultType == TestResult.ResultType.FAILURE) {
82-
println "\n โŒ===== FAILED: ${desc.getDisplayName}"
82+
println "\n โŒ===== FAILED: ${desc.displayName}"
8383

8484
def exception = result.exception
8585
if (exception?.getClass()?.name == 'org.opentest4j.AssertionFailedError') {
@@ -109,10 +109,13 @@ openapi3{
109109
description = 'ํด๋ž˜์‹ ๋“ฃ๋Š” ๋‹ค๋žŒ์ฅ์˜ API ๋ฌธ์„œ์ž…๋‹ˆ๋‹ค.'
110110
version = '0.1.0'
111111
format = 'yaml'
112-
outputDirectory = file('build/api-spec')
112+
outputDirectory = file('src/main/resources/static/swagger-ui')
113113
}
114114

115115
tasks.named('bootJar') {
116+
duplicatesStrategy = DuplicatesStrategy.INCLUDE
117+
dependsOn tasks.named('openapi3')
118+
116119
layered {}
117120
from(tasks.named('openapi3').map { it.outputDirectory }) {
118121
into 'static/swagger-ui'

โ€Žsrc/main/java/com/daramg/server/common/application/EntityUtils.javaโ€Ž

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.daramg.server.common.application;
22

3-
import com.daramg.server.common.exception.CommonErrorStatus;
43
import com.daramg.server.common.exception.NotFoundException;
54
import jakarta.persistence.EntityManager;
65
import lombok.RequiredArgsConstructor;
@@ -16,6 +15,8 @@ public class EntityUtils {
1615

1716
public <T> T getEntity(Long id, Class<T> entityType) {
1817
return Optional.ofNullable(entityManager.find(entityType, id))
19-
.orElseThrow(() -> new NotFoundException(CommonErrorStatus.NOT_FOUND));
18+
.orElseThrow(() -> new NotFoundException(
19+
String.format("์กด์žฌํ•˜์ง€ ์•Š๋Š” %s์ž…๋‹ˆ๋‹ค. (target ID: %d)", entityType.getSimpleName(), id)
20+
));
2021
}
2122
}

โ€Žsrc/main/java/com/daramg/server/common/exception/BusinessException.javaโ€Ž

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,22 @@ public class BusinessException extends RuntimeException{
99
private final BaseErrorCode errorCode;
1010

1111
public BusinessException() {
12-
this(defaultErrorCode);
12+
super(defaultErrorCode.getMessage());
13+
this.errorCode = defaultErrorCode;
1314
}
1415

1516
public BusinessException(BaseErrorCode errorCode) {
17+
super(errorCode.getMessage());
18+
this.errorCode = errorCode;
19+
}
20+
21+
public BusinessException(String message) {
22+
super(message);
23+
this.errorCode = defaultErrorCode;
24+
}
25+
26+
public BusinessException(String message, BaseErrorCode errorCode) {
27+
super(message);
1628
this.errorCode = errorCode;
1729
}
1830
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
package com.daramg.server.common.exception;
22

33
public class NotFoundException extends BusinessException {
4+
5+
private final static BaseErrorCode defaultErrorCode = CommonErrorStatus.NOT_FOUND;
6+
7+
public NotFoundException() {
8+
super(defaultErrorCode);
9+
}
10+
411
public NotFoundException(BaseErrorCode errorCode) {
512
super(errorCode);
613
}
14+
15+
public NotFoundException(String message) {
16+
super(message, defaultErrorCode);
17+
}
718
}

src/main/java/com/daramg/server/domain/composer/Composer.java renamed to src/main/java/com/daramg/server/domain/composer/domain/Composer.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.daramg.server.domain.composer;
1+
package com.daramg.server.domain.composer.domain;
22

33
import com.daramg.server.common.domain.BaseEntity;
44
import jakarta.persistence.*;
@@ -8,9 +8,6 @@
88
import lombok.NoArgsConstructor;
99
import org.springframework.lang.NonNull;
1010

11-
import java.util.ArrayList;
12-
import java.util.List;
13-
1411
@Entity
1512
@Getter
1613
@Table(name = "composers")
@@ -48,7 +45,7 @@ public class Composer extends BaseEntity<Composer> {
4845
private Continent continent;
4946

5047
@Builder
51-
public Composer(@NonNull String koreanName, @NonNull String englishName,
48+
private Composer(@NonNull String koreanName, @NonNull String englishName,
5249
String nativeName, @NonNull Gender gender, String nationality,
5350
Short birthYear, Short deathYear, Era era, Continent continent) {
5451
this.koreanName = koreanName;

src/main/java/com/daramg/server/domain/composer/ComposerPost.java renamed to src/main/java/com/daramg/server/domain/composer/domain/ComposerPost.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.daramg.server.domain.composer;
1+
package com.daramg.server.domain.composer.domain;
22

33
import com.daramg.server.common.domain.BaseEntity;
44
import com.daramg.server.domain.post.domain.Post;

src/main/java/com/daramg/server/domain/composer/Continent.java renamed to src/main/java/com/daramg/server/domain/composer/domain/Continent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.daramg.server.domain.composer;
1+
package com.daramg.server.domain.composer.domain;
22

33
public enum Continent {
44
ASIA,

src/main/java/com/daramg/server/domain/composer/Era.java renamed to src/main/java/com/daramg/server/domain/composer/domain/Era.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.daramg.server.domain.composer;
1+
package com.daramg.server.domain.composer.domain;
22

33
public enum Era {
44
MEDIEVAL_RENAISSANCE,

src/main/java/com/daramg/server/domain/composer/Gender.java renamed to src/main/java/com/daramg/server/domain/composer/domain/Gender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.daramg.server.domain.composer;
1+
package com.daramg.server.domain.composer.domain;
22

33
public enum Gender {
44
MALE,
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package com.daramg.server.domain.composer.repository;
2+
3+
import com.daramg.server.domain.composer.domain.Composer;
4+
import org.springframework.data.jpa.repository.JpaRepository;
5+
import org.springframework.stereotype.Repository;
6+
7+
@Repository
8+
public interface ComposerRepository extends JpaRepository<Composer, Long> {
9+
}

0 commit comments

Comments
ย (0)