Merge pull request #72 from jamalsoueidan/fix-deployment

Fix deployment

package.json

@@ -6,9 +6,11 @@
     "~": "dist/src"
   },
   "scripts": {
+    "prebuild": "npm run clean",
     "build": "tsc",
     "watch": "tsc -w",
-    "prestart": "npm run build",
+    "clean": "rimraf dist",
+    "prestart": "npm run clean && npm run build",
     "start": "func start",
     "test": "jest --verbose",
     "bundle": "npx swagger-cli bundle openapi/openapi.yaml -t yaml -o docs/openapi.yaml",
@@ -17,7 +19,7 @@
     "generate-ts": "npm run bundle && npx orval --config ./orval.config.js"
   },
   "dependencies": {
-    "@azure/functions": "^4.0.1",
+    "@azure/functions": "^4.0.0",
     "@types/jsonwebtoken": "^9.0.3",
     "axios": "^1.5.1",
     "bcryptjs": "^2.4.3",
@@ -27,21 +29,22 @@
     "graphql-request": "^6.1.0",
     "jsonwebtoken": "^9.0.2",
     "module-alias": "^2.2.3",
-    "mongoose": "^7.6.1",
+    "mongoose": "^7.3.1",
     "zod": "^3.22.4"
   },
   "devDependencies": {
     "@faker-js/faker": "^8.1.0",
     "@types/bcryptjs": "^2.4.4",
     "@types/jest": "^29.5.5",
-    "@types/node": "^20.x",
+    "@types/node": "^18.x",
     "date-fns-tz": "^2.0.0",
     "fs": "^0.0.1-security",
     "jest": "^29.7.0",
     "mongodb-memory-server": "^9.0.0",
     "orval": "^6.18.1",
     "ts-jest": "^29.1.1",
-    "typescript": "^5.2.2"
+    "typescript": "^4.0.0",
+    "rimraf": "^5.0.0"
   },
   "main": "dist/src/functions/*.js"
 }

src/functions/availability/availability.types.ts

