Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f6369d4
api 검증
tae0u0 Feb 2, 2025
e513875
scrap api 추가
tae0u0 Feb 2, 2025
cedc997
host change
tae0u0 Feb 2, 2025
d9faefe
security config 수정
tae0u0 Feb 5, 2025
79d9dfa
create sub category
tae0u0 Feb 11, 2025
7db8034
Merge branch 'feat/#108' of https://github.com/danpatime/backend into…
tae0u0 Feb 11, 2025
15921f6
login response change
tae0u0 Feb 11, 2025
742225a
Merge branch 'feat/#108' of https://github.com/danpatime/api into fea…
tae0u0 Feb 11, 2025
b3648a1
category + subcategory response
tae0u0 Feb 11, 2025
f054376
Merge branch 'feat/#108' of https://github.com/danpatime/backend into…
tae0u0 Feb 11, 2025
8b043f5
#108 subCategory 도메인 추가에 따른 category 변경
tae0u0 Feb 11, 2025
71cc609
birthdate, callTime
tae0u0 Feb 11, 2025
8212406
myInfoRepository delete
tae0u0 Feb 11, 2025
5d17935
update available work hours
tae0u0 Feb 12, 2025
7c11ac4
update available work hours
tae0u0 Feb 12, 2025
8013ee7
refactoring available time
tae0u0 Feb 12, 2025
77abd56
주소 변경에 따른 대량 수정
tae0u0 Feb 15, 2025
bfeccf1
yml 수정
tae0u0 Feb 15, 2025
3b5d2f8
suggest status column add
tae0u0 Feb 16, 2025
b27f3a5
api 수정 25-02-16
tae0u0 Feb 16, 2025
eb19072
security config 수정
tae0u0 Feb 22, 2025
50a0ba0
fix jwt authentication
tae0u0 Feb 22, 2025
cf75b96
chat api 수정
tae0u0 Feb 23, 2025
1455918
chat summary null Object 추가
tae0u0 Feb 23, 2025
b58b2ac
#108 공지 페이징 쿼리 수정
tae0u0 Feb 23, 2025
c17233d
swagger file 설명 보충
tae0u0 Feb 23, 2025
6bf7ff8
review dynamic query change
tae0u0 Feb 25, 2025
2f230b4
contract review modify, delete api
tae0u0 Mar 5, 2025
9ef10d2
review, search no permission accept
tae0u0 Mar 7, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,7 @@ out/
.vscode/

### .env ###
.env
.env

