Merge pull request #118 from jamalsoueidan/add-specialties

Add specialties

.vscode/launch.json

@@ -7,6 +7,20 @@
       "request": "attach",
       "port": 9229,
       "preLaunchTask": "func: host start"
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Debug Jest Tests",
+      "program": "${workspaceFolder}/node_modules/.bin/jest",
+      "args": [
+        "${workspaceFolder}/src/functions/user/services/availability/get.spec.ts"
+      ],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "windows": {
+        "program": "${workspaceFolder}/node_modules/jest/bin/jest.js"
+      }
     }
   ]
-}
+}

jest.config.js

@@ -5,4 +5,5 @@ module.exports = {
   moduleNameMapper: {
     "^~/(.*)$": "<rootDir>/src/$1",
   },
+  setupFiles: ["./jest/load-env.js"],
 };

openapi/openapi.yaml

@@ -236,6 +236,8 @@ components:
       $ref: paths/user/list/response.yaml
     UsersProfessionsResponse:
       $ref: paths/user/professions/response.yaml
+    UsersSpecialtiesResponse:
+      $ref: paths/user/specialties/response.yaml
 
     # UserAvailability
     UserAvailabilitySlot:
@@ -326,6 +328,8 @@ paths:
     $ref: "./paths/user/schedule/get-by-location/index.yaml"
   /users/professions:
     $ref: "./paths/user/professions/index.yaml"
+  /users/specialties:
+    $ref: "./paths/user/specialties/index.yaml"
   /user/{username}/availability/{locationId}/generate:
     $ref: "paths/user/availability/generate/index.yaml"
   /user/{username}/availability/{locationId}/get:

openapi/paths/user/list/index.yaml

@@ -11,9 +11,16 @@ parameters:
       type: string
   - name: profession
     in: query
-    description: profession like makeup_artist
+    description: profession
     schema:
       type: string
+  - name: specialties
+    in: query
+    description: specialties
+    schema:
+      type: array
+      items:
+        type: string
   - name: sortOrder
     in: query
     description: asc or desc

openapi/paths/user/specialties/index.yaml

@@ -0,0 +1,23 @@
+get:
+  tags:
+    - User
+  operationId: usersSpecialties
+  summary: GET Get all users specialties with total count
+  description: This endpoint get all users
+  responses:
+    "200":
+      description: "Response"
+      content:
+        application/json:
+          schema:
+            $ref: "./response.yaml"
+    "400":
+      $ref: "../../../responses/bad.yaml"
+    "401":
+      $ref: "../../../responses/unauthorized.yaml"
+    "403":
+      $ref: "../../../responses/forbidden.yaml"
+    "404":
+      $ref: "../../../responses/not-found.yaml"
+
+  security: []

openapi/paths/user/specialties/response.yaml

@@ -0,0 +1,13 @@
+type: object
+properties:
+  success:
+    type: boolean
+    example: true
+  payload:
+    type: object
+    additionalProperties:
+      type: number
+
+required:
+  - success
+  - payload

src/functions/user.function.ts

@@ -4,6 +4,7 @@ import { app } from "@azure/functions";
 import { UserControllerGet } from "./user/controllers/user/get";
 import { UserControllerList } from "./user/controllers/user/list";
 import { UserControllerProfessions } from "./user/controllers/user/professions";
