Merge branch 'main' into temp

ecstacy-fcs · Nov 10, 2021 · 417db39 · 417db39
2 parents 3c24504 + 238ee5d
commit 417db39
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 7 deletions.
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -67,7 +67,7 @@ model Buyer {
 model Product {
   id          String          @id @default(uuid())
   name        String
-  description String
+  description String          @db.VarChar(1028)
   price       Int
   sellerId    String
   categoryId  String

diff --git a/src/lib/validators/session.ts b/src/lib/validators/session.ts
@@ -56,6 +56,14 @@ export default async function validate(req, res, next) {
     return;
   }
 
+  if(user.banned){
+    await prisma.session.delete({ where: { sid: req.sessionID } });
+    req.session.destroy(() => {
+      respond(res, req, 400, ERROR.ACCOUNT_BANNED, undefined);
+    });
+    return;
+  }
+
   req.session.lastActive = currentTime;
   req.user = user;
 

diff --git a/src/routes/buy.ts b/src/routes/buy.ts
@@ -12,6 +12,7 @@ import { respond } from "src/lib/request-respond";
 import prisma from "src/prisma";
 const route = express();
 
+
 route.get(
   "/orders",
   isUser,
@@ -23,6 +24,34 @@ route.get(
     try {
       const orders = await prisma.orders.findMany({
         where: { buyer: { userId: req.user.id } },
+        select: {
+          id: true,
+          status: true,
+          time: true,
+          quantity: true,
+          buyer: {
+            select: {
+              id: true,
+            },
+          },
+          product: {
+            select: {
+              id: true,
+              name: true,
+              price: true,
+              seller: {
+                select: {
+                  id: true,
+                  user: {
+                    select: {
+                      name: true,
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
       });
       respond(res, req, 200, "success", orders);
     } catch (err) {

diff --git a/src/routes/buyers.ts b/src/routes/buyers.ts
@@ -25,9 +25,6 @@ route.get(
         where: {
           user: {
             deleted: false,
-            adminProfile: {
-              is: null,
-            },
           },
         },
         select: {

diff --git a/src/routes/payment.ts b/src/routes/payment.ts
@@ -44,12 +44,24 @@ route.post(
     try {
       const product = await prisma.product.findUnique({
         where: { id: productId },
+        include:{
+          seller: {
+            include: {
+              user: true
+            }
+          }
+        }
       });
       if (!product) {
         respond(res, req, 404, ERROR.PRODUCT_NOT_FOUND);
         return;
       }
 
+      if(product && product.seller.user.banned || product.seller.user.deleted || product.banned){
+        respond(res, req, 404, ERROR.PRODUCT_NOT_FOUND);
+        return;
+      }
+
       const order = await prisma.orders.create({
         data: {
           buyerId: req.user.buyerProfile.id,

diff --git a/src/routes/products.ts b/src/routes/products.ts
@@ -35,7 +35,7 @@ const route = express();
 
 const productSchema = Joi.object({
   name: Joi.string().trim().max(28).required(),
-  description: Joi.string().trim().max(124).required(),
+  description: Joi.string().trim().max(1024).required(),
   price: Joi.number().positive().max(15000).min(1).required(),
   category: Joi.string().trim().required(),
 });
@@ -322,6 +322,11 @@ route.get("/:productId", async (req, res, next) => {
       },
     });
 
+    if (!product) {
+      respond(res, req, 404, "Product not found.", null);
+      return;
+    }
+
     convertImagePath(product);
     respond(res, req, 200, "success", product);
   } catch (err) {

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,12 +1,12 @@
 {
   "compilerOptions": {
     "esModuleInterop": true,
-    "module": "commonjs",
+    "module": "CommonJS",
     "moduleResolution": "node",
     "noEmit": false,
     "outDir": "dist",
     "resolveJsonModule": true,
-    "sourceMap": true,
+    "sourceMap": false,
     "target": "es6",
     "baseUrl": ".",
     "rootDir": "./src",