Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
6cc3f80
컨테이너 GET, POST 해결
yjlee000 May 28, 2023
de079fd
Merge branch 'master' of https://github.com/Container-Team5/container…
yjlee000 May 28, 2023
4237cd3
일단 Container 테이블 만들고 GET/POST 해결하긴 함
yjlee000 May 29, 2023
44d7463
일단 Container 테이블 만들고 GET/POST 해결하긴 함
yjlee000 May 29, 2023
bde07c8
팔레트 id랑 1차 목적지로 검색 추가
sand-flavor-fruits May 29, 2023
a1b3430
컨테이너 사이즈 디폴트 값으로 고정.
YuJin-1104 May 29, 2023
36c0fa5
Merge branch 'container-back-DB12' of https://github.com/Container-Te…
YuJin-1104 May 29, 2023
60b9934
컨테이너 사이즈 디폴트 값으로 고정.
YuJin-1104 May 29, 2023
87437b3
api 테스트 파일 이름 변경
YuJin-1104 May 29, 2023
b7491fa
api 테스트 파일 이름 변경
YuJin-1104 May 29, 2023
9c30756
팔레트 가로, 세로 디폴트 값 설정
YuJin-1104 May 29, 2023
cdf5d9c
팔레트 상품명 부분검색, 적재 테이블 생성
sand-flavor-fruits May 30, 2023
e7f9256
ManyToMany 적재 테이블 외래키 완료
YuJin-1104 May 31, 2023
d6c8f5a
Admin Palette 다대다 관계 생성
sand-flavor-fruits May 31, 2023
226bb4b
ManyToMany 적재 테이블 외래키 완료
YuJin-1104 Jun 4, 2023
4d61769
Merge branch 'container-back-DB14' of https://github.com/Container-Te…
YuJin-1104 Jun 4, 2023
ab99ff0
사용자 주문 목록 에러 잔뜩 오짐
YuJin-1104 Jun 4, 2023
006f626
사용자 주문 목록 에러 잔뜩 오짐
YuJin-1104 Jun 4, 2023
df19c0d
테스트 전
YuJin-1104 Jun 4, 2023
d3c82f9
테스트 전
YuJin-1104 Jun 4, 2023
9c5797e
몰루
sand-flavor-fruits Jun 4, 2023
047958d
Merge branch 'container-back-DB16' of https://github.com/Container-Te…
sand-flavor-fruits Jun 4, 2023
fbb9629
사용자 팔레트 조회
YuJin-1104 Jun 4, 2023
797304b
몰루
sand-flavor-fruits Jun 4, 2023
bfe09ca
Merge branch 'container-back-DB16' of https://github.com/Container-Te…
sand-flavor-fruits Jun 4, 2023
28a78d7
사용자 팔레트 조회
YuJin-1104 Jun 4, 2023
2440491
Merge branch 'container-back-DB16' of https://github.com/Container-Te…
YuJin-1104 Jun 4, 2023
3e99f72
PaletteController에 containerId로 GET 조회 가능
sand-flavor-fruits Jun 4, 2023
c2e3e14
Merge branch 'container-back-DB16' of https://github.com/Container-Te…
YuJin-1104 Jun 4, 2023
4168704
팔레트에 containerId 값 넣어서 업데이트하는 PUT 메서드 추가
YuJin-1104 Jun 5, 2023
2cecc5d
..
yjlee000 Jun 5, 2023
b6307ee
토큰 시간 바꿨어용
yjlee000 Jun 7, 2023
faf6f92
토큰 시간 바꿨어용
yjlee000 Jun 7, 2023
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
Binary file modified .gradle/7.6.1/checksums/checksums.lock
Binary file not shown.
Binary file modified .gradle/7.6.1/checksums/md5-checksums.bin
Binary file not shown.
Binary file modified .gradle/7.6.1/checksums/sha1-checksums.bin
Binary file not shown.
Binary file modified .gradle/7.6.1/executionHistory/executionHistory.bin
Binary file not shown.
Binary file modified .gradle/7.6.1/executionHistory/executionHistory.lock
Binary file not shown.
Binary file modified .gradle/7.6.1/fileHashes/fileHashes.bin
Binary file not shown.
Binary file modified .gradle/7.6.1/fileHashes/fileHashes.lock
Binary file not shown.
Binary file modified .gradle/7.6.1/fileHashes/resourceHashesCache.bin
Binary file not shown.
Binary file modified .gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
Binary file modified .gradle/buildOutputCleanup/outputFiles.bin
Binary file not shown.
Binary file modified .gradle/file-system.probe
Binary file not shown.
20 changes: 20 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'mysql:mysql-connector-java:8.0.32'
implementation 'org.testng:testng:7.1.0'
implementation 'org.junit.jupiter:junit-jupiter:5.8.1'
testImplementation 'org.projectlombok:lombok:1.18.22'
compileOnly 'org.projectlombok:lombok'
developmentOnly 'org.springframework.boot:spring-boot-devtools'
Expand All @@ -40,11 +41,30 @@ dependencies {
implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'
// https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-hateoas
implementation 'org.springframework.boot:spring-boot-starter-hateoas:3.0.6'
implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta"
annotationProcessor "jakarta.annotation:jakarta.annotation-api"
annotationProcessor "jakarta.persistence:jakarta.persistence-api"
}

