[Master] 7-8주차 PR

.github/workflows/gradle.yml

@@ -59,7 +59,10 @@ jobs:
     runs-on: self-hosted
 
     # weekly/* 브랜치에서는 실행되지 않도록 조건 추가
-    if: startsWith(github.ref, 'refs/heads/Master') || startsWith(github.ref, 'refs/heads/develop')
+    #    if: startsWith(github.ref, 'refs/heads/Master') || startsWith(github.ref, 'refs/heads/develop')
+
+    # weekly/* 브랜치에서만 실행되도록
+    if: startsWith(github.ref, 'refs/heads/weekly/')
 
     steps:
       # 최신 이미지를 pull 
@@ -76,13 +79,18 @@ jobs:
           echo "${{ secrets.ENV }}" >> .env
 
       # 브랜치에 따라 다른 환경 변수를 설정하여 컨테이너 실행
+      #      - name: docker run new container
+      #        run: |
+      #          if [ "${{ github.ref }}" == "refs/heads/Master" ]; then
+      #            sudo docker run --name inplace --rm -d -p 8080:8080 --env-file .env ${{ secrets.DOCKERHUB_USERNAME }}/inplace
+      #          elif [ "${{ github.ref }}" == "refs/heads/develop" ]; then
+      #            sudo docker run --name inplace-dev --rm -d -p 8081:8080 --env-file .env ${{ secrets.DOCKERHUB_USERNAME }}/inplace
+      #          fi
+
+      # weekly/* 브랜치 8081 포트로 설정
       - name: docker run new container
         run: |
-          if [ "${{ github.ref }}" == "refs/heads/Master" ]; then
-            sudo docker run --name inplace --rm -d -p 8080:8080 --env-file .env ${{ secrets.DOCKERHUB_USERNAME }}/inplace
-          elif [ "${{ github.ref }}" == "refs/heads/develop" ]; then
-            sudo docker run --name inplace-dev --rm -d -p 8081:8080 --env-file .env ${{ secrets.DOCKERHUB_USERNAME }}/inplace
-          fi
+          sudo docker run --name inplace-dev --rm -d -p 8081:8080 --env-file .env ${{ secrets.DOCKERHUB_USERNAME }}/inplace
 
       # 미사용 이미지를 정리
       - name: delete old docker image

build.gradle

