Fix bug buyproduct, myitems

구매한 상품에대해 평가버튼이 나오도록 수정, 안팔리고 시간이 지난 상품이 경매중상품에 안나오도록 수정
connect-foundation · Dec 19, 2019 · fb6051a · fb6051a
1 parent 427f4a0
commit fb6051a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/client/src/components/Organism/TradeListBox/index.jsx b/client/src/components/Organism/TradeListBox/index.jsx
@@ -85,7 +85,7 @@ const Component = props => {
             />
             <ReportButton userId={props.targetId} productId={props.id} text={"구매자 신고"} />
           </div>
-        ) : props.status === "판매" ? (
+        ) : props.status === "구매" ? (
           <div>
             {rateCheck || props.buyerCheck ? (
               "평가완료"

diff --git a/server/src/repositories/ProductRepository.ts b/server/src/repositories/ProductRepository.ts
@@ -5,7 +5,8 @@ import {
   Not,
   IsNull,
   MoreThan,
-  MoreThanOrEqual
+  MoreThanOrEqual,
+  LessThan
 } from "typeorm";
 import { ProductsDTO } from "../dto/ProductDTO";
 import { Products } from "../models/Products";
@@ -50,8 +51,8 @@ export class ProductRepository {
       select: ["id", "title", "thumbnailUrl", "immediatePrice", "registerDate"],
       where: {
         seller: userId,
-        soldDate: null,
-        auctionDeadline: MoreThanOrEqual(new Date())
+        soldDate: IsNull(),
+        extensionDate: MoreThan(Today())
       },
       order: {
         id: "DESC"