From 941798d8046e74b6988f97fec2c27284fe733997 Mon Sep 17 00:00:00 2001 From: eckrin Date: Mon, 20 Nov 2023 00:04:09 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20sendername=EC=9D=B4=20null=EB=A1=9C=20?= =?UTF-8?q?=EA=B0=80=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kusitms/jipbap/order/QOrder.java | 15 +++-- .../kusitms/jipbap/order/QOrderDetail.java | 61 +++++++++++++++++++ .../jipbap/chat/service/RoomService.java | 2 +- 3 files changed, 73 insertions(+), 5 deletions(-) create mode 100644 src/main/generated/com/kusitms/jipbap/order/QOrderDetail.java diff --git a/src/main/generated/com/kusitms/jipbap/order/QOrder.java b/src/main/generated/com/kusitms/jipbap/order/QOrder.java index e866c00..c8348fd 100644 --- a/src/main/generated/com/kusitms/jipbap/order/QOrder.java +++ b/src/main/generated/com/kusitms/jipbap/order/QOrder.java @@ -27,16 +27,22 @@ public class QOrder extends EntityPathBase { //inherited public final DateTimePath createdAt = _super.createdAt; - public final com.kusitms.jipbap.food.QFood food; - public final NumberPath id = createNumber("id", Long.class); - public final NumberPath orderCount = createNumber("orderCount", Long.class); + public final ListPath orderDetail = this.createList("orderDetail", OrderDetail.class, QOrderDetail.class, PathInits.DIRECT2); public final NumberPath regionId = createNumber("regionId", Long.class); + public final QReview review; + + public final StringPath selectedOption = createString("selectedOption"); + public final EnumPath status = createEnum("status", OrderStatus.class); + public final com.kusitms.jipbap.store.QStore store; + + public final NumberPath totalCount = createNumber("totalCount", Long.class); + public final NumberPath totalPrice = createNumber("totalPrice", Long.class); //inherited @@ -62,7 +68,8 @@ public QOrder(PathMetadata metadata, PathInits inits) { public QOrder(Class type, PathMetadata metadata, PathInits inits) { super(type, metadata, inits); - this.food = inits.isInitialized("food") ? new com.kusitms.jipbap.food.QFood(forProperty("food"), inits.get("food")) : null; + this.review = inits.isInitialized("review") ? new QReview(forProperty("review"), inits.get("review")) : null; + this.store = inits.isInitialized("store") ? new com.kusitms.jipbap.store.QStore(forProperty("store"), inits.get("store")) : null; this.user = inits.isInitialized("user") ? new com.kusitms.jipbap.user.QUser(forProperty("user"), inits.get("user")) : null; } diff --git a/src/main/generated/com/kusitms/jipbap/order/QOrderDetail.java b/src/main/generated/com/kusitms/jipbap/order/QOrderDetail.java new file mode 100644 index 0000000..2f31540 --- /dev/null +++ b/src/main/generated/com/kusitms/jipbap/order/QOrderDetail.java @@ -0,0 +1,61 @@ +package com.kusitms.jipbap.order; + +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; + + +/** + * QOrderDetail is a Querydsl query type for OrderDetail + */ +@Generated("com.querydsl.codegen.DefaultEntitySerializer") +public class QOrderDetail extends EntityPathBase { + + private static final long serialVersionUID = 1871440338L; + + private static final PathInits INITS = PathInits.DIRECT2; + + public static final QOrderDetail orderDetail = new QOrderDetail("orderDetail"); + + public final com.kusitms.jipbap.food.QFood food; + + public final com.kusitms.jipbap.food.QFoodOption foodOption; + + public final NumberPath id = createNumber("id", Long.class); + + public final QOrder order; + + public final NumberPath orderAmount = createNumber("orderAmount", Long.class); + + public final NumberPath orderCount = createNumber("orderCount", Long.class); + + public QOrderDetail(String variable) { + this(OrderDetail.class, forVariable(variable), INITS); + } + + public QOrderDetail(Path path) { + this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); + } + + public QOrderDetail(PathMetadata metadata) { + this(metadata, PathInits.getFor(metadata, INITS)); + } + + public QOrderDetail(PathMetadata metadata, PathInits inits) { + this(OrderDetail.class, metadata, inits); + } + + public QOrderDetail(Class type, PathMetadata metadata, PathInits inits) { + super(type, metadata, inits); + this.food = inits.isInitialized("food") ? new com.kusitms.jipbap.food.QFood(forProperty("food"), inits.get("food")) : null; + this.foodOption = inits.isInitialized("foodOption") ? new com.kusitms.jipbap.food.QFoodOption(forProperty("foodOption"), inits.get("foodOption")) : null; + this.order = inits.isInitialized("order") ? new QOrder(forProperty("order"), inits.get("order")) : null; + } + +} + diff --git a/src/main/java/com/kusitms/jipbap/chat/service/RoomService.java b/src/main/java/com/kusitms/jipbap/chat/service/RoomService.java index 6917ffa..0f1039c 100644 --- a/src/main/java/com/kusitms/jipbap/chat/service/RoomService.java +++ b/src/main/java/com/kusitms/jipbap/chat/service/RoomService.java @@ -77,7 +77,7 @@ public MessageResponseDto createRoom(MessageRequestDto dto, String email) { return new MessageResponseDto(messageRoom); // 6. 이미 생성된 채팅방인 경우 기존 채팅방 이동 } else { - return new MessageResponseDto(messageRoom.getRoomId()); + return new MessageResponseDto(messageRoom); } }