+import { UserControllerSpecialties } from "./user/controllers/user/specialties";
 import { UserControllerUsernameTaken } from "./user/controllers/user/username-taken";
 
 app.http("userGet", {
@@ -33,3 +34,10 @@ app.http("usersProfessions", {
   route: "users/professions",
   handler: UserControllerProfessions,
 });
+
+app.http("usersSpecialties", {
+  methods: ["GET"],
+  authLevel: "anonymous",
+  route: "users/specialties",
+  handler: UserControllerSpecialties,
+});

src/functions/user/controllers/products/list-by-schedule.ts

@@ -2,7 +2,7 @@ import { z } from "zod";
 import { _ } from "~/library/handler";
 
 import { CustomerProductsServiceList } from "~/functions/customer/services/product/list";
-import { UserServiceGetCustomerId } from "~/functions/user";
+import { UserServiceGetCustomerId } from "../../services/user/get-customer-id";
 
 export type UserProductsControllerListByScheduleRequest = {
   query: z.infer<typeof UserProductsControllerListByScheduleSchema>;

src/functions/user/controllers/schedule/get-by-product.ts

@@ -2,7 +2,7 @@ import { z } from "zod";
 
 import { _ } from "~/library/handler";
 import { UserScheduleServiceGetByProductId as UserScheduleServiceGetByProduct } from "../../services/schedule/get-by-product";
-import { UserServiceGetCustomerId } from "../../services/user";
+import { UserServiceGetCustomerId } from "../../services/user/get-customer-id";
 
 export type UserScheduleControllerGetByProductRequest = {
   query: z.infer<typeof UserScheduleControllerGetByProductQuerySchema>;

src/functions/user/controllers/schedule/locations-list.ts

@@ -2,7 +2,7 @@ import { z } from "zod";
 
 import { _ } from "~/library/handler";
 import { UserScheduleServiceLocationsList } from "../../services/schedule/locations-list";
-import { UserServiceGet } from "../../services/user";
+import { UserServiceGet } from "../../services/user/get";
 
 export type UserScheduleControllerLocationsListRequest = {
   query: z.infer<typeof UserScheduleControllerLocationsListQuerySchema>;

src/functions/user/controllers/user/get.ts

@@ -1,7 +1,6 @@
 import { z } from "zod";
 import { _ } from "~/library/handler";
-
-import { UserServiceGet } from "../../services/user";
+import { UserServiceGet } from "../../services/user/get";
 
 export type UserControllerGetRequest = {
   query: z.infer<typeof UserServiceGetSchema>;

src/functions/user/controllers/user/list.ts

@@ -2,7 +2,7 @@ import { _ } from "~/library/handler";
 
 import { z } from "zod";
 import { NumberOrStringType } from "~/library/zod";
-import { UserServiceList } from "../../services/user";
+import { UserServiceList } from "../../services/user/list";
 
 export type UserControllerListRequest = {
   query: z.infer<typeof UserControllerListSchema>;
@@ -17,6 +17,7 @@ export const UserControllerListSchema = z.object({
   nextCursor: z.string().optional(),
   limit: NumberOrStringType.optional(),
   profession: z.string().optional(),
+  specialties: z.array(z.string()).optional(),
   sortOrder: z.nativeEnum(SortOrder).optional(),
 });
 
@@ -27,6 +28,6 @@ export type UserControllerListResponse = Awaited<
 export const UserControllerList = _(
   async ({ query }: UserControllerListRequest) => {
     const validateData = UserControllerListSchema.parse(query);
-    return await UserServiceList(validateData);
+    return UserServiceList(validateData);
   }
 );

src/functions/user/controllers/user/professions.ts

@@ -1,6 +1,5 @@
 import { _ } from "~/library/handler";
-
-import { UserServiceProfessions } from "../../services/user";
+import { UserServiceProfessions } from "../../services/user/professions";
 
 export type UserControllerProfessionsResponse = Awaited<
   ReturnType<typeof UserServiceProfessions>

src/functions/user/controllers/user/specialties.ts

@@ -0,0 +1,23 @@
+import { _ } from "~/library/handler";
+
+import { z } from "zod";
+import { UserServiceSpecialties } from "../../services/user/specialties";
+
+export type UserControllerSpecialtiesRequest = {
+  query: z.infer<typeof UserControllerSpecialtiesSchema>;
+};
+
+export const UserControllerSpecialtiesSchema = z.object({
+  profession: z.string(),
+});
+
+export type UserControllerSpecialtiesResponse = Awaited<
+  ReturnType<typeof UserServiceSpecialties>
+>;
+
+export const UserControllerSpecialties = _(
+  async ({ query }: UserControllerSpecialtiesRequest) => {
+    const validateData = UserControllerSpecialtiesSchema.parse(query);
+    return UserServiceSpecialties(validateData);
+  }
+);

src/functions/user/controllers/user/username-taken.ts

@@ -1,7 +1,6 @@
 import { z } from "zod";
 import { _ } from "~/library/handler";
-
-import { UserServiceUsernameTaken } from "../../services/user";
+import { UserServiceUsernameTaken } from "../../services/user/username-taken";
 
 export type UserControllerUsernameTakenRequest = {
   query: z.infer<typeof UserControllerUsernameTakenSchema>;

src/functions/user/index.ts

@@ -1,4 +1,3 @@
-export * from "./services/user";
 export * from "./user.model";
 export * from "./user.schema";
 export * from "./user.types";

src/functions/user/services/availability/generate.ts

@@ -8,7 +8,8 @@ import { findStartAndEndDate } from "~/library/availability/find-start-end-date-
 import { generateAvailability } from "~/library/availability/generate-availability";
 import { removeBookedSlots } from "~/library/availability/remove-booked-slots";
 import { StringOrObjectId } from "~/library/zod";
-import { UserServiceGetCustomerId } from "../user";
+
+import { UserServiceGetCustomerId } from "../user/get-customer-id";
 import { UserAvailabilityServiceGetOrders } from "./get-orders";
 
 export type UserAvailabilityServiceGenerateProps = {

src/functions/user/services/location.ts

@@ -1,7 +1,7 @@
 import { LocationModel } from "~/functions/location";
 import { NotFoundError } from "~/library/handler";
 import { StringOrObjectId } from "~/library/zod";
-import { UserServiceGet } from "./user";
+import { UserServiceGet } from "./user/get";
 
 export const UserLocationServiceGetOne = async ({
   username,

src/functions/user/services/products/get.ts

@@ -1,6 +1,6 @@
 import { ScheduleModel } from "~/functions/schedule";
 import { NotFoundError } from "~/library/handler";
-import { UserServiceGetCustomerId } from "../user";
+import { UserServiceGetCustomerId } from "../user/get-customer-id";
 
 export type UserProductServiceGetFilter = {
   username: string;

src/functions/user/services/schedule/get-by-location.ts

@@ -1,9 +1,10 @@
 import mongoose from "mongoose";
 import { ILocationDocument, Location } from "~/functions/location";
 import { Schedule, ScheduleModel, ScheduleProduct } from "~/functions/schedule";
-import { UserServiceGetCustomerId } from "~/functions/user";
+
 import { NotFoundError } from "~/library/handler";
 import { StringOrObjectId } from "~/library/zod";
+import { UserServiceGetCustomerId } from "../user/get-customer-id";
 
 export type UserScheduleServiceGetByLocationProps = {
   username: string;