diff --git a/build.gradle b/build.gradle index de13760b..d8135831 100644 --- a/build.gradle +++ b/build.gradle @@ -82,13 +82,15 @@ dependencies { //객체 간 매핑 처리 implementation 'org.modelmapper:modelmapper:3.1.0' + + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.4' } tasks.named('test') { useJUnitPlatform() } -def querydslDir = "src/main/generated" +def querydslDir = "build/generated/querydsl" sourceSets { main.java.srcDirs += [ querydslDir ] diff --git a/src/main/generated/com/example/api/auth/entitiy/QRefreshToken.java b/src/main/generated/com/example/api/auth/entitiy/QRefreshToken.java deleted file mode 100644 index ae3f4b01..00000000 --- a/src/main/generated/com/example/api/auth/entitiy/QRefreshToken.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.example.api.auth.entitiy; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QRefreshToken is a Querydsl query type for RefreshToken - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QRefreshToken extends EntityPathBase { - - private static final long serialVersionUID = -1655386265L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QRefreshToken refreshToken1 = new QRefreshToken("refreshToken1"); - - public final NumberPath id = createNumber("id", Long.class); - - public final BooleanPath isExpired = createBoolean("isExpired"); - - public final DateTimePath recentLogin = createDateTime("recentLogin", java.time.LocalDateTime.class); - - public final StringPath refreshToken = createString("refreshToken"); - - public final com.example.api.domain.QAccount user; - - public QRefreshToken(String variable) { - this(RefreshToken.class, forVariable(variable), INITS); - } - - public QRefreshToken(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QRefreshToken(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QRefreshToken(PathMetadata metadata, PathInits inits) { - this(RefreshToken.class, metadata, inits); - } - - public QRefreshToken(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.user = inits.isInitialized("user") ? new com.example.api.domain.QAccount(forProperty("user")) : null; - } - -} - diff --git a/src/main/generated/com/example/api/domain/QAccount.java b/src/main/generated/com/example/api/domain/QAccount.java deleted file mode 100644 index bebfa199..00000000 --- a/src/main/generated/com/example/api/domain/QAccount.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.example.api.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QAccount is a Querydsl query type for Account - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QAccount extends EntityPathBase { - - private static final long serialVersionUID = -1087167288L; - - public static final QAccount account = new QAccount("account"); - - public final QBaseEntity _super = new QBaseEntity(this); - - public final NumberPath accountId = createNumber("accountId", Long.class); - - public final NumberPath age = createNumber("age", Integer.class); - - //inherited - public final DateTimePath createdDate = _super.createdDate; - - public final BooleanPath deleted = createBoolean("deleted"); - - public final StringPath email = createString("email"); - - public final BooleanPath emailReceivable = createBoolean("emailReceivable"); - - public final StringPath loginId = createString("loginId"); - - public final StringPath name = createString("name"); - - public final EnumPath nationality = createEnum("nationality", com.example.api.account.entity.Nationality.class); - - public final StringPath nickname = createString("nickname"); - - public final BooleanPath openStatus = createBoolean("openStatus"); - - public final StringPath password = createString("password"); - - public final StringPath phoneNumber = createString("phoneNumber"); - - public final StringPath profileImage = createString("profileImage"); - - public final CollectionPath> roles = this.>createCollection("roles", com.example.api.account.entity.UserRole.class, EnumPath.class, PathInits.DIRECT2); - - public final StringPath sex = createString("sex"); - - public final NumberPath starPoint = createNumber("starPoint", Float.class); - - //inherited - public final DateTimePath updatedDate = _super.updatedDate; - - public final NumberPath workCount = createNumber("workCount", Integer.class); - - public QAccount(String variable) { - super(Account.class, forVariable(variable)); - } - - public QAccount(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QAccount(PathMetadata metadata) { - super(Account.class, metadata); - } - -} - diff --git a/src/main/generated/com/example/api/domain/QAnnouncement.java b/src/main/generated/com/example/api/domain/QAnnouncement.java deleted file mode 100644 index 2280f648..00000000 --- a/src/main/generated/com/example/api/domain/QAnnouncement.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.example.api.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; - - -/** - * QAnnouncement is a Querydsl query type for Announcement - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QAnnouncement extends EntityPathBase { - - private static final long serialVersionUID = 1512577932L; - - public static final QAnnouncement announcement = new QAnnouncement("announcement"); - - public final QBaseEntity _super = new QBaseEntity(this); - - public final StringPath announcementContent = createString("announcementContent"); - - public final NumberPath announcementId = createNumber("announcementId", Long.class); - - public final StringPath announcementTitle = createString("announcementTitle"); - - public final StringPath announcementType = createString("announcementType"); - - //inherited - public final DateTimePath createdDate = _super.createdDate; - - //inherited - public final DateTimePath updatedDate = _super.updatedDate; - - public final NumberPath viewCount = createNumber("viewCount", Integer.class); - - public QAnnouncement(String variable) { - super(Announcement.class, forVariable(variable)); - } - - public QAnnouncement(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QAnnouncement(PathMetadata metadata) { - super(Announcement.class, metadata); - } - -} - diff --git a/src/main/generated/com/example/api/domain/QBaseEntity.java b/src/main/generated/com/example/api/domain/QBaseEntity.java deleted file mode 100644 index 09c42891..00000000 --- a/src/main/generated/com/example/api/domain/QBaseEntity.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.example.api.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; - - -/** - * QBaseEntity is a Querydsl query type for BaseEntity - */ -@Generated("com.querydsl.codegen.DefaultSupertypeSerializer") -public class QBaseEntity extends EntityPathBase { - - private static final long serialVersionUID = 127095193L; - - public static final QBaseEntity baseEntity = new QBaseEntity("baseEntity"); - - public final DateTimePath createdDate = createDateTime("createdDate", java.time.LocalDateTime.class); - - public final DateTimePath updatedDate = createDateTime("updatedDate", java.time.LocalDateTime.class); - - public QBaseEntity(String variable) { - super(BaseEntity.class, forVariable(variable)); - } - - public QBaseEntity(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QBaseEntity(PathMetadata metadata) { - super(BaseEntity.class, metadata); - } - -} - diff --git a/src/main/generated/com/example/api/domain/QBusiness.java b/src/main/generated/com/example/api/domain/QBusiness.java deleted file mode 100644 index 8cc945d1..00000000 --- a/src/main/generated/com/example/api/domain/QBusiness.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.example.api.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QBusiness is a Querydsl query type for Business - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QBusiness extends EntityPathBase { - - private static final long serialVersionUID = 1647868037L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QBusiness business = new QBusiness("business"); - - public final QBaseEntity _super = new QBaseEntity(this); - - public final ListPath businessCategories = this.createList("businessCategories", BusinessCategory.class, QBusinessCategory.class, PathInits.DIRECT2); - - public final NumberPath businessId = createNumber("businessId", Long.class); - - public final StringPath businessName = createString("businessName"); - - //inherited - public final DateTimePath createdDate = _super.createdDate; - - public final QAccount employer; - - public final StringPath location = createString("location"); - - public final DatePath openDate = createDate("openDate", java.time.LocalDate.class); - - public final StringPath registrationNumber = createString("registrationNumber"); - - public final StringPath representationName = createString("representationName"); - - //inherited - public final DateTimePath updatedDate = _super.updatedDate; - - public QBusiness(String variable) { - this(Business.class, forVariable(variable), INITS); - } - - public QBusiness(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QBusiness(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QBusiness(PathMetadata metadata, PathInits inits) { - this(Business.class, metadata, inits); - } - - public QBusiness(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.employer = inits.isInitialized("employer") ? new QAccount(forProperty("employer")) : null; - } - -} - diff --git a/src/main/generated/com/example/api/domain/QBusinessCategory.java b/src/main/generated/com/example/api/domain/QBusinessCategory.java deleted file mode 100644 index 975e63bc..00000000 --- a/src/main/generated/com/example/api/domain/QBusinessCategory.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.example.api.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QBusinessCategory is a Querydsl query type for BusinessCategory - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QBusinessCategory extends EntityPathBase { - - private static final long serialVersionUID = -861191005L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QBusinessCategory businessCategory = new QBusinessCategory("businessCategory"); - - public final QBaseEntity _super = new QBaseEntity(this); - - public final QBusiness business; - - public final QCategory category; - - //inherited - public final DateTimePath createdDate = _super.createdDate; - - public final NumberPath id = createNumber("id", Long.class); - - //inherited - public final DateTimePath updatedDate = _super.updatedDate; - - public QBusinessCategory(String variable) { - this(BusinessCategory.class, forVariable(variable), INITS); - } - - public QBusinessCategory(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QBusinessCategory(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QBusinessCategory(PathMetadata metadata, PathInits inits) { - this(BusinessCategory.class, metadata, inits); - } - - public QBusinessCategory(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.business = inits.isInitialized("business") ? new QBusiness(forProperty("business"), inits.get("business")) : null; - this.category = inits.isInitialized("category") ? new QCategory(forProperty("category")) : null; - } - -} - diff --git a/src/main/generated/com/example/api/domain/QCategory.java b/src/main/generated/com/example/api/domain/QCategory.java deleted file mode 100644 index 5065ce4c..00000000 --- a/src/main/generated/com/example/api/domain/QCategory.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.example.api.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; - - -/** - * QCategory is a Querydsl query type for Category - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QCategory extends EntityPathBase { - - private static final long serialVersionUID = -1449757245L; - - public static final QCategory category = new QCategory("category"); - - public final QBaseEntity _super = new QBaseEntity(this); - - public final NumberPath categoryId = createNumber("categoryId", Long.class); - - public final StringPath categoryName = createString("categoryName"); - - //inherited - public final DateTimePath createdDate = _super.createdDate; - - //inherited - public final DateTimePath updatedDate = _super.updatedDate; - - public QCategory(String variable) { - super(Category.class, forVariable(variable)); - } - - public QCategory(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QCategory(PathMetadata metadata) { - super(Category.class, metadata); - } - -} - diff --git a/src/main/generated/com/example/api/domain/QChatRoom.java b/src/main/generated/com/example/api/domain/QChatRoom.java deleted file mode 100644 index b8542ca3..00000000 --- a/src/main/generated/com/example/api/domain/QChatRoom.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.example.api.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QChatRoom is a Querydsl query type for ChatRoom - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QChatRoom extends EntityPathBase { - - private static final long serialVersionUID = -62925544L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QChatRoom chatRoom = new QChatRoom("chatRoom"); - - public final NumberPath chatRoomId = createNumber("chatRoomId", Long.class); - - public final QOfferEmployment offerEmployment; - - public final DateTimePath suggestGeneratedDate = createDateTime("suggestGeneratedDate", java.time.LocalDateTime.class); - - public QChatRoom(String variable) { - this(ChatRoom.class, forVariable(variable), INITS); - } - - public QChatRoom(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QChatRoom(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QChatRoom(PathMetadata metadata, PathInits inits) { - this(ChatRoom.class, metadata, inits); - } - - public QChatRoom(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.offerEmployment = inits.isInitialized("offerEmployment") ? new QOfferEmployment(forProperty("offerEmployment"), inits.get("offerEmployment")) : null; - } - -} - diff --git a/src/main/generated/com/example/api/domain/QContract.java b/src/main/generated/com/example/api/domain/QContract.java deleted file mode 100644 index 59932355..00000000 --- a/src/main/generated/com/example/api/domain/QContract.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.example.api.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QContract is a Querydsl query type for Contract - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QContract extends EntityPathBase { - - private static final long serialVersionUID = -2067215913L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QContract contract = new QContract("contract"); - - public final QBaseEntity _super = new QBaseEntity(this); - - public final DateTimePath contractEndTime = createDateTime("contractEndTime", java.time.LocalDateTime.class); - - public final NumberPath contractHourlyPay = createNumber("contractHourlyPay", Integer.class); - - public final NumberPath contractId = createNumber("contractId", Long.class); - - public final DateTimePath contractStartTime = createDateTime("contractStartTime", java.time.LocalDateTime.class); - - public final BooleanPath contractSucceeded = createBoolean("contractSucceeded"); - - //inherited - public final DateTimePath createdDate = _super.createdDate; - - public final QOfferEmployment offerEmployment; - - //inherited - public final DateTimePath updatedDate = _super.updatedDate; - - public QContract(String variable) { - this(Contract.class, forVariable(variable), INITS); - } - - public QContract(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QContract(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QContract(PathMetadata metadata, PathInits inits) { - this(Contract.class, metadata, inits); - } - - public QContract(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.offerEmployment = inits.isInitialized("offerEmployment") ? new QOfferEmployment(forProperty("offerEmployment"), inits.get("offerEmployment")) : null; - } - -} - diff --git a/src/main/generated/com/example/api/domain/QExternalCareer.java b/src/main/generated/com/example/api/domain/QExternalCareer.java deleted file mode 100644 index 0c112002..00000000 --- a/src/main/generated/com/example/api/domain/QExternalCareer.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.example.api.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QExternalCareer is a Querydsl query type for ExternalCareer - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QExternalCareer extends EntityPathBase { - - private static final long serialVersionUID = 606757934L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QExternalCareer externalCareer = new QExternalCareer("externalCareer"); - - public final QBaseEntity _super = new QBaseEntity(this); - - //inherited - public final DateTimePath createdDate = _super.createdDate; - - public final QAccount employee; - - public final NumberPath id = createNumber("id", Long.class); - - public final StringPath Name = createString("Name"); - - public final StringPath period = createString("period"); - - //inherited - public final DateTimePath updatedDate = _super.updatedDate; - - public QExternalCareer(String variable) { - this(ExternalCareer.class, forVariable(variable), INITS); - } - - public QExternalCareer(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QExternalCareer(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QExternalCareer(PathMetadata metadata, PathInits inits) { - this(ExternalCareer.class, metadata, inits); - } - - public QExternalCareer(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.employee = inits.isInitialized("employee") ? new QAccount(forProperty("employee")) : null; - } - -} - diff --git a/src/main/generated/com/example/api/domain/QFlavored.java b/src/main/generated/com/example/api/domain/QFlavored.java deleted file mode 100644 index 5c0a13db..00000000 --- a/src/main/generated/com/example/api/domain/QFlavored.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.example.api.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QFlavored is a Querydsl query type for Flavored - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QFlavored extends EntityPathBase { - - private static final long serialVersionUID = 128299138L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QFlavored flavored = new QFlavored("flavored"); - - public final QBaseEntity _super = new QBaseEntity(this); - - public final QCategory category; - - //inherited - public final DateTimePath createdDate = _super.createdDate; - - public final QAccount employee; - - public final NumberPath flavoredId = createNumber("flavoredId", Long.class); - - //inherited - public final DateTimePath updatedDate = _super.updatedDate; - - public QFlavored(String variable) { - this(Flavored.class, forVariable(variable), INITS); - } - - public QFlavored(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QFlavored(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QFlavored(PathMetadata metadata, PathInits inits) { - this(Flavored.class, metadata, inits); - } - - public QFlavored(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.category = inits.isInitialized("category") ? new QCategory(forProperty("category")) : null; - this.employee = inits.isInitialized("employee") ? new QAccount(forProperty("employee")) : null; - } - -} - diff --git a/src/main/generated/com/example/api/domain/QOfferEmployment.java b/src/main/generated/com/example/api/domain/QOfferEmployment.java deleted file mode 100644 index a6634fba..00000000 --- a/src/main/generated/com/example/api/domain/QOfferEmployment.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.example.api.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QOfferEmployment is a Querydsl query type for OfferEmployment - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QOfferEmployment extends EntityPathBase { - - private static final long serialVersionUID = -82696445L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QOfferEmployment offerEmployment = new QOfferEmployment("offerEmployment"); - - public final QBusiness business; - - public final QContract contract; - - public final QAccount employee; - - public final DateTimePath suggestEndTime = createDateTime("suggestEndTime", java.time.LocalDateTime.class); - - public final NumberPath suggestHourlyPay = createNumber("suggestHourlyPay", Integer.class); - - public final NumberPath suggestId = createNumber("suggestId", Long.class); - - public final BooleanPath suggestReaded = createBoolean("suggestReaded"); - - public final DateTimePath suggestRegisterTime = createDateTime("suggestRegisterTime", java.time.LocalDateTime.class); - - public final DateTimePath suggestStartTime = createDateTime("suggestStartTime", java.time.LocalDateTime.class); - - public final BooleanPath suggestSucceeded = createBoolean("suggestSucceeded"); - - public QOfferEmployment(String variable) { - this(OfferEmployment.class, forVariable(variable), INITS); - } - - public QOfferEmployment(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QOfferEmployment(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QOfferEmployment(PathMetadata metadata, PathInits inits) { - this(OfferEmployment.class, metadata, inits); - } - - public QOfferEmployment(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.business = inits.isInitialized("business") ? new QBusiness(forProperty("business"), inits.get("business")) : null; - this.contract = inits.isInitialized("contract") ? new QContract(forProperty("contract"), inits.get("contract")) : null; - this.employee = inits.isInitialized("employee") ? new QAccount(forProperty("employee")) : null; - } - -} - diff --git a/src/main/generated/com/example/api/domain/QPossibleBoard.java b/src/main/generated/com/example/api/domain/QPossibleBoard.java deleted file mode 100644 index 23743abc..00000000 --- a/src/main/generated/com/example/api/domain/QPossibleBoard.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.example.api.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QPossibleBoard is a Querydsl query type for PossibleBoard - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QPossibleBoard extends EntityPathBase { - - private static final long serialVersionUID = -1378693552L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QPossibleBoard possibleBoard = new QPossibleBoard("possibleBoard"); - - public final QBaseEntity _super = new QBaseEntity(this); - - //inherited - public final DateTimePath createdDate = _super.createdDate; - - public final QAccount employee; - - public final DateTimePath endTime = createDateTime("endTime", java.time.LocalDateTime.class); - - public final NumberPath possibleId = createNumber("possibleId", Long.class); - - public final DateTimePath startTime = createDateTime("startTime", java.time.LocalDateTime.class); - - //inherited - public final DateTimePath updatedDate = _super.updatedDate; - - public QPossibleBoard(String variable) { - this(PossibleBoard.class, forVariable(variable), INITS); - } - - public QPossibleBoard(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QPossibleBoard(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QPossibleBoard(PathMetadata metadata, PathInits inits) { - this(PossibleBoard.class, metadata, inits); - } - - public QPossibleBoard(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.employee = inits.isInitialized("employee") ? new QAccount(forProperty("employee")) : null; - } - -} - diff --git a/src/main/generated/com/example/api/domain/QReview.java b/src/main/generated/com/example/api/domain/QReview.java deleted file mode 100644 index a393fb0b..00000000 --- a/src/main/generated/com/example/api/domain/QReview.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.example.api.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QReview is a Querydsl query type for Review - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QReview extends EntityPathBase { - - private static final long serialVersionUID = 731127133L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QReview review = new QReview("review"); - - public final QBaseEntity _super = new QBaseEntity(this); - - public final QContract contract; - - //inherited - public final DateTimePath createdDate = _super.createdDate; - - public final StringPath reviewContent = createString("reviewContent"); - - public final NumberPath reviewStarPoint = createNumber("reviewStarPoint", Integer.class); - - public final NumberPath suggestId = createNumber("suggestId", Long.class); - - //inherited - public final DateTimePath updatedDate = _super.updatedDate; - - public QReview(String variable) { - this(Review.class, forVariable(variable), INITS); - } - - public QReview(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QReview(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QReview(PathMetadata metadata, PathInits inits) { - this(Review.class, metadata, inits); - } - - public QReview(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.contract = inits.isInitialized("contract") ? new QContract(forProperty("contract"), inits.get("contract")) : null; - } - -} - diff --git a/src/main/generated/com/example/api/domain/QScrap.java b/src/main/generated/com/example/api/domain/QScrap.java deleted file mode 100644 index 6caf4631..00000000 --- a/src/main/generated/com/example/api/domain/QScrap.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.example.api.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QScrap is a Querydsl query type for Scrap - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QScrap extends EntityPathBase { - - private static final long serialVersionUID = -391197396L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QScrap scrap = new QScrap("scrap"); - - public final QBaseEntity _super = new QBaseEntity(this); - - //inherited - public final DateTimePath createdDate = _super.createdDate; - - public final QAccount employee; - - public final QAccount employer; - - public final NumberPath scrapId = createNumber("scrapId", Long.class); - - //inherited - public final DateTimePath updatedDate = _super.updatedDate; - - public QScrap(String variable) { - this(Scrap.class, forVariable(variable), INITS); - } - - public QScrap(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QScrap(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QScrap(PathMetadata metadata, PathInits inits) { - this(Scrap.class, metadata, inits); - } - - public QScrap(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.employee = inits.isInitialized("employee") ? new QAccount(forProperty("employee")) : null; - this.employer = inits.isInitialized("employer") ? new QAccount(forProperty("employer")) : null; - } - -} - diff --git a/src/main/java/com/example/api/global/config/SecurityConfig.java b/src/main/java/com/example/api/global/config/SecurityConfig.java index f92ca385..0d3eabd6 100644 --- a/src/main/java/com/example/api/global/config/SecurityConfig.java +++ b/src/main/java/com/example/api/global/config/SecurityConfig.java @@ -53,6 +53,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti exceptionHandling.authenticationEntryPoint(new FailedAuthenticationEntryPoint())) .authorizeHttpRequests(authorize -> authorize .requestMatchers("/oauth2/**", "/api/v1/**").permitAll() + .requestMatchers("/swagger-ui/**", "/v3/api-docs/**", "/webjars/**", "/swagger-resources/**", "/swagger-ui.html", "/actuator/**").permitAll() .anyRequest().authenticated() ) .oauth2Login(oauth2 -> oauth2 diff --git a/src/test/java/com/example/api/contracts/ContractServiceTest.java b/src/test/java/com/example/api/contracts/ContractServiceTest.java index e92cae3e..e2c43b3a 100644 --- a/src/test/java/com/example/api/contracts/ContractServiceTest.java +++ b/src/test/java/com/example/api/contracts/ContractServiceTest.java @@ -1,6 +1,7 @@ package com.example.api.contracts; import com.example.api.JpaTestWithInitData; +import com.example.api.chat.repository.ChatRoomRepository; import com.example.api.contracts.dto.AcceptSuggestCommand; import com.example.api.domain.ChatRoom; import com.example.api.domain.Contract; diff --git a/src/test/java/com/example/api/global/BaseIntegrationTest.java b/src/test/java/com/example/api/global/BaseIntegrationTest.java deleted file mode 100644 index f6dd0068..00000000 --- a/src/test/java/com/example/api/global/BaseIntegrationTest.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.example.api.global; - -import com.example.api.board.controller.domain.response.CategoryDTO; -import com.example.api.board.controller.domain.response.ExternalCareerDTO; -import com.example.api.board.controller.domain.response.InnerCareerDTO; -import com.example.api.board.controller.domain.response.PossibleBoardDTO; -import com.example.api.business.BusinessRepository; -import com.example.api.contracts.ContractRepository; -import com.example.api.possbileboard.PossibleBoardRepository; -import com.example.api.domain.Account; -import com.example.api.domain.Business; -import com.example.api.domain.BusinessCategory; -import com.example.api.domain.Category; -import com.example.api.domain.Contract; -import com.example.api.domain.ExternalCareer; -import com.example.api.domain.OfferEmployment; -import com.example.api.domain.PossibleBoard; -import com.example.api.domain.Review; -import com.example.api.domain.repository.CategoryRepository; -import com.example.api.domain.repository.EmployeeRepository; -import com.example.api.domain.repository.EmployerRepository; -import com.example.api.domain.repository.ExternalCareerRepository; -import com.example.api.domain.repository.FlavoredRepository; -import com.example.api.domain.repository.MyInfoRepository; -import com.example.api.domain.repository.OfferEmploymentRepository; -import com.example.api.domain.repository.ReviewRepository; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; -import org.junit.jupiter.api.BeforeEach; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.annotation.Rollback; -import org.springframework.test.context.ActiveProfiles; - -@SpringBootTest -@ActiveProfiles("test") -@Rollback(false) -public class BaseIntegrationTest { - - @Autowired - private BusinessRepository businessRepository; - @Autowired - private CategoryRepository categoryRepository; - @Autowired - private FlavoredRepository flavoredRepository; - @Autowired - private ContractRepository contractRepository; - @Autowired - private EmployeeRepository employeeRepository; - @Autowired - private EmployerRepository employerRepository; - @Autowired - private MyInfoRepository myInfoRepository; - @Autowired - private OfferEmploymentRepository offerEmploymentRepository; - @Autowired - private PossibleBoardRepository possibleBoardRepository; - @Autowired - private ReviewRepository reviewRepository; - @Autowired - private ExternalCareerRepository externalCareerRepository; - - protected List externalCareerList; - protected List possibleBoardList; - protected List innerCareerList; - protected List flavoredCategoryList; - - protected Category category1, category2; - - - @BeforeEach - void setUpData() { - Account employee = new Account(); - employee.setAge(30); - employee.setEmail("johndoe@example.com"); - employee.setName("John Doe"); - employee.setSex("Male"); - employee.setPhoneNumber("123-456-7890"); - employee.setNickname("Johnny"); - employee.setStarPoint(3.5f); - employee.setWorkCount(3); - employeeRepository.save(employee); - - Account employer = new Account(); - employer.setNickname("EmployerOne"); - employerRepository.save(employer); - - category1 = new Category(); - category1.setCategoryName("IT Services"); - categoryRepository.save(category1); - - category2 = new Category(); - category2.setCategoryName("Consulting"); - categoryRepository.save(category2); - - Business business = new Business(); - business.setBusinessName("Tech Solutions Inc."); - business.setLocation("Seoul, South Korea"); - business.setRepresentationName("James"); - business.setOpenDate(LocalDate.now()); - business.setRegistrationNumber("123-456-789"); - business.setEmployer(employer); // 다대일 관계 설정 - - BusinessCategory businessCategory1 = new BusinessCategory(); - businessCategory1.setBusiness(business); - businessCategory1.setCategory(category1); - - BusinessCategory businessCategory2 = new BusinessCategory(); - businessCategory2.setBusiness(business); - businessCategory2.setCategory(category2); - - business.setBusinessCategories(List.of(businessCategory1, businessCategory2)); - businessRepository.save(business); - - OfferEmployment offerEmployment = new OfferEmployment(); - offerEmployment.setBusiness(business); - offerEmployment.setEmployee(employee); - offerEmployment.setSuggestStartTime(LocalDateTime.of(2024, 11, 5, 9, 0)); - offerEmployment.setSuggestEndTime(LocalDateTime.of(2024, 11, 5, 17, 0)); - offerEmployment.setSuggestHourlyPay(20000); - offerEmployment.setSuggestSucceeded(false); - offerEmploymentRepository.save(offerEmployment); - - Contract contract = new Contract(offerEmployment, - LocalDateTime.of(2024, 11, 10, 9, 0), - LocalDateTime.of(2024, 11, 10, 18, 0), - 22000, - true); - - contractRepository.save(contract); - - ExternalCareer externalCareer1 = new ExternalCareer(employee, "Consultant", "24-10-01"); - ExternalCareer externalCareer2 = new ExternalCareer(employee, "Architect", "24-10-08"); - externalCareerRepository.save(externalCareer1); - externalCareerRepository.save(externalCareer2); - - externalCareerList = new ArrayList<>(); - externalCareerList.add(new ExternalCareerDTO(employee.getAccountId(), externalCareer1.getName(), externalCareer1.getPeriod())); - externalCareerList.add(new ExternalCareerDTO(employee.getAccountId(), externalCareer2.getName(), externalCareer2.getPeriod())); - - Review review1 = new Review(1L, 4, "Good work experience"); - reviewRepository.save(review1); - - innerCareerList = new ArrayList<>(); - innerCareerList.add(new InnerCareerDTO(business.getBusinessName(), contract.getContractStartTime(), business.getRepresentationName(), review1)); - - PossibleBoard possibleBoard1 = new PossibleBoard(employee, LocalDateTime.of(2024, 11, 5, 12, 0), LocalDateTime.of(2024, 11, 5, 18, 0)); - PossibleBoard possibleBoard2 = new PossibleBoard(employee, LocalDateTime.of(2024, 11, 6, 12, 0), LocalDateTime.of(2024, 11, 6, 18, 0)); - possibleBoardRepository.save(possibleBoard1); - possibleBoardRepository.save(possibleBoard2); - - possibleBoardList = new ArrayList<>(); - possibleBoardList.add(new PossibleBoardDTO(employee.getAccountId(), possibleBoard1.getStartTime(), possibleBoard1.getEndTime())); - possibleBoardList.add(new PossibleBoardDTO(employee.getAccountId(), possibleBoard2.getStartTime(), possibleBoard2.getEndTime())); - -// Flavored flavored = new Flavored(); -// flavored.setCategory(categoryRepository.findById(1L).get()); -// flavored.setEmployee(employeeRepository.findById(1L).get()); -// flavoredRepository.save(flavored); - - flavoredCategoryList = new ArrayList<>(); - flavoredCategoryList.addAll(flavoredRepository.findAllCategoryDTOByEmployeeId(1L)); - } -} \ No newline at end of file