tasks.named('test') {
useJUnitPlatform()
}

def querydslDir = "$buildDir/generated/querydsl"

sourceSets {
main.java.srcDirs += [ querydslDir ]
}

tasks.withType(JavaCompile) {
options.annotationProcessorGeneratedSourcesDirectory = file(querydslDir)
}

clean.doLast {
file(querydslDir).deleteDir()
}

def frontendDir = "$projectDir/src/main/container-front"

sourceSets {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package com.example.containerback.container;

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;


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

private static final long serialVersionUID = -262776451L;

public static final QContainer container = new QContainer("container");

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

public final NumberPath<Float> height = createNumber("height", Float.class);

public final NumberPath<Float> length = createNumber("length", Float.class);

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

public final NumberPath<Float> volume = createNumber("volume", Float.class);

public final NumberPath<Float> weight = createNumber("weight", Float.class);

public final NumberPath<Float> weightLimit = createNumber("weightLimit", Float.class);

public final NumberPath<Float> width = createNumber("width", Float.class);

public QContainer(String variable) {
super(Container.class, forVariable(variable));
}

public QContainer(Path<? extends Container> path) {
super(path.getType(), path.getMetadata());
}

public QContainer(PathMetadata metadata) {
super(Container.class, metadata);
}

}

Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
package com.example.containerback.palette;

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;


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

private static final long serialVersionUID = 683667633L;

private static final PathInits INITS = PathInits.DIRECT2;

public static final QPalette palette = new QPalette("palette");

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

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

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

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

public final NumberPath<Float> height = createNumber("height", Float.class);

public final NumberPath<Float> length = createNumber("length", Float.class);

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

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

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

public final com.example.containerback.user.QUser user;

public final NumberPath<Float> volume = createNumber("volume", Float.class);

public final NumberPath<Float> weight = createNumber("weight", Float.class);

public final NumberPath<Float> width = createNumber("width", Float.class);

public QPalette(String variable) {
this(Palette.class, forVariable(variable), INITS);
}

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

public QPalette(PathMetadata metadata) {
this(metadata, PathInits.getFor(metadata, INITS));
}

public QPalette(PathMetadata metadata, PathInits inits) {
this(Palette.class, metadata, inits);
}

public QPalette(Class<? extends Palette> type, PathMetadata metadata, PathInits inits) {
super(type, metadata, inits);
this.user = inits.isInitialized("user") ? new com.example.containerback.user.QUser(forProperty("user")) : null;
}

}

62 changes: 62 additions & 0 deletions build/generated/querydsl/com/example/containerback/user/QUser.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
package com.example.containerback.user;

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;


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

private static final long serialVersionUID = -16112201L;

public static final QUser user = new QUser("user");

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

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

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

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

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

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

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

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

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

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

public final ListPath<UserRole, EnumPath<UserRole>> roles = this.<UserRole, EnumPath<UserRole>>createList("roles", UserRole.class, EnumPath.class, PathInits.DIRECT2);

public final EnumPath<UserStatus> state = createEnum("state", UserStatus.class);

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

public QUser(String variable) {
super(User.class, forVariable(variable));
}

public QUser(Path<? extends User> path) {
super(path.getType(), path.getMetadata());
}

public QUser(PathMetadata metadata) {
super(User.class, metadata);
}

}

12 changes: 6 additions & 6 deletions build/resources/main/static/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"files": {
"main.css": "/static/css/main.a9e8385c.css",
"main.js": "/static/js/main.987500c2.js",
"main.css": "/static/css/main.e49649ff.css",
"main.js": "/static/js/main.a432fb54.js",
"static/js/787.71df535f.chunk.js": "/static/js/787.71df535f.chunk.js",
"index.html": "/index.html",
"main.a9e8385c.css.map": "/static/css/main.a9e8385c.css.map",
"main.987500c2.js.map": "/static/js/main.987500c2.js.map",
"main.e49649ff.css.map": "/static/css/main.e49649ff.css.map",
"main.a432fb54.js.map": "/static/js/main.a432fb54.js.map",
"787.71df535f.chunk.js.map": "/static/js/787.71df535f.chunk.js.map"
},
"entrypoints": [
"static/css/main.a9e8385c.css",
"static/js/main.987500c2.js"
"static/css/main.e49649ff.css",
"static/js/main.a432fb54.js"
]
}
2 changes: 1 addition & 1 deletion build/resources/main/static/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>React App</title><script defer="defer" src="/static/js/main.987500c2.js"></script><link href="/static/css/main.a9e8385c.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>React App</title><script defer="defer" src="/static/js/main.a432fb54.js"></script><link href="/static/css/main.e49649ff.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
2 changes: 2 additions & 0 deletions build/resources/main/static/static/css/main.86bc7e86.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading