#99 jwt 토큰 사용 수정

.github/workflows/deploy.yml

@@ -0,0 +1,45 @@
+name: Deploy to Amazon EC2
+
+on:
+  push:
+    branches: [ "develop" ]
+
+jobs:
+  deploy:
+    name: deploy
+    runs-on: ubuntu-latest
+    environment: production
+
+    steps:
+      - name: setting-jdk17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'zulu'
+
+      - name: checkout
+        uses: actions/checkout@v2
+#
+#      - name: test
+#        run: ./gradlew clean test
+
+      - name : build
+        run: ./gradlew build -x test
+
+      - name: copy file to Develop server via ssh key
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.AWS_HOST }}
+          username: ${{ secrets.AWS_USERNAME }}
+          key: ${{ secrets.AWS_SSH_KEY }}
+          source: "build/libs/*"
+          target: "/home/ubuntu/apiserver"
+
+      - name: deploy
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.AWS_HOST }}
+          username: ${{ secrets.AWS_USERNAME }}
+          key: ${{ secrets.AWS_SSH_KEY }}
+          script: |
+            sudo systemctl restart apiserver.service

.github/workflows/prtest.yml

@@ -0,0 +1,21 @@
+name: PR TEST
+
+on:
+  pull_request:
+    branches: [ "develop", "main" ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: setting-jdk17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'zulu'
+
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: execute TestCode
+        run: ./gradlew clean test

.gitignore

@@ -36,4 +36,5 @@ out/
 ### VS Code ###
 .vscode/
 
+### .env ###
 .env

build.gradle

@@ -26,25 +26,91 @@ repositories {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
+
     compileOnly 'org.projectlombok:lombok'
 //    runtimeOnly 'com.mysql:mysql-connector-j'
     runtimeOnly 'com.h2database:h2'
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
-    // env 파일 읽도록 도와주는 라이브러리
+    // WEB SOCKET
+    implementation 'org.springframework.boot:spring-boot-starter-websocket'
+
+    // MONGO DB
+    implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
+
+    // ENV
     implementation 'me.paulschwarz:spring-dotenv:4.0.0'
+
+    // VALIDATION
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+
+    // SECURITY
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+
+    // SMTP
+    implementation 'org.springframework.boot:spring-boot-starter-mail'
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+
+    // JWT
+    implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
+    // Query DSL
+    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"
+
+    // 인메모리 몽고디비 flapdoodle
+    testImplementation 'de.flapdoodle.embed:de.flapdoodle.embed.mongo:4.6.0'
+
+    // OAUTH2
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+
+    // MOCKITO
+    testImplementation "org.mockito:mockito-core:3.+"
+
+    //WIREMOCK (외부 의존성 테스트용)
+    implementation 'org.wiremock.integrations:wiremock-spring-boot:3.3.0'
+
+    // ModelMapper 사용
+    //객체 간 매핑 처리
+    implementation 'org.modelmapper:modelmapper:3.1.0'
+
+    // swagger
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0'
+
+    // S3
+    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 }
 
 tasks.named('test') {
     useJUnitPlatform()
 }
 
+def querydslDir = "build/generated/querydsl"
+
+sourceSets {
+    main.java.srcDirs += [ querydslDir ]
+}
+
+tasks.withType(JavaCompile) {
+    options.getGeneratedSourceOutputDirectory().set(file(querydslDir))
+}
+
+clean.doLast {
+    file(querydslDir).deleteDir()
+}
+
 sourceSets {
     test {
         java {
             srcDirs = ['src/test/java']
         }
     }
-}
+}

src/main/generated/com/example/api/account/entity/QLocation.java

@@ -0,0 +1,43 @@
+package com.example.api.account.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;
+
+
+/**
+ * QLocation is a Querydsl query type for Location
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QLocation extends EntityPathBase<Location> {
+
+    private static final long serialVersionUID = -590127238L;
+
+    public static final QLocation location = new QLocation("location");
+
+    public final StringPath address = createString("address");
+
+    public final StringPath detailAddress = createString("detailAddress");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath zipcode = createString("zipcode");
+
+    public QLocation(String variable) {
+        super(Location.class, forVariable(variable));
+    }
+
+    public QLocation(Path<? extends Location> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QLocation(PathMetadata metadata) {
+        super(Location.class, metadata);
+    }
+
+}
+

src/main/generated/com/example/api/auth/entitiy/QRefreshToken.java

@@ -0,0 +1,57 @@
+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<RefreshToken> {
+
+    private static final long serialVersionUID = -1655386265L;
+
+    private static final PathInits INITS = PathInits.DIRECT2;
+
+    public static final QRefreshToken refreshToken1 = new QRefreshToken("refreshToken1");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final BooleanPath isExpired = createBoolean("isExpired");
+
+    public final DateTimePath<java.time.LocalDateTime> 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<? extends RefreshToken> 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<? 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;
+    }
+
+}
+

src/main/generated/com/example/api/domain/QAccount.java

@@ -0,0 +1,78 @@
+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<Account> {
+
+    private static final long serialVersionUID = -1087167288L;
+
+    public static final QAccount account = new QAccount("account");
+
+    public final QBaseEntity _super = new QBaseEntity(this);
+
+    public final NumberPath<Long> accountId = createNumber("accountId", Long.class);
+
+    public final NumberPath<Integer> age = createNumber("age", Integer.class);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> 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<com.example.api.account.entity.Nationality> 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<com.example.api.account.entity.UserRole, EnumPath<com.example.api.account.entity.UserRole>> roles = this.<com.example.api.account.entity.UserRole, EnumPath<com.example.api.account.entity.UserRole>>createCollection("roles", com.example.api.account.entity.UserRole.class, EnumPath.class, PathInits.DIRECT2);
+
+    public final StringPath sex = createString("sex");
+
+    public final NumberPath<Float> starPoint = createNumber("starPoint", Float.class);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;
+
+    public final NumberPath<Integer> workCount = createNumber("workCount", Integer.class);
+
+    public QAccount(String variable) {
+        super(Account.class, forVariable(variable));
+    }
+
+    public QAccount(Path<? extends Account> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QAccount(PathMetadata metadata) {
+        super(Account.class, metadata);
+    }
+
+}
+