From 299dfa8710bdf560d12473e04e080d5c87733119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=8B=9C=EC=98=81?= <102596659+see101702@users.noreply.github.com> Date: Thu, 19 Oct 2023 17:39:30 +0900 Subject: [PATCH] Revert "fix flask service" --- .../api/user/domain/QInterestingWork.java | 62 --------------- .../server/api/user/domain/QRatingWork.java | 64 --------------- .../oven/server/api/user/domain/QUser.java | 51 ------------ .../oven/server/api/work/domain/QGenre.java | 77 ------------------- .../server/api/work/domain/QProvider.java | 42 ---------- .../oven/server/api/work/domain/QWork.java | 77 ------------------- .../server/api/work/domain/QWorkProvider.java | 62 --------------- .../com/oven/server/common/QBaseEntity.java | 39 ---------- .../api/work/controller/HomeController.java | 12 --- .../work/service/SpringToFlaskService.java | 17 ++-- 10 files changed, 10 insertions(+), 493 deletions(-) delete mode 100644 src/main/generated/com/oven/server/api/user/domain/QInterestingWork.java delete mode 100644 src/main/generated/com/oven/server/api/user/domain/QRatingWork.java delete mode 100644 src/main/generated/com/oven/server/api/user/domain/QUser.java delete mode 100644 src/main/generated/com/oven/server/api/work/domain/QGenre.java delete mode 100644 src/main/generated/com/oven/server/api/work/domain/QProvider.java delete mode 100644 src/main/generated/com/oven/server/api/work/domain/QWork.java delete mode 100644 src/main/generated/com/oven/server/api/work/domain/QWorkProvider.java delete mode 100644 src/main/generated/com/oven/server/common/QBaseEntity.java diff --git a/src/main/generated/com/oven/server/api/user/domain/QInterestingWork.java b/src/main/generated/com/oven/server/api/user/domain/QInterestingWork.java deleted file mode 100644 index 0097eb9..0000000 --- a/src/main/generated/com/oven/server/api/user/domain/QInterestingWork.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.oven.server.api.user.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; - - -/** - * QInterestingWork is a Querydsl query type for InterestingWork - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QInterestingWork extends EntityPathBase { - - private static final long serialVersionUID = -129692332L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QInterestingWork interestingWork = new QInterestingWork("interestingWork"); - - public final com.oven.server.common.QBaseEntity _super = new com.oven.server.common.QBaseEntity(this); - - //inherited - public final DateTimePath createdAt = _super.createdAt; - - public final NumberPath id = createNumber("id", Long.class); - - //inherited - public final DateTimePath modifiedAt = _super.modifiedAt; - - public final QUser user; - - public final com.oven.server.api.work.domain.QWork work; - - public QInterestingWork(String variable) { - this(InterestingWork.class, forVariable(variable), INITS); - } - - public QInterestingWork(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QInterestingWork(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QInterestingWork(PathMetadata metadata, PathInits inits) { - this(InterestingWork.class, metadata, inits); - } - - public QInterestingWork(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.user = inits.isInitialized("user") ? new QUser(forProperty("user")) : null; - this.work = inits.isInitialized("work") ? new com.oven.server.api.work.domain.QWork(forProperty("work"), inits.get("work")) : null; - } - -} - diff --git a/src/main/generated/com/oven/server/api/user/domain/QRatingWork.java b/src/main/generated/com/oven/server/api/user/domain/QRatingWork.java deleted file mode 100644 index 0ab5407..0000000 --- a/src/main/generated/com/oven/server/api/user/domain/QRatingWork.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.oven.server.api.user.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; - - -/** - * QRatingWork is a Querydsl query type for RatingWork - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QRatingWork extends EntityPathBase { - - private static final long serialVersionUID = -1219391037L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QRatingWork ratingWork = new QRatingWork("ratingWork"); - - public final com.oven.server.common.QBaseEntity _super = new com.oven.server.common.QBaseEntity(this); - - //inherited - public final DateTimePath createdAt = _super.createdAt; - - public final NumberPath id = createNumber("id", Long.class); - - //inherited - public final DateTimePath modifiedAt = _super.modifiedAt; - - public final NumberPath rating = createNumber("rating", Float.class); - - public final QUser user; - - public final com.oven.server.api.work.domain.QWork work; - - public QRatingWork(String variable) { - this(RatingWork.class, forVariable(variable), INITS); - } - - public QRatingWork(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QRatingWork(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QRatingWork(PathMetadata metadata, PathInits inits) { - this(RatingWork.class, metadata, inits); - } - - public QRatingWork(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.user = inits.isInitialized("user") ? new QUser(forProperty("user")) : null; - this.work = inits.isInitialized("work") ? new com.oven.server.api.work.domain.QWork(forProperty("work"), inits.get("work")) : null; - } - -} - diff --git a/src/main/generated/com/oven/server/api/user/domain/QUser.java b/src/main/generated/com/oven/server/api/user/domain/QUser.java deleted file mode 100644 index 985e6f7..0000000 --- a/src/main/generated/com/oven/server/api/user/domain/QUser.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.oven.server.api.user.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; - - -/** - * QUser is a Querydsl query type for User - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QUser extends EntityPathBase { - - private static final long serialVersionUID = 631284480L; - - public static final QUser user = new QUser("user"); - - public final com.oven.server.common.QBaseEntity _super = new com.oven.server.common.QBaseEntity(this); - - //inherited - public final DateTimePath createdAt = _super.createdAt; - - public final NumberPath id = createNumber("id", Long.class); - - //inherited - public final DateTimePath modifiedAt = _super.modifiedAt; - - public final StringPath nickname = createString("nickname"); - - public final StringPath password = createString("password"); - - public final StringPath username = createString("username"); - - public QUser(String variable) { - super(User.class, forVariable(variable)); - } - - public QUser(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QUser(PathMetadata metadata) { - super(User.class, metadata); - } - -} - diff --git a/src/main/generated/com/oven/server/api/work/domain/QGenre.java b/src/main/generated/com/oven/server/api/work/domain/QGenre.java deleted file mode 100644 index dbfad21..0000000 --- a/src/main/generated/com/oven/server/api/work/domain/QGenre.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.oven.server.api.work.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; - - -/** - * QGenre is a Querydsl query type for Genre - */ -@Generated("com.querydsl.codegen.DefaultEmbeddableSerializer") -public class QGenre extends BeanPath { - - private static final long serialVersionUID = 197681000L; - - public static final QGenre genre = new QGenre("genre"); - - public final BooleanPath action = createBoolean("action"); - - public final BooleanPath adult = createBoolean("adult"); - - public final BooleanPath adventure = createBoolean("adventure"); - - public final BooleanPath animation = createBoolean("animation"); - - public final BooleanPath comedy = createBoolean("comedy"); - - public final BooleanPath criminal = createBoolean("criminal"); - - public final BooleanPath documentary = createBoolean("documentary"); - - public final BooleanPath drama = createBoolean("drama"); - - public final BooleanPath family = createBoolean("family"); - - public final BooleanPath fantasy = createBoolean("fantasy"); - - public final BooleanPath horror = createBoolean("horror"); - - public final BooleanPath music = createBoolean("music"); - - public final BooleanPath musical = createBoolean("musical"); - - public final BooleanPath mystery = createBoolean("mystery"); - - public final BooleanPath performance = createBoolean("performance"); - - public final BooleanPath romance = createBoolean("romance"); - - public final BooleanPath SF = createBoolean("SF"); - - public final BooleanPath thriller = createBoolean("thriller"); - - public final BooleanPath variety = createBoolean("variety"); - - public final BooleanPath war = createBoolean("war"); - - public final BooleanPath western = createBoolean("western"); - - public QGenre(String variable) { - super(Genre.class, forVariable(variable)); - } - - public QGenre(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QGenre(PathMetadata metadata) { - super(Genre.class, metadata); - } - -} - diff --git a/src/main/generated/com/oven/server/api/work/domain/QProvider.java b/src/main/generated/com/oven/server/api/work/domain/QProvider.java deleted file mode 100644 index 4551345..0000000 --- a/src/main/generated/com/oven/server/api/work/domain/QProvider.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.oven.server.api.work.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; - - -/** - * QProvider is a Querydsl query type for Provider - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QProvider extends EntityPathBase { - - private static final long serialVersionUID = -2094880276L; - - public static final QProvider provider = new QProvider("provider"); - - public final NumberPath id = createNumber("id", Long.class); - - public final StringPath name = createString("name"); - - public final ListPath workList = this.createList("workList", WorkProvider.class, QWorkProvider.class, PathInits.DIRECT2); - - public QProvider(String variable) { - super(Provider.class, forVariable(variable)); - } - - public QProvider(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QProvider(PathMetadata metadata) { - super(Provider.class, metadata); - } - -} - diff --git a/src/main/generated/com/oven/server/api/work/domain/QWork.java b/src/main/generated/com/oven/server/api/work/domain/QWork.java deleted file mode 100644 index 71194ea..0000000 --- a/src/main/generated/com/oven/server/api/work/domain/QWork.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.oven.server.api.work.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; - - -/** - * QWork is a Querydsl query type for Work - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QWork extends EntityPathBase { - - private static final long serialVersionUID = 1946525836L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QWork work = new QWork("work"); - - public final com.oven.server.common.QBaseEntity _super = new com.oven.server.common.QBaseEntity(this); - - public final StringPath actor = createString("actor"); - - public final StringPath ageRating = createString("ageRating"); - - //inherited - public final DateTimePath createdAt = _super.createdAt; - - public final StringPath director = createString("director"); - - public final QGenre genre; - - public final NumberPath id = createNumber("id", Long.class); - - //inherited - public final DateTimePath modifiedAt = _super.modifiedAt; - - public final StringPath poster = createString("poster"); - - public final ListPath providerList = this.createList("providerList", WorkProvider.class, QWorkProvider.class, PathInits.DIRECT2); - - public final StringPath summary = createString("summary"); - - public final StringPath titleEng = createString("titleEng"); - - public final StringPath titleKr = createString("titleKr"); - - public final NumberPath year = createNumber("year", Integer.class); - - public QWork(String variable) { - this(Work.class, forVariable(variable), INITS); - } - - public QWork(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QWork(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QWork(PathMetadata metadata, PathInits inits) { - this(Work.class, metadata, inits); - } - - public QWork(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.genre = inits.isInitialized("genre") ? new QGenre(forProperty("genre")) : null; - } - -} - diff --git a/src/main/generated/com/oven/server/api/work/domain/QWorkProvider.java b/src/main/generated/com/oven/server/api/work/domain/QWorkProvider.java deleted file mode 100644 index d5c3035..0000000 --- a/src/main/generated/com/oven/server/api/work/domain/QWorkProvider.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.oven.server.api.work.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; - - -/** - * QWorkProvider is a Querydsl query type for WorkProvider - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QWorkProvider extends EntityPathBase { - - private static final long serialVersionUID = 1120976541L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QWorkProvider workProvider = new QWorkProvider("workProvider"); - - public final com.oven.server.common.QBaseEntity _super = new com.oven.server.common.QBaseEntity(this); - - //inherited - public final DateTimePath createdAt = _super.createdAt; - - public final NumberPath id = createNumber("id", Long.class); - - //inherited - public final DateTimePath modifiedAt = _super.modifiedAt; - - public final QProvider provider; - - public final QWork work; - - public QWorkProvider(String variable) { - this(WorkProvider.class, forVariable(variable), INITS); - } - - public QWorkProvider(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QWorkProvider(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QWorkProvider(PathMetadata metadata, PathInits inits) { - this(WorkProvider.class, metadata, inits); - } - - public QWorkProvider(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.provider = inits.isInitialized("provider") ? new QProvider(forProperty("provider")) : null; - this.work = inits.isInitialized("work") ? new QWork(forProperty("work"), inits.get("work")) : null; - } - -} - diff --git a/src/main/generated/com/oven/server/common/QBaseEntity.java b/src/main/generated/com/oven/server/common/QBaseEntity.java deleted file mode 100644 index 7326ef8..0000000 --- a/src/main/generated/com/oven/server/common/QBaseEntity.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.oven.server.common; - -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; - - -/** - * QBaseEntity is a Querydsl query type for BaseEntity - */ -@Generated("com.querydsl.codegen.DefaultSupertypeSerializer") -public class QBaseEntity extends EntityPathBase { - - private static final long serialVersionUID = 1638760413L; - - public static final QBaseEntity baseEntity = new QBaseEntity("baseEntity"); - - public final DateTimePath createdAt = createDateTime("createdAt", java.time.LocalDateTime.class); - - public final DateTimePath modifiedAt = createDateTime("modifiedAt", java.time.LocalDateTime.class); - - public QBaseEntity(String variable) { - super(BaseEntity.class, forVariable(variable)); - } - - public QBaseEntity(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QBaseEntity(PathMetadata metadata) { - super(BaseEntity.class, metadata); - } - -} - diff --git a/src/main/java/com/oven/server/api/work/controller/HomeController.java b/src/main/java/com/oven/server/api/work/controller/HomeController.java index d0e36f6..b5d5aeb 100644 --- a/src/main/java/com/oven/server/api/work/controller/HomeController.java +++ b/src/main/java/com/oven/server/api/work/controller/HomeController.java @@ -35,18 +35,6 @@ public Response> getPopularWorkList() { } - @GetMapping("/recommendation/works") - public Response> getRecommendWorkList(@AuthenticationPrincipal User user) { - String response = springToFlaskService.springToFlask(user); - - try { - List recommendWorkDtoList = getRecommendWorkListService.getRecommendWorkList(response); - return Response.success(ResponseCode.SUCCESS_OK, recommendWorkDtoList); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - } - // /home/recommendation/provider diff --git a/src/main/java/com/oven/server/api/work/service/SpringToFlaskService.java b/src/main/java/com/oven/server/api/work/service/SpringToFlaskService.java index 7a82273..0176d01 100644 --- a/src/main/java/com/oven/server/api/work/service/SpringToFlaskService.java +++ b/src/main/java/com/oven/server/api/work/service/SpringToFlaskService.java @@ -14,6 +14,11 @@ import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; +import java.io.BufferedWriter; +import java.io.StringWriter; +import java.util.List; +import java.util.Random; + @Service @RequiredArgsConstructor public class SpringToFlaskService { @@ -21,8 +26,8 @@ public class SpringToFlaskService { private final UserRepository userRepository; private final WorkRepository workRepository; - public String springToFlask(User user) { - String flaskApiUrl = "http://127.0.0.1:6000/spring"; + public void springToFlask(User user, String csvContent) { + String flaskApiUrl = "http://43.201.68.242:5000/spring"; String userId = String.valueOf(user.getId()); //HTTP 요청 헤더 설정 @@ -30,7 +35,7 @@ public String springToFlask(User user) { headers.setContentType(MediaType.APPLICATION_JSON); //HTTP 요청 본문 설정 - HttpEntity requestEntity = new HttpEntity<>(userId, headers); + HttpEntity requestEntity = new HttpEntity<>(new String[]{userId, csvContent}, headers); //RestTemplate를 사용하여 POST 요청 보내기 RestTemplate restTemplate = new RestTemplate(); @@ -38,11 +43,9 @@ public String springToFlask(User user) { if (responseEntity.getStatusCode().is2xxSuccessful()) { String response = responseEntity.getBody(); - return response; -// System.out.println("플라스크 서버 응답: " + response); + System.out.println("플라스크 서버 응답: " + response); } else { -// System.out.println("HTTP 요청 실패 " + responseEntity.getStatusCodeValue()); - return responseEntity.getStatusCode().toString(); + System.out.println("HTTP 요청 실패 " + responseEntity.getStatusCodeValue()); } }