### local swagger file ###
src/main/resources/static/danpat-local.yaml
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ dependencies {
implementation 'org.modelmapper:modelmapper:3.1.0'

// swagger
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'

// S3
implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ services:
ports:
- "8080:8080"
volumes:
- logs:/app/logs
- ./src:/app/src
environment:
- SPRING_DATA_MONGODB_URI=${MONGO_URI}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public QRefreshToken(PathMetadata metadata, PathInits inits) {

public QRefreshToken(Class<? extends RefreshToken> type, PathMetadata metadata, PathInits inits) {
super(type, metadata, inits);
this.user = inits.isInitialized("user") ? new com.example.api.domain.QAccount(forProperty("user")) : null;
this.user = inits.isInitialized("user") ? new com.example.api.domain.QAccount(forProperty("user"), inits.get("user")) : null;
}

}
Expand Down
25 changes: 22 additions & 3 deletions src/main/generated/com/example/api/domain/QAccount.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ public class QAccount extends EntityPathBase<Account> {

private static final long serialVersionUID = -1087167288L;

private static final PathInits INITS = PathInits.DIRECT2;

public static final QAccount account = new QAccount("account");

public final QBaseEntity _super = new QBaseEntity(this);
Expand All @@ -26,6 +28,10 @@ public class QAccount extends EntityPathBase<Account> {

public final NumberPath<Integer> age = createNumber("age", Integer.class);

public final StringPath birthdate = createString("birthdate");

public final StringPath callTime = createString("callTime");

//inherited
public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;

Expand All @@ -35,6 +41,10 @@ public class QAccount extends EntityPathBase<Account> {

public final BooleanPath emailReceivable = createBoolean("emailReceivable");

public final StringPath introduction = createString("introduction");

public final QLocation location;

public final StringPath loginId = createString("loginId");

public final StringPath name = createString("name");
Expand Down Expand Up @@ -63,15 +73,24 @@ public class QAccount extends EntityPathBase<Account> {
public final NumberPath<Integer> workCount = createNumber("workCount", Integer.class);

public QAccount(String variable) {
super(Account.class, forVariable(variable));
this(Account.class, forVariable(variable), INITS);
}

public QAccount(Path<? extends Account> path) {
super(path.getType(), path.getMetadata());
this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
}

public QAccount(PathMetadata metadata) {
super(Account.class, metadata);
this(metadata, PathInits.getFor(metadata, INITS));
}

public QAccount(PathMetadata metadata, PathInits inits) {
this(Account.class, metadata, inits);
}

public QAccount(Class<? extends Account> type, PathMetadata metadata, PathInits inits) {
super(type, metadata, inits);
this.location = inits.isInitialized("location") ? new QLocation(forProperty("location")) : null;
}

}
Expand Down
8 changes: 4 additions & 4 deletions src/main/generated/com/example/api/domain/QBusiness.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ public class QBusiness extends EntityPathBase<Business> {

public final QAccount employer;

public final com.example.api.business.domain.QBusinessLocation location;
public final QLocation location;

public final DatePath<java.time.LocalDate> openDate = createDate("openDate", java.time.LocalDate.class);
public final StringPath openDate = createString("openDate");

public final StringPath registrationNumber = createString("registrationNumber");

Expand All @@ -64,8 +64,8 @@ public QBusiness(PathMetadata metadata, PathInits inits) {

public QBusiness(Class<? extends Business> type, PathMetadata metadata, PathInits inits) {
super(type, metadata, inits);
this.employer = inits.isInitialized("employer") ? new QAccount(forProperty("employer")) : null;
this.location = inits.isInitialized("location") ? new com.example.api.business.domain.QBusinessLocation(forProperty("location")) : null;
this.employer = inits.isInitialized("employer") ? new QAccount(forProperty("employer"), inits.get("employer")) : null;
this.location = inits.isInitialized("location") ? new QLocation(forProperty("location")) : null;
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ public class QBusinessCategory extends EntityPathBase<BusinessCategory> {

public final QBusiness business;

public final QCategory category;

//inherited
public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;

public final NumberPath<Long> id = createNumber("id", Long.class);

public final QSubCategory subCategory;

//inherited
public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;

Expand All @@ -55,7 +55,7 @@ public QBusinessCategory(PathMetadata metadata, PathInits inits) {
public QBusinessCategory(Class<? extends BusinessCategory> 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;
this.subCategory = inits.isInitialized("subCategory") ? new QSubCategory(forProperty("subCategory"), inits.get("subCategory")) : null;
}

}
Expand Down
47 changes: 0 additions & 47 deletions src/main/generated/com/example/api/domain/QCityDistrict.java

This file was deleted.

2 changes: 0 additions & 2 deletions src/main/generated/com/example/api/domain/QContract.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ public class QContract extends EntityPathBase<Contract> {

public final DateTimePath<java.time.LocalDateTime> contractStartTime = createDateTime("contractStartTime", java.time.LocalDateTime.class);

public final BooleanPath contractSucceeded = createBoolean("contractSucceeded");

//inherited
public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ public class QExternalCareer extends EntityPathBase<ExternalCareer> {

public final QBaseEntity _super = new QBaseEntity(this);

public final QCategory category;

//inherited
public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;

public final QAccount employee;

public final NumberPath<Long> id = createNumber("id", Long.class);

public final QSubCategory subCategory;

//inherited
public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;

Expand All @@ -56,8 +56,8 @@ public QExternalCareer(PathMetadata metadata, PathInits inits) {

public QExternalCareer(Class<? extends ExternalCareer> 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;
this.employee = inits.isInitialized("employee") ? new QAccount(forProperty("employee"), inits.get("employee")) : null;
this.subCategory = inits.isInitialized("subCategory") ? new QSubCategory(forProperty("subCategory"), inits.get("subCategory")) : null;
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ public class QFlavoredCategory extends EntityPathBase<FlavoredCategory> {

public final NumberPath<Long> flavoredCategoryId = createNumber("flavoredCategoryId", Long.class);

public final QSubCategory subCategory;

//inherited
public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;

Expand All @@ -55,7 +57,8 @@ public QFlavoredCategory(PathMetadata metadata, PathInits inits) {
public QFlavoredCategory(Class<? extends FlavoredCategory> 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;
this.employee = inits.isInitialized("employee") ? new QAccount(forProperty("employee"), inits.get("employee")) : null;
this.subCategory = inits.isInitialized("subCategory") ? new QSubCategory(forProperty("subCategory"), inits.get("subCategory")) : null;
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ public class QFlavoredDistrict extends EntityPathBase<FlavoredDistrict> {
//inherited
public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;

public final QCityDistrict district;

public final QAccount employee;

public final NumberPath<Long> id = createNumber("id", Long.class);

public final QLocation location;

//inherited
public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;

Expand All @@ -54,8 +54,8 @@ public QFlavoredDistrict(PathMetadata metadata, PathInits inits) {

public QFlavoredDistrict(Class<? extends FlavoredDistrict> type, PathMetadata metadata, PathInits inits) {
super(type, metadata, inits);
this.district = inits.isInitialized("district") ? new QCityDistrict(forProperty("district")) : null;
this.employee = inits.isInitialized("employee") ? new QAccount(forProperty("employee")) : null;
this.employee = inits.isInitialized("employee") ? new QAccount(forProperty("employee"), inits.get("employee")) : null;
this.location = inits.isInitialized("location") ? new QLocation(forProperty("location")) : null;
}

}
Expand Down
2 changes: 1 addition & 1 deletion src/main/generated/com/example/api/domain/QInquiry.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public QInquiry(PathMetadata metadata, PathInits inits) {

public QInquiry(Class<? extends Inquiry> type, PathMetadata metadata, PathInits inits) {
super(type, metadata, inits);
this.createdBy = inits.isInitialized("createdBy") ? new QAccount(forProperty("createdBy")) : null;
this.createdBy = inits.isInitialized("createdBy") ? new QAccount(forProperty("createdBy"), inits.get("createdBy")) : null;
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.api.business.domain;
package com.example.api.domain;

import static com.querydsl.core.types.PathMetadataFactory.*;

Expand All @@ -10,16 +10,16 @@


/**
* QBusinessLocation is a Querydsl query type for BusinessLocation
* QLocation is a Querydsl query type for Location
*/
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
public class QBusinessLocation extends EntityPathBase<BusinessLocation> {
public class QLocation extends EntityPathBase<Location> {

private static final long serialVersionUID = 1235580438L;
private static final long serialVersionUID = 400775290L;

public static final QBusinessLocation businessLocation = new QBusinessLocation("businessLocation");
public static final QLocation location = new QLocation("location");

public final com.example.api.domain.QBaseEntity _super = new com.example.api.domain.QBaseEntity(this);
public final QBaseEntity _super = new QBaseEntity(this);

public final StringPath address = createString("address");

Expand All @@ -28,23 +28,29 @@ public class QBusinessLocation extends EntityPathBase<BusinessLocation> {

public final StringPath detailAddress = createString("detailAddress");

public final StringPath dong = createString("dong");

public final NumberPath<Long> id = createNumber("id", Long.class);

public final StringPath sido = createString("sido");

public final StringPath sigugun = createString("sigugun");

//inherited
public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;

public final StringPath zipcode = createString("zipcode");

public QBusinessLocation(String variable) {
super(BusinessLocation.class, forVariable(variable));
public QLocation(String variable) {
super(Location.class, forVariable(variable));
}

public QBusinessLocation(Path<? extends BusinessLocation> path) {
public QLocation(Path<? extends Location> path) {
super(path.getType(), path.getMetadata());
}

public QBusinessLocation(PathMetadata metadata) {
super(BusinessLocation.class, metadata);
public QLocation(PathMetadata metadata) {
super(Location.class, metadata);
}

}
Expand Down
10 changes: 3 additions & 7 deletions src/main/generated/com/example/api/domain/QOfferEmployment.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,18 @@ public class QOfferEmployment extends EntityPathBase<OfferEmployment> {

public final QAccount employee;

public final DateTimePath<java.time.LocalDateTime> suggestEndTime = createDateTime("suggestEndTime", java.time.LocalDateTime.class);
public final EnumPath<ProposalStatus> status = createEnum("status", ProposalStatus.class);

public final BooleanPath suggestFinished = createBoolean("suggestFinished");
public final DateTimePath<java.time.LocalDateTime> suggestEndTime = createDateTime("suggestEndTime", java.time.LocalDateTime.class);

public final NumberPath<Integer> suggestHourlyPay = createNumber("suggestHourlyPay", Integer.class);

public final NumberPath<Long> suggestId = createNumber("suggestId", Long.class);

public final BooleanPath suggestReaded = createBoolean("suggestReaded");

public final DateTimePath<java.time.LocalDateTime> suggestRegisterTime = createDateTime("suggestRegisterTime", java.time.LocalDateTime.class);

public final DateTimePath<java.time.LocalDateTime> suggestStartTime = createDateTime("suggestStartTime", java.time.LocalDateTime.class);

public final BooleanPath suggestSucceeded = createBoolean("suggestSucceeded");

public QOfferEmployment(String variable) {
this(OfferEmployment.class, forVariable(variable), INITS);
}
Expand All @@ -64,7 +60,7 @@ public QOfferEmployment(Class<? extends OfferEmployment> type, PathMetadata meta
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;
this.employee = inits.isInitialized("employee") ? new QAccount(forProperty("employee"), inits.get("employee")) : null;
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public QPossibleBoard(PathMetadata metadata, PathInits inits) {

public QPossibleBoard(Class<? extends PossibleBoard> type, PathMetadata metadata, PathInits inits) {
super(type, metadata, inits);
this.employee = inits.isInitialized("employee") ? new QAccount(forProperty("employee")) : null;
this.employee = inits.isInitialized("employee") ? new QAccount(forProperty("employee"), inits.get("employee")) : null;
}

}
Expand Down
2 changes: 1 addition & 1 deletion src/main/generated/com/example/api/domain/QReview.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public QReview(PathMetadata metadata, PathInits inits) {
public QReview(Class<? extends Review> type, PathMetadata metadata, PathInits inits) {
super(type, metadata, inits);
this.contract = inits.isInitialized("contract") ? new QContract(forProperty("contract"), inits.get("contract")) : null;
this.employee = inits.isInitialized("employee") ? new QAccount(forProperty("employee")) : null;
this.employee = inits.isInitialized("employee") ? new QAccount(forProperty("employee"), inits.get("employee")) : null;
this.writer = inits.isInitialized("writer") ? new QBusiness(forProperty("writer"), inits.get("writer")) : null;
}

Expand Down
Loading
Loading