Merge pull request #61 from team9502/dev

deployment

.github/workflows/sinChul.yml

@@ -47,6 +47,10 @@ jobs:
             export ENCRYPTION_SECRET_KEY="${{ secrets.ENCRYPTION_SECRET_KEY }}"
             export JWT_SECRETKEY="${{ secrets.JWT_SECRETKEY }}"
             export API_SERVICE_KEY="${{ secrets.API_SERVICE_KEY }}"
+            export S3_ACCESS_KEY="${{ secrets.S3_ACCESS_KEY }}"
+            export S3_NAME="${{ secrets.S3_NAME }}"
+            export S3_REGION="${{ secrets.S3_REGION }}"
+            export SECRET_ACCESS_KEY="${{ secrets.SECRET_ACCESS_KEY }}"
 
             # JAR 파일을 /home/ec2-user 디렉토리에서 실행
             nohup java -jar /home/ec2-user/*.jar > nohup.out 2>&1 &
@@ -57,3 +61,7 @@ jobs:
           ENCRYPTION_SECRET_KEY: ${{ secrets.ENCRYPTION_SECRET_KEY }}
           JWT_SECRETKEY: ${{ secrets.JWT_SECRETKEY }}
           API_SERVICE_KEY: ${{ secrets.API_SERVICE_KEY }}
+          S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+          S3_NAME: ${{ secrets.S3_NAME }}
+          S3_REGION: ${{ secrets.S3_REGION }}
+          SECRET_ACCESS_KEY: ${{ secrets.SECRET_ACCESS_KEY }}

.gitignore

@@ -36,3 +36,6 @@ out/
 ### VS Code ###
 .vscode/
 .DS_Store
+
+### QueryDSL ###
+/src/main/generated/

build.gradle

@@ -2,6 +2,7 @@ plugins {
     id 'java'
     id 'org.springframework.boot' version '3.3.0'
     id 'io.spring.dependency-management' version '1.1.5'
+    id "com.ewerk.gradle.plugins.querydsl" version "1.0.10"
 }
 
 group = 'team9502'
@@ -15,6 +16,7 @@ configurations {
     compileOnly {
         extendsFrom annotationProcessor
     }
+    querydsl.extendsFrom compileClasspath
 }
 
 repositories {
@@ -32,6 +34,9 @@ dependencies {
     // Springdoc OpenAPI
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0'
 
+    // S3
+    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+
     // JWT
     implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
@@ -40,6 +45,12 @@ dependencies {
     // BasicTextEncryptor
     implementation 'org.jasypt:jasypt:1.9.3'
 
+    // QueryDSL dependencies
+    implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
+    annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta"
+    annotationProcessor 'jakarta.annotation:jakarta.annotation-api'
+    annotationProcessor 'jakarta.persistence:jakarta.persistence-api'
+
     implementation 'javax.servlet:javax.servlet-api:4.0.1'
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'com.mysql:mysql-connector-j'
@@ -49,3 +60,35 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
+def generated = 'src/main/generated'
+
+sourceSets {
+    main {
+        java {
+            srcDirs = ['src/main/java', generated]
+        }
+    }
+}
+
+tasks.named('clean') {
+    delete generated
+}
+
+tasks.withType(JavaCompile).configureEach {
+    options.annotationProcessorPath = configurations.querydsl
+    options.generatedSourceOutputDirectory = file(generated)
+}
+
+querydsl {
+    library = "com.querydsl:querydsl-apt"
+    jpa = true
+    querydslSourcesDir = generated
+}
+
+compileQuerydsl {
+    options.annotationProcessorPath = configurations.querydsl
+}
+
+tasks.withType(JavaCompile).matching { task -> task.name != 'compileQuerydsl' }.configureEach {
+    dependsOn compileQuerydsl
+}

src/main/generated/team9502/sinchulgwinong/domain/board/entity/QBoard.java

@@ -0,0 +1,63 @@
+package team9502.sinchulgwinong.domain.board.entity;
+
+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;
+
+
+/**
+ * QBoard is a Querydsl query type for Board
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QBoard extends EntityPathBase<Board> {
+
+    private static final long serialVersionUID = -80206607L;
+
+    private static final PathInits INITS = PathInits.DIRECT2;
+
+    public static final QBoard board = new QBoard("board");
+
+    public final team9502.sinchulgwinong.global.entity.QBaseTimeEntity _super = new team9502.sinchulgwinong.global.entity.QBaseTimeEntity(this);
+
+    public final StringPath boardContent = createString("boardContent");
+
+    public final NumberPath<Long> boardId = createNumber("boardId", Long.class);
+
+    public final StringPath boardTitle = createString("boardTitle");
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> modifiedAt = _super.modifiedAt;
+
+    public final team9502.sinchulgwinong.domain.user.entity.QUser user;
+
+    public QBoard(String variable) {
+        this(Board.class, forVariable(variable), INITS);
+    }
+
+    public QBoard(Path<? extends Board> path) {
+        this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
+    }
+
+    public QBoard(PathMetadata metadata) {
+        this(metadata, PathInits.getFor(metadata, INITS));
+    }
+
+    public QBoard(PathMetadata metadata, PathInits inits) {
+        this(Board.class, metadata, inits);
+    }
+
+    public QBoard(Class<? extends Board> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.user = inits.isInitialized("user") ? new team9502.sinchulgwinong.domain.user.entity.QUser(forProperty("user"), inits.get("user")) : null;
+    }
+
+}
+

src/main/generated/team9502/sinchulgwinong/domain/comment/entity/QComment.java

@@ -0,0 +1,64 @@
+package team9502.sinchulgwinong.domain.comment.entity;
+
+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;
+
+
+/**
+ * QComment is a Querydsl query type for Comment
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QComment extends EntityPathBase<Comment> {
+
+    private static final long serialVersionUID = -490280559L;
+
+    private static final PathInits INITS = PathInits.DIRECT2;
+
+    public static final QComment comment = new QComment("comment");
+
+    public final team9502.sinchulgwinong.global.entity.QBaseTimeEntity _super = new team9502.sinchulgwinong.global.entity.QBaseTimeEntity(this);
+
+    public final team9502.sinchulgwinong.domain.board.entity.QBoard board;
+
+    public final StringPath commentContent = createString("commentContent");
+
+    public final NumberPath<Long> commentId = createNumber("commentId", Long.class);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> modifiedAt = _super.modifiedAt;
+
+    public final team9502.sinchulgwinong.domain.user.entity.QUser user;
+
+    public QComment(String variable) {
+        this(Comment.class, forVariable(variable), INITS);
+    }
+
+    public QComment(Path<? extends Comment> path) {
+        this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
+    }
+
+    public QComment(PathMetadata metadata) {
+        this(metadata, PathInits.getFor(metadata, INITS));
+    }
+
+    public QComment(PathMetadata metadata, PathInits inits) {
+        this(Comment.class, metadata, inits);
+    }
+
+    public QComment(Class<? extends Comment> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.board = inits.isInitialized("board") ? new team9502.sinchulgwinong.domain.board.entity.QBoard(forProperty("board"), inits.get("board")) : null;
+        this.user = inits.isInitialized("user") ? new team9502.sinchulgwinong.domain.user.entity.QUser(forProperty("user"), inits.get("user")) : null;
+    }
+
+}
+

src/main/generated/team9502/sinchulgwinong/domain/companyUser/entity/QCompanyUser.java

@@ -0,0 +1,79 @@
+package team9502.sinchulgwinong.domain.companyUser.entity;
+
+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;
+
+
+/**
+ * QCompanyUser is a Querydsl query type for CompanyUser
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QCompanyUser extends EntityPathBase<CompanyUser> {
+
+    private static final long serialVersionUID = -1362447631L;
+
+    private static final PathInits INITS = PathInits.DIRECT2;
+
+    public static final QCompanyUser companyUser = new QCompanyUser("companyUser");
+
+    public final team9502.sinchulgwinong.global.entity.QBaseTimeEntity _super = new team9502.sinchulgwinong.global.entity.QBaseTimeEntity(this);
+
+    public final StringPath cpEmail = createString("cpEmail");
+
+    public final StringPath cpName = createString("cpName");
+
+    public final StringPath cpNum = createString("cpNum");
+
+    public final StringPath cpPassword = createString("cpPassword");
+
+    public final StringPath cpPhoneNumber = createString("cpPhoneNumber");
+
+    public final NumberPath<Long> cpUserId = createNumber("cpUserId", Long.class);
+
+    public final StringPath cpUsername = createString("cpUsername");
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;
+
+    public final StringPath description = createString("description");
+
+    public final NumberPath<Integer> employeeCount = createNumber("employeeCount", Integer.class);
+
+    public final DatePath<java.time.LocalDate> foundationDate = createDate("foundationDate", java.time.LocalDate.class);
+
+    public final BooleanPath hiringStatus = createBoolean("hiringStatus");
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> modifiedAt = _super.modifiedAt;
+
+    public final team9502.sinchulgwinong.domain.point.entity.QPoint point;
+
+    public QCompanyUser(String variable) {
+        this(CompanyUser.class, forVariable(variable), INITS);
+    }
+
+    public QCompanyUser(Path<? extends CompanyUser> path) {
+        this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
+    }
+
+    public QCompanyUser(PathMetadata metadata) {
+        this(metadata, PathInits.getFor(metadata, INITS));
+    }
+
+    public QCompanyUser(PathMetadata metadata, PathInits inits) {
+        this(CompanyUser.class, metadata, inits);
+    }
+
+    public QCompanyUser(Class<? extends CompanyUser> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.point = inits.isInitialized("point") ? new team9502.sinchulgwinong.domain.point.entity.QPoint(forProperty("point")) : null;
+    }
+
+}
+

src/main/generated/team9502/sinchulgwinong/domain/point/entity/QPoint.java

@@ -0,0 +1,39 @@
+package team9502.sinchulgwinong.domain.point.entity;
+
+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;
+
+
+/**
+ * QPoint is a Querydsl query type for Point
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QPoint extends EntityPathBase<Point> {
+
+    private static final long serialVersionUID = 2130037041L;
+
+    public static final QPoint point1 = new QPoint("point1");
+
+    public final NumberPath<Integer> point = createNumber("point", Integer.class);
+
+    public final NumberPath<Long> pointId = createNumber("pointId", Long.class);
+
+    public QPoint(String variable) {
+        super(Point.class, forVariable(variable));
+    }
+
+    public QPoint(Path<? extends Point> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QPoint(PathMetadata metadata) {
+        super(Point.class, metadata);
+    }
+
+}
+