@@ -1,5 +1,5 @@
-import { Lookup } from "../lookup";
-import { User } from "../user";
+import { Lookup } from "../lookup/lookup.type";
+import { User } from "../user/user.types";
 
 export type Availability = {
   date: Date;
@@ -12,7 +12,7 @@ export type Availability = {
       productId: number;
       variantId: number;
       from: Date;
-      to: Date;
+      ["to"]: any;
       breakTime: number;
       duration: number;
     }[];

src/functions/booking.function.ts

@@ -1,4 +1,5 @@
 import { app } from "@azure/functions";
+import "module-alias/register";
 import { BookingControllerUpsert } from "./booking/controllers/upsert";
 
 app.http("bookingUpsert", {

src/functions/customer.function.ts

@@ -2,28 +2,35 @@ import "module-alias/register";
 import { CustomerProductsControllerList } from "./customer/controllers/products/list";
 
 import { app } from "@azure/functions";
+
+import { CustomerAvailabilityControllerGet } from "./customer/controllers/availability";
 import {
   CustomerBookingControllerGet,
   CustomerBookingControllerList,
+} from "./customer/controllers/booking";
+import {
   CustomerControllerGet,
   CustomerControllerIsBusiness,
   CustomerControllerStatus,
   CustomerControllerUpdate,
   CustomerControllerUpsert,
+} from "./customer/controllers/customer";
+import {
   CustomerLocationControllerAdd,
   CustomerLocationControllerCreate,
   CustomerLocationControllerGetAll,
+  CustomerLocationControllerGetAllOrigins,
   CustomerLocationControllerGetOne,
   CustomerLocationControllerRemove,
   CustomerLocationControllerSetDefault,
   CustomerLocationControllerUpdate,
+} from "./customer/controllers/location";
+import {
   CustomerProductControllerDestroy,
   CustomerProductControllerGet,
   CustomerProductControllerUpsert,
-  CustomerProductsControllerListIds,
-} from "./customer";
-import { CustomerAvailabilityControllerGet } from "./customer/controllers/availability";
-import { CustomerLocationControllerGetAllOrigins } from "./customer/controllers/location/get-all-origins";
+} from "./customer/controllers/product";
+import { CustomerProductsControllerListIds } from "./customer/controllers/products";
 import {
   CustomerScheduleControllerCreate,
   CustomerScheduleControllerDestroy,

src/functions/customer/controllers/availability/get.ts

@@ -5,7 +5,7 @@ import { UserZodSchema } from "~/functions/user";
 
 import { LocationZodSchema } from "~/functions/location";
 import { NumberOrStringType, StringOrObjectIdType } from "~/library/zod";
-import { CustomerAvailabilityServiceGet } from "../../services";
+import { CustomerAvailabilityServiceGet } from "../../services/availability";
 import { CustomerProductsServiceListIds } from "../../services/product";
 
 export type CustomerAvailabilityControllerGetRequest = {

src/functions/customer/controllers/customer/get.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { UserZodSchema } from "~/functions/user";
 import { _ } from "~/library/handler";
-import { CustomerServiceGet } from "../../services";
+import { CustomerServiceGet } from "../../services/customer";
 
 export type CustomerControllerGetRequest = {
   query: z.infer<typeof CustomerServiceGetSchema>;

src/functions/customer/controllers/customer/is-business.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { UserZodSchema } from "~/functions/user";
 import { _ } from "~/library/handler";
-import { CustomerServiceIsBusiness } from "../../services";
+import { CustomerServiceIsBusiness } from "../../services/customer";
 
 export type CustomerControllerIsBusinessRequest = {
   query: z.infer<typeof CustomerControllerIsBusinessSchema>;

src/functions/customer/controllers/customer/status.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { UserZodSchema } from "~/functions/user";
 import { _ } from "~/library/handler";
-import { CustomerServiceStatus } from "../../services";
+import { CustomerServiceStatus } from "../../services/customer";
 
 export type CustomerControllerStatusRequest = {
   query: z.infer<typeof CustomerServiceStatusSchema>;

src/functions/customer/controllers/customer/update.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { UserZodSchema } from "~/functions/user";
 import { _ } from "~/library/handler";
-import { CustomerServiceUpsert } from "../../services";
+import { CustomerServiceUpsert } from "../../services/customer";
 
 export type CustomerControllerUpdateRequest = {
   query: CustomerControllerUpdateQuery;

src/functions/customer/controllers/customer/upsert.spec.ts

@@ -7,7 +7,8 @@ import {
 } from "~/library/jest/azure";
 
 import { Professions } from "~/functions/user";
-import { CustomerServiceUpsert } from "../../services";
+
+import { CustomerServiceUpsert } from "../../services/customer";
 import {
   CustomerControllerUpsert,
   CustomerControllerUpsertBody,

src/functions/customer/controllers/customer/upsert.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { UserZodSchema } from "~/functions/user";
 import { _ } from "~/library/handler";
-import { CustomerServiceUpsert } from "../../services";
+import { CustomerServiceUpsert } from "../../services/customer";
 
 export type CustomerControllerUpsertRequest = {
   query: CustomerControllerUpsertQuery;

src/functions/customer/controllers/location/get-all-origins.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { LocationZodSchema } from "~/functions/location";
 import { _ } from "~/library/handler";
-import { CustomerLocationServiceGetAllOrigins } from "../../services";
+import { CustomerLocationServiceGetAllOrigins } from "../../services/location";
 
 export type CustomerLocationControllerGetAllOriginsRequest = {
   query: z.infer<typeof CustomerLocationServiceQuerySchema>;

src/functions/customer/controllers/location/index.ts

@@ -1,6 +1,7 @@
 export * from "./add";
 export * from "./create";
 export * from "./get";
+export * from "./get-all-origins";
 export * from "./list";
 export * from "./remove";
 export * from "./set-default";

src/functions/customer/controllers/product/destroy.spec.ts

@@ -1,13 +1,15 @@
 import { HttpRequest, InvocationContext } from "@azure/functions";
-import { CustomerScheduleServiceCreate } from "~/functions/customer/services";
+
 import { ScheduleProduct, TimeUnit } from "~/functions/schedule";
 import {
   HttpSuccessResponse,
   createContext,
   createHttpRequest,
 } from "~/library/jest/azure";
 import { omitObjectIdProps } from "~/library/jest/helpers";
-import { CustomerProductServiceUpsert } from "../../services";
+
+import { CustomerProductServiceUpsert } from "../../services/product";
+import { CustomerScheduleServiceCreate } from "../../services/schedule";
 import {
   CustomerProductControllerDestroy,
   CustomerProductControllerDestroyRequest,

src/functions/customer/controllers/product/destroy.ts

@@ -4,7 +4,7 @@ import {
   ScheduleZodSchema,
 } from "~/functions/schedule/schedule.types";
 import { _ } from "~/library/handler";
-import { CustomerProductServiceDestroy } from "../../services";
+import { CustomerProductServiceDestroy } from "../../services/product";
 
 export type CustomerProductControllerDestroyRequest = {
   query: z.infer<typeof CustomerProductControllerDestroyQuerySchema>;

src/functions/customer/controllers/product/get.spec.ts

@@ -1,13 +1,14 @@
 import { HttpRequest, InvocationContext } from "@azure/functions";
-import { CustomerScheduleServiceCreate } from "~/functions/customer/services";
+
 import { ScheduleProduct, TimeUnit } from "~/functions/schedule";
 
-import { CustomerProductServiceUpsert } from "~/functions/customer/services";
 import {
   HttpSuccessResponse,
   createContext,
   createHttpRequest,
 } from "~/library/jest/azure";
+import { CustomerProductServiceUpsert } from "../../services/product";
+import { CustomerScheduleServiceCreate } from "../../services/schedule";
 import {
   CustomerProductControllerGet,
   CustomerProductControllerGetRequest,

src/functions/customer/controllers/product/get.ts

@@ -1,10 +1,11 @@
 import { z } from "zod";
-import { CustomerProductServiceGet } from "~/functions/customer/services";
+
 import {
   ScheduleProductZodSchema,
   ScheduleZodSchema,
 } from "~/functions/schedule/schedule.types";
 import { _ } from "~/library/handler";
+import { CustomerProductServiceGet } from "../../services/product";
 
 export type CustomerProductControllerGetRequest = {
   query: z.infer<typeof CustomerProductControllerGetQuerySchema>;

src/functions/customer/controllers/product/upsert.spec.ts

@@ -1,13 +1,13 @@
 import { HttpRequest, InvocationContext } from "@azure/functions";
 
-import { CustomerScheduleServiceCreate } from "~/functions/customer/services";
 import {
   HttpSuccessResponse,
   createContext,
   createHttpRequest,
 } from "~/library/jest/azure";
 
 import { ScheduleProduct, TimeUnit } from "~/functions/schedule";
+import { CustomerScheduleServiceCreate } from "../../services/schedule";
 import {
   CustomerProductControllerUpsert,
   CustomerProductControllerUpsertRequest,

src/functions/customer/controllers/product/upsert.ts

@@ -5,7 +5,7 @@ import {
 } from "~/functions/schedule/schedule.types";
 
 import { _ } from "~/library/handler";
-import { CustomerProductServiceUpsert } from "../../services";
+import { CustomerProductServiceUpsert } from "../../services/product";
 
 export type CustomerProductControllerUpsertRequest = {
   query: z.infer<typeof CustomerProductControllerUpsertQuerySchema>;

src/functions/customer/controllers/products/list-ids.spec.ts

@@ -1,12 +1,13 @@
 import { HttpRequest, InvocationContext } from "@azure/functions";
-import { CustomerScheduleServiceCreate } from "~/functions/customer/services";
+
 import { CustomerProductServiceUpsert } from "~/functions/customer/services/product";
 import { ScheduleProduct, TimeUnit } from "~/functions/schedule";
 import {
   HttpSuccessResponse,
   createContext,
   createHttpRequest,
 } from "~/library/jest/azure";
+import { CustomerScheduleServiceCreate } from "../../services/schedule";
 import {
   CustomerProductsControllerListIds,
   CustomerProductsControllerListIdsRequest,

src/functions/customer/controllers/products/list.spec.ts

@@ -1,13 +1,15 @@
 import { HttpRequest, InvocationContext } from "@azure/functions";
-import { CustomerScheduleServiceCreate } from "~/functions/customer/services";
+
 import { ScheduleProduct, TimeUnit } from "~/functions/schedule";
 
 import {
   HttpSuccessResponse,
   createContext,
   createHttpRequest,
 } from "~/library/jest/azure";
-import { CustomerProductServiceUpsert } from "../../services";
+
+import { CustomerProductServiceUpsert } from "../../services/product";
+import { CustomerScheduleServiceCreate } from "../../services/schedule";
 import {
   CustomerProductsControllerList,
   CustomerProductsControllerListRequest,

src/functions/customer/controllers/schedule/create.ts

@@ -1,7 +1,8 @@
 import { z } from "zod";
-import { CustomerScheduleServiceCreate } from "~/functions/customer/services";
+
 import { ScheduleZodSchema } from "~/functions/schedule";
 import { _ } from "~/library/handler";
+import { CustomerScheduleServiceCreate } from "../../services/schedule";
 
 export type CustomerScheduleControllerCreateRequest = {
   query: z.infer<typeof CustomerScheduleControllerCreateQuerySchema>;

src/functions/customer/controllers/schedule/destroy.spec.ts

@@ -1,10 +1,10 @@
 import { HttpRequest, InvocationContext } from "@azure/functions";
-import { CustomerScheduleServiceCreate } from "~/functions/customer/services";
 import {
   HttpSuccessResponse,
   createContext,
   createHttpRequest,
 } from "~/library/jest/azure";
+import { CustomerScheduleServiceCreate } from "../../services/schedule";
 import {
   CustomerScheduleControllerDestroy,
   CustomerScheduleControllerDestroyRequest,

src/functions/customer/controllers/schedule/destroy.ts

@@ -1,7 +1,8 @@
 import { z } from "zod";
-import { CustomerScheduleServiceDestroy } from "~/functions/customer/services";
+
 import { ScheduleZodSchema } from "~/functions/schedule/schedule.types";
 import { _ } from "~/library/handler";
+import { CustomerScheduleServiceDestroy } from "../../services/schedule";
 
 export type CustomerScheduleControllerDestroyRequest = {
   query: z.infer<typeof CustomerScheduleControllerDestroySchema>;

src/functions/customer/controllers/schedule/get.spec.ts

@@ -1,10 +1,11 @@
 import { HttpRequest, InvocationContext } from "@azure/functions";
-import { CustomerScheduleServiceCreate } from "~/functions/customer/services";
+
 import {
   HttpSuccessResponse,
   createContext,
   createHttpRequest,
 } from "~/library/jest/azure";
+import { CustomerScheduleServiceCreate } from "../../services/schedule";
 import {
   CustomerScheduleControllerGet,
   CustomerScheduleControllerGetRequest,

src/functions/customer/controllers/schedule/get.ts

@@ -1,7 +1,8 @@
 import { z } from "zod";
-import { CustomerScheduleServiceGet } from "~/functions/customer/services";
+
 import { ScheduleZodSchema } from "~/functions/schedule";
 import { _ } from "~/library/handler";
+import { CustomerScheduleServiceGet } from "../../services/schedule";
 
 export type CustomerScheduleControllerGetRequest = {
   query: z.infer<typeof CustomerScheduleControllerGetSchema>;

src/functions/customer/controllers/schedule/list.spec.ts

@@ -1,11 +1,12 @@
 import { HttpRequest, InvocationContext } from "@azure/functions";
-import { CustomerScheduleServiceCreate } from "~/functions/customer/services";
+
 import {
   HttpSuccessResponse,
   createContext,
   createHttpRequest,
 } from "~/library/jest/azure";
 
+import { CustomerScheduleServiceCreate } from "../../services/schedule";
 import {
   CustomerScheduleControllerList,
   CustomerScheduleControllerListRequest,

src/functions/customer/controllers/schedule/list.ts

@@ -1,7 +1,8 @@
 import { z } from "zod";
-import { CustomerScheduleServiceList } from "~/functions/customer/services";
+
 import { ScheduleZodSchema } from "~/functions/schedule/schedule.types";
 import { _ } from "~/library/handler";
+import { CustomerScheduleServiceList } from "../../services/schedule";
 
 export type CustomerScheduleControllerListRequest = {
   query: z.infer<typeof CustomerScheduleControllerListQuerySchema>;

src/functions/customer/controllers/schedule/update.spec.ts

@@ -1,11 +1,12 @@
 import { HttpRequest, InvocationContext } from "@azure/functions";
-import { CustomerScheduleServiceCreate } from "~/functions/customer/services";
+
 import {
   HttpSuccessResponse,
   createContext,
   createHttpRequest,
 } from "~/library/jest/azure";
 
+import { CustomerScheduleServiceCreate } from "../../services/schedule";
 import {
   CustomerScheduleControllerUpdate,
   CustomerScheduleControllerUpdateRequest,