diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 261357c..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.github/workflows/application-calendar-server-test.yml b/.github/workflows/application-core-server-test.yml similarity index 89% rename from .github/workflows/application-calendar-server-test.yml rename to .github/workflows/application-core-server-test.yml index afe81f7..85d8a03 100644 --- a/.github/workflows/application-calendar-server-test.yml +++ b/.github/workflows/application-core-server-test.yml @@ -24,4 +24,4 @@ jobs: run: chmod +x gradlew - name: ๐Ÿงช Spring Boot Test - run: ./gradlew clean application:wypl-calendar:test \ No newline at end of file + run: ./gradlew clean application:wypl-core:test \ No newline at end of file diff --git a/.gitignore b/.gitignore index ddeff23..55d456f 100644 --- a/.gitignore +++ b/.gitignore @@ -48,4 +48,5 @@ magick **/main/resources/static/swagger-ui/*.yaml ### macOS ### -.DS_Store \ No newline at end of file +.DS_Store +/**/.DS_Store \ No newline at end of file diff --git a/application/application-core/build.gradle b/application/application-common/build.gradle similarity index 100% rename from application/application-core/build.gradle rename to application/application-common/build.gradle diff --git a/application/application-core/src/main/java/com/wypl/applicationcore/WyplResponseEntity.java b/application/application-common/src/main/java/com/wypl/applicationcommon/WyplResponseEntity.java similarity index 97% rename from application/application-core/src/main/java/com/wypl/applicationcore/WyplResponseEntity.java rename to application/application-common/src/main/java/com/wypl/applicationcommon/WyplResponseEntity.java index 79dd5bc..f55d22b 100644 --- a/application/application-core/src/main/java/com/wypl/applicationcore/WyplResponseEntity.java +++ b/application/application-common/src/main/java/com/wypl/applicationcommon/WyplResponseEntity.java @@ -1,4 +1,4 @@ -package com.wypl.applicationcore; +package com.wypl.applicationcommon; import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatusCode; diff --git a/application/application-core/src/test/java/com/wypl/applicationcore/.gitkeep b/application/application-common/src/test/java/com/wypl/applicationcommon/.gitkeep similarity index 100% rename from application/application-core/src/test/java/com/wypl/applicationcore/.gitkeep rename to application/application-common/src/test/java/com/wypl/applicationcommon/.gitkeep diff --git a/application/wypl-calendar/build.gradle b/application/wypl-core/build.gradle similarity index 69% rename from application/wypl-calendar/build.gradle rename to application/wypl-core/build.gradle index 9d15d3b..a3812d6 100644 --- a/application/wypl-calendar/build.gradle +++ b/application/wypl-core/build.gradle @@ -8,5 +8,5 @@ java { } dependencies { - implementation project(':application:application-core') + implementation project(':application:application-common') } \ No newline at end of file diff --git a/application/wypl-calendar/src/main/java/com/wypl/wyplcalendar/WyplCalendarApplication.java b/application/wypl-core/src/main/java/com/wypl/wyplcore/WyplColorApplication.java similarity index 59% rename from application/wypl-calendar/src/main/java/com/wypl/wyplcalendar/WyplCalendarApplication.java rename to application/wypl-core/src/main/java/com/wypl/wyplcore/WyplColorApplication.java index 6ebef92..0950424 100644 --- a/application/wypl-calendar/src/main/java/com/wypl/wyplcalendar/WyplCalendarApplication.java +++ b/application/wypl-core/src/main/java/com/wypl/wyplcore/WyplColorApplication.java @@ -1,13 +1,13 @@ -package com.wypl.wyplcalendar; +package com.wypl.wyplcore; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class WyplCalendarApplication { +public class WyplColorApplication { public static void main(String[] args) { - SpringApplication.run(WyplCalendarApplication.class, args); + SpringApplication.run(WyplColorApplication.class, args); } } diff --git a/application/wypl-calendar/src/main/resources/application.properties b/application/wypl-core/src/main/resources/application.properties similarity index 100% rename from application/wypl-calendar/src/main/resources/application.properties rename to application/wypl-core/src/main/resources/application.properties diff --git a/application/wypl-calendar/src/test/java/com/wypl/wyplcalendar/WyplCalendarApplicationTests.java b/application/wypl-core/src/test/java/com/wypl/wyplcore/WyplCalendarApplicationTests.java similarity index 85% rename from application/wypl-calendar/src/test/java/com/wypl/wyplcalendar/WyplCalendarApplicationTests.java rename to application/wypl-core/src/test/java/com/wypl/wyplcore/WyplCalendarApplicationTests.java index 910cf2a..227c74f 100644 --- a/application/wypl-calendar/src/test/java/com/wypl/wyplcalendar/WyplCalendarApplicationTests.java +++ b/application/wypl-core/src/test/java/com/wypl/wyplcore/WyplCalendarApplicationTests.java @@ -1,4 +1,4 @@ -package com.wypl.wyplcalendar; +package com.wypl.wyplcore; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/application/wypl-image/build.gradle b/application/wypl-image/build.gradle index 4d3d6f5..fdcc68c 100644 --- a/application/wypl-image/build.gradle +++ b/application/wypl-image/build.gradle @@ -17,7 +17,7 @@ bootJar { dependencies { implementation project(':common') - implementation project(':application:application-core') + implementation project(':application:application-common') implementation project(':client:aws-s3-client') testImplementation('org.springframework.boot:spring-boot-starter-test') diff --git a/application/wypl-image/src/main/java/com/wypl/wyplimage/controller/ImageController.java b/application/wypl-image/src/main/java/com/wypl/wyplimage/controller/ImageController.java index a697e9f..0105b63 100644 --- a/application/wypl-image/src/main/java/com/wypl/wyplimage/controller/ImageController.java +++ b/application/wypl-image/src/main/java/com/wypl/wyplimage/controller/ImageController.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.wypl.applicationcore.WyplResponseEntity; +import com.wypl.applicationcommon.WyplResponseEntity; import com.wypl.wyplimage.data.DeleteImageRequest; import com.wypl.wyplimage.data.UploadImageResponse; import com.wypl.wyplimage.service.ImageService; diff --git a/application/wypl-notification/build.gradle b/application/wypl-notification/build.gradle index 498e9d7..fb77cfd 100644 --- a/application/wypl-notification/build.gradle +++ b/application/wypl-notification/build.gradle @@ -8,5 +8,5 @@ java { } dependencies { - implementation project(':application:application-core') + implementation project(':application:application-common') } \ No newline at end of file diff --git a/domain/jpa-calendar-domain/build.gradle b/domain/jpa-calendar-domain/build.gradle index f47aa98..e883a9a 100644 --- a/domain/jpa-calendar-domain/build.gradle +++ b/domain/jpa-calendar-domain/build.gradle @@ -5,6 +5,7 @@ java { } dependencies { - implementation project(':domain:jpa-core') + implementation project(':common') + implementation project(':domain:jpa-common') implementation project(':domain:jpa-member-domain') } \ No newline at end of file diff --git a/domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/calendar/data/Color.java b/domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/calendar/data/Color.java deleted file mode 100644 index f608cdd..0000000 --- a/domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/calendar/data/Color.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.wypl.jpacalendardomain.calendar.data; - -public enum Color { - labelRed, - labelPink, - labelOrange, - labelYellow, - labelGreen, - labelLeaf, - labelBlue, - labelSky, - labelNavy, - labelIndigo, - labelPurple, - labelLavender, - labelCharcoal, - labelBrown -} diff --git a/domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/calendar/domain/Calendar.java b/domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/calendar/domain/Calendar.java index ca3215c..c6dc4ef 100644 --- a/domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/calendar/domain/Calendar.java +++ b/domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/calendar/domain/Calendar.java @@ -1,9 +1,19 @@ package com.wypl.jpacalendardomain.calendar.domain; -import jakarta.persistence.*; -import lombok.*; import org.hibernate.annotations.SQLRestriction; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + @Builder @Getter @AllArgsConstructor @@ -12,21 +22,21 @@ @Entity @Table(name = "calendar") public class Calendar { - // Todo : extends BaseEntity - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "calendar_id") - private Long calendarId; + // Todo : extends BaseEntity + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "calendar_id") + private Long calendarId; - @Column(name = "name", length = 20, nullable = false) - private String name; + @Column(name = "name", length = 20, nullable = false) + private String name; - @Column(name = "description", length = 50) - private String description; + @Column(name = "description", length = 50) + private String description; - @Column(name = "owner_id") - private Long ownerId; + @Column(name = "owner_id") + private Long ownerId; - // Todo : boolean type ์„ค์ • -// private Boolean isShared; + // Todo : boolean type ์„ค์ • + // private Boolean isShared; } diff --git a/domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/calendar/domain/MemberCalendar.java b/domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/calendar/domain/MemberCalendar.java index 6fde383..7e47593 100644 --- a/domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/calendar/domain/MemberCalendar.java +++ b/domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/calendar/domain/MemberCalendar.java @@ -1,12 +1,26 @@ package com.wypl.jpacalendardomain.calendar.domain; +import org.hibernate.annotations.SQLRestriction; + +import com.wypl.common.Color; import com.wypl.jpacalendardomain.calendar.data.InviteStatus; import com.wypl.jpamemberdomain.member.Member; -import jakarta.persistence.*; -import lombok.*; -import org.hibernate.annotations.SQLRestriction; -import java.awt.*; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; @Builder @Getter @@ -17,22 +31,22 @@ @IdClass(MemberCalendarId.class) @Table(name = "member_calendar") public class MemberCalendar { - // Todo : extends BaseEntity + // Todo : extends BaseEntity - @Id - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "member_id") - private Member member; + @Id + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; - @Id - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "calendar_id") - private Calendar calendar; + @Id + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "calendar_id") + private Calendar calendar; - @Column(name = "color", length = 6) - private Color color; + @Column(name = "color", length = 6) + private Color color; - @Enumerated(EnumType.STRING) - @Column(name = "status", length = 10, nullable = false) - private InviteStatus status; + @Enumerated(EnumType.STRING) + @Column(name = "status", length = 10, nullable = false) + private InviteStatus status; } diff --git a/domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/calendar/domain/MemberCalendarId.java b/domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/calendar/domain/MemberCalendarId.java index 54a8638..cdd0ef2 100644 --- a/domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/calendar/domain/MemberCalendarId.java +++ b/domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/calendar/domain/MemberCalendarId.java @@ -1,14 +1,14 @@ package com.wypl.jpacalendardomain.calendar.domain; +import java.io.Serializable; + import lombok.AccessLevel; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import java.io.Serializable; - @NoArgsConstructor(access = AccessLevel.PROTECTED) @EqualsAndHashCode public class MemberCalendarId implements Serializable { - private Long member; - private Long calendar; + private Long member; + private Long calendar; } diff --git a/domain/jpa-core/build.gradle b/domain/jpa-common/build.gradle similarity index 100% rename from domain/jpa-core/build.gradle rename to domain/jpa-common/build.gradle diff --git a/domain/jpa-core/src/main/java/com/wypl/jpacore/JpaAuditingConfig.java b/domain/jpa-common/src/main/java/com/wypl/jpacommon/JpaAuditingConfig.java similarity index 87% rename from domain/jpa-core/src/main/java/com/wypl/jpacore/JpaAuditingConfig.java rename to domain/jpa-common/src/main/java/com/wypl/jpacommon/JpaAuditingConfig.java index fca6d4e..c2a788d 100644 --- a/domain/jpa-core/src/main/java/com/wypl/jpacore/JpaAuditingConfig.java +++ b/domain/jpa-common/src/main/java/com/wypl/jpacommon/JpaAuditingConfig.java @@ -1,4 +1,4 @@ -package com.wypl.jpacore; +package com.wypl.jpacommon; import org.springframework.context.annotation.Configuration; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; diff --git a/domain/jpa-core/src/main/java/com/wypl/jpacore/JpaBaseEntity.java b/domain/jpa-common/src/main/java/com/wypl/jpacommon/JpaBaseEntity.java similarity index 97% rename from domain/jpa-core/src/main/java/com/wypl/jpacore/JpaBaseEntity.java rename to domain/jpa-common/src/main/java/com/wypl/jpacommon/JpaBaseEntity.java index 6bd4331..db588a4 100644 --- a/domain/jpa-core/src/main/java/com/wypl/jpacore/JpaBaseEntity.java +++ b/domain/jpa-common/src/main/java/com/wypl/jpacommon/JpaBaseEntity.java @@ -1,4 +1,4 @@ -package com.wypl.jpacore; +package com.wypl.jpacommon; import java.time.LocalDateTime; diff --git a/domain/jpa-core/src/main/java/com/wypl/jpacore/JpaErrorCode.java b/domain/jpa-common/src/main/java/com/wypl/jpacommon/JpaErrorCode.java similarity index 95% rename from domain/jpa-core/src/main/java/com/wypl/jpacore/JpaErrorCode.java rename to domain/jpa-common/src/main/java/com/wypl/jpacommon/JpaErrorCode.java index 5961a1f..e392a5d 100644 --- a/domain/jpa-core/src/main/java/com/wypl/jpacore/JpaErrorCode.java +++ b/domain/jpa-common/src/main/java/com/wypl/jpacommon/JpaErrorCode.java @@ -1,4 +1,4 @@ -package com.wypl.jpacore; +package com.wypl.jpacommon; import com.wypl.common.exception.ServerErrorCode; diff --git a/domain/jpa-core/src/test/java/com/wypl/jpacore/.gitkeep b/domain/jpa-common/src/test/java/com/wypl/jpacommon/.gitkeep similarity index 100% rename from domain/jpa-core/src/test/java/com/wypl/jpacore/.gitkeep rename to domain/jpa-common/src/test/java/com/wypl/jpacommon/.gitkeep diff --git a/domain/jpa-member-domain/build.gradle b/domain/jpa-member-domain/build.gradle index f46f91d..0682ea4 100644 --- a/domain/jpa-member-domain/build.gradle +++ b/domain/jpa-member-domain/build.gradle @@ -5,7 +5,7 @@ java { } dependencies { - implementation project(':domain:jpa-core') + implementation project(':domain:jpa-common') implementation project(':common') } \ No newline at end of file diff --git a/domain/jpa-member-domain/src/main/java/com/wypl/jpamemberdomain/member/SocialMember.java b/domain/jpa-member-domain/src/main/java/com/wypl/jpamemberdomain/member/SocialMember.java index 4df3645..5ab1c0e 100644 --- a/domain/jpa-member-domain/src/main/java/com/wypl/jpamemberdomain/member/SocialMember.java +++ b/domain/jpa-member-domain/src/main/java/com/wypl/jpamemberdomain/member/SocialMember.java @@ -1,6 +1,15 @@ package com.wypl.jpamemberdomain.member; -import jakarta.persistence.*; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Builder; @@ -14,20 +23,20 @@ @Entity @Table(name = "social_member_tbl") public class SocialMember { - @Id - @Column(name = "member_id") - private Long id; + @Id + @Column(name = "member_id") + private Long id; - @MapsId - @OneToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "member_id") - private Member member; + @MapsId + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; - @Enumerated(EnumType.STRING) - @Column(name = "oauth_provider", nullable = false) - private OauthProvider oauthProvider; + @Enumerated(EnumType.STRING) + @Column(name = "oauth_provider", nullable = false) + private OauthProvider oauthProvider; - @Column(name = "oauth_id", nullable = false) - private String OauthId; + @Column(name = "oauth_id", nullable = false) + private String OauthId; } diff --git a/domain/jpamongo-review-domain/build.gradle b/domain/jpamongo-review-domain/build.gradle index 4c56292..42349ab 100644 --- a/domain/jpamongo-review-domain/build.gradle +++ b/domain/jpamongo-review-domain/build.gradle @@ -6,8 +6,8 @@ java { dependencies { implementation project(':common') - implementation project(':domain:jpa-core') + implementation project(':domain:jpa-common') implementation project(':domain:jpa-member-domain') implementation project(':domain:jpa-calendar-domain') - implementation project(':domain:mongo-core') + implementation project(':domain:mongo-common') } diff --git a/domain/mongo-core/build.gradle b/domain/mongo-common/build.gradle similarity index 100% rename from domain/mongo-core/build.gradle rename to domain/mongo-common/build.gradle diff --git a/domain/mongo-core/src/main/java/com/wypl/mongocore/MongoAuditingConfig.java b/domain/mongo-common/src/main/java/com/wypl/mongocommon/MongoAuditingConfig.java similarity index 87% rename from domain/mongo-core/src/main/java/com/wypl/mongocore/MongoAuditingConfig.java rename to domain/mongo-common/src/main/java/com/wypl/mongocommon/MongoAuditingConfig.java index 95f3cf8..d23afa5 100644 --- a/domain/mongo-core/src/main/java/com/wypl/mongocore/MongoAuditingConfig.java +++ b/domain/mongo-common/src/main/java/com/wypl/mongocommon/MongoAuditingConfig.java @@ -1,4 +1,4 @@ -package com.wypl.mongocore; +package com.wypl.mongocommon; import org.springframework.context.annotation.Configuration; import org.springframework.data.mongodb.config.EnableMongoAuditing; diff --git a/domain/mongo-core/src/main/java/com/wypl/mongocore/MongoBaseEntity.java b/domain/mongo-common/src/main/java/com/wypl/mongocommon/MongoBaseEntity.java similarity index 97% rename from domain/mongo-core/src/main/java/com/wypl/mongocore/MongoBaseEntity.java rename to domain/mongo-common/src/main/java/com/wypl/mongocommon/MongoBaseEntity.java index b9c7ee3..5e9ad4d 100644 --- a/domain/mongo-core/src/main/java/com/wypl/mongocore/MongoBaseEntity.java +++ b/domain/mongo-common/src/main/java/com/wypl/mongocommon/MongoBaseEntity.java @@ -1,4 +1,4 @@ -package com.wypl.mongocore; +package com.wypl.mongocommon; import java.time.LocalDateTime; diff --git a/domain/mongo-core/src/main/java/com/wypl/mongocore/MongoErrorCode.java b/domain/mongo-common/src/main/java/com/wypl/mongocommon/MongoErrorCode.java similarity index 95% rename from domain/mongo-core/src/main/java/com/wypl/mongocore/MongoErrorCode.java rename to domain/mongo-common/src/main/java/com/wypl/mongocommon/MongoErrorCode.java index c2eec64..d702cdb 100644 --- a/domain/mongo-core/src/main/java/com/wypl/mongocore/MongoErrorCode.java +++ b/domain/mongo-common/src/main/java/com/wypl/mongocommon/MongoErrorCode.java @@ -1,4 +1,4 @@ -package com.wypl.mongocore; +package com.wypl.mongocommon; import com.wypl.common.exception.ServerErrorCode; diff --git a/domain/mongo-core/src/test/java/com/wypl/mongocore/.gitkeep b/domain/mongo-common/src/test/java/com/wypl/mongocommon/.gitkeep similarity index 100% rename from domain/mongo-core/src/test/java/com/wypl/mongocore/.gitkeep rename to domain/mongo-common/src/test/java/com/wypl/mongocommon/.gitkeep diff --git a/settings.gradle b/settings.gradle index 8f812b1..cfc7250 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,18 +2,18 @@ rootProject.name = "backend" /* Application Module */ include ':application' -include ':application:application-core' -include ':application:wypl-calendar' +include ':application:application-common' +include ':application:wypl-core' include ':application:wypl-notification' include ':application:wypl-image' /* Domain Module */ include ':domain' -include ':domain:jpa-core' +include ':domain:jpa-common' include ':domain:jpa-calendar-domain' include ':domain:jpa-member-domain' include ':domain:jpamongo-review-domain' -include ':domain:mongo-core' +include ':domain:mongo-common' /* Client Module */ include ':client'