@@ -56,6 +56,14 @@ dependencies {
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+    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"
+
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
 }
 
 tasks.named('test') {

src/main/generated/team7/inplace/crawling/domain/QYoutubeChannel.java

@@ -0,0 +1,47 @@
+package team7.inplace.crawling.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;
+
+
+/**
+ * QYoutubeChannel is a Querydsl query type for YoutubeChannel
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QYoutubeChannel extends EntityPathBase<YoutubeChannel> {
+
+    private static final long serialVersionUID = 2131098359L;
+
+    public static final QYoutubeChannel youtubeChannel = new QYoutubeChannel("youtubeChannel");
+
+    public final EnumPath<ChannelType> channelType = createEnum("channelType", ChannelType.class);
+
+    public final StringPath channelUUID = createString("channelUUID");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final NumberPath<Long> influencerId = createNumber("influencerId", Long.class);
+
+    public final StringPath lastVideoUUID = createString("lastVideoUUID");
+
+    public final StringPath playListUUID = createString("playListUUID");
+
+    public QYoutubeChannel(String variable) {
+        super(YoutubeChannel.class, forVariable(variable));
+    }
+
+    public QYoutubeChannel(Path<? extends YoutubeChannel> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QYoutubeChannel(PathMetadata metadata) {
+        super(YoutubeChannel.class, metadata);
+    }
+
+}
+

src/main/generated/team7/inplace/favoriteInfluencer/domain/QFavoriteInfluencer.java

@@ -0,0 +1,56 @@
+package team7.inplace.favoriteInfluencer.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;
+
+
+/**
+ * QFavoriteInfluencer is a Querydsl query type for FavoriteInfluencer
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QFavoriteInfluencer extends EntityPathBase<FavoriteInfluencer> {
+
+    private static final long serialVersionUID = -1437439762L;
+
+    private static final PathInits INITS = PathInits.DIRECT2;
+
+    public static final QFavoriteInfluencer favoriteInfluencer = new QFavoriteInfluencer("favoriteInfluencer");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final team7.inplace.influencer.domain.QInfluencer influencer;
+
+    public final BooleanPath like = createBoolean("like");
+
+    public final team7.inplace.user.domain.QUser user;
+
+    public QFavoriteInfluencer(String variable) {
+        this(FavoriteInfluencer.class, forVariable(variable), INITS);
+    }
+
+    public QFavoriteInfluencer(Path<? extends FavoriteInfluencer> path) {
+        this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
+    }
+
+    public QFavoriteInfluencer(PathMetadata metadata) {
+        this(metadata, PathInits.getFor(metadata, INITS));
+    }
+
+    public QFavoriteInfluencer(PathMetadata metadata, PathInits inits) {
+        this(FavoriteInfluencer.class, metadata, inits);
+    }
+
+    public QFavoriteInfluencer(Class<? extends FavoriteInfluencer> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.influencer = inits.isInitialized("influencer") ? new team7.inplace.influencer.domain.QInfluencer(forProperty("influencer")) : null;
+        this.user = inits.isInitialized("user") ? new team7.inplace.user.domain.QUser(forProperty("user")) : null;
+    }
+
+}
+

src/main/generated/team7/inplace/influencer/domain/QInfluencer.java

@@ -0,0 +1,43 @@
+package team7.inplace.influencer.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;
+
+
+/**
+ * QInfluencer is a Querydsl query type for Influencer
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QInfluencer extends EntityPathBase<Influencer> {
+
+    private static final long serialVersionUID = 799784822L;
+
+    public static final QInfluencer influencer = new QInfluencer("influencer");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath imgUrl = createString("imgUrl");
+
+    public final StringPath job = createString("job");
+
+    public final StringPath name = createString("name");
+
+    public QInfluencer(String variable) {
+        super(Influencer.class, forVariable(variable));
+    }
+
+    public QInfluencer(Path<? extends Influencer> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QInfluencer(PathMetadata metadata) {
+        super(Influencer.class, metadata);
+    }
+
+}
+

src/main/generated/team7/inplace/place/domain/QAddress.java

@@ -0,0 +1,41 @@
+package team7.inplace.place.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;
+
+
+/**
+ * QAddress is a Querydsl query type for Address
+ */
+@Generated("com.querydsl.codegen.DefaultEmbeddableSerializer")
+public class QAddress extends BeanPath<Address> {
+
+    private static final long serialVersionUID = -594482223L;
+
+    public static final QAddress address = new QAddress("address");
+
+    public final StringPath address1 = createString("address1");
+
+    public final StringPath address2 = createString("address2");
+
+    public final StringPath address3 = createString("address3");
+
+    public QAddress(String variable) {
+        super(Address.class, forVariable(variable));
+    }
+
+    public QAddress(Path<? extends Address> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QAddress(PathMetadata metadata) {
+        super(Address.class, metadata);
+    }
+
+}
+

src/main/generated/team7/inplace/place/domain/QCoordinate.java

@@ -0,0 +1,39 @@
+package team7.inplace.place.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;
+
+
+/**
+ * QCoordinate is a Querydsl query type for Coordinate
+ */
+@Generated("com.querydsl.codegen.DefaultEmbeddableSerializer")
+public class QCoordinate extends BeanPath<Coordinate> {
+
+    private static final long serialVersionUID = 1083194491L;
+
+    public static final QCoordinate coordinate = new QCoordinate("coordinate");
+
+    public final StringPath latitude = createString("latitude");
+
+    public final StringPath longitude = createString("longitude");
+
+    public QCoordinate(String variable) {
+        super(Coordinate.class, forVariable(variable));
+    }
+
+    public QCoordinate(Path<? extends Coordinate> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QCoordinate(PathMetadata metadata) {
+        super(Coordinate.class, metadata);
+    }
+
+}
+

src/main/generated/team7/inplace/place/domain/QMenu.java

@@ -0,0 +1,45 @@
+package team7.inplace.place.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;
+
+
+/**
+ * QMenu is a Querydsl query type for Menu
+ */
+@Generated("com.querydsl.codegen.DefaultEmbeddableSerializer")
+public class QMenu extends BeanPath<Menu> {
+
+    private static final long serialVersionUID = 1908284066L;
+
+    public static final QMenu menu = new QMenu("menu");
+
+    public final StringPath description = createString("description");
+
+    public final StringPath menuImgUrl = createString("menuImgUrl");
+
+    public final StringPath menuName = createString("menuName");
+
+    public final StringPath price = createString("price");
+
+    public final BooleanPath recommend = createBoolean("recommend");
+
+    public QMenu(String variable) {
+        super(Menu.class, forVariable(variable));
+    }
+
+    public QMenu(Path<? extends Menu> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QMenu(PathMetadata metadata) {
+        super(Menu.class, metadata);
+    }
+
+}
+

src/main/generated/team7/inplace/place/domain/QOffDay.java

@@ -0,0 +1,41 @@
+package team7.inplace.place.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;
+
+
+/**
+ * QOffDay is a Querydsl query type for OffDay
+ */
+@Generated("com.querydsl.codegen.DefaultEmbeddableSerializer")
+public class QOffDay extends BeanPath<OffDay> {
+
+    private static final long serialVersionUID = -32148432L;
+
+    public static final QOffDay offDay = new QOffDay("offDay");
+
+    public final StringPath holidayName = createString("holidayName");
+
+    public final StringPath temporaryHolidays = createString("temporaryHolidays");
+
+    public final StringPath weekAndDay = createString("weekAndDay");
+
+    public QOffDay(String variable) {
+        super(OffDay.class, forVariable(variable));
+    }
+
+    public QOffDay(Path<? extends OffDay> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QOffDay(PathMetadata metadata) {
+        super(OffDay.class, metadata);
+    }
+
+}
+