Merge pull request #169 from jamalsoueidan/add-product-type

add product-type to products

openapi/paths/customer/product/add/body.yaml

@@ -2,6 +2,8 @@ type: object
 properties:
   title:
     type: string
+  productType:
+    type: string
   description:
     type: string
   descriptionHtml:
@@ -31,6 +33,7 @@ properties:
 
 required:
   - title
+  - productType
   - description
   - descriptionHtml
   - scheduleId

openapi/paths/customer/product/update/body.yaml

@@ -4,6 +4,8 @@ properties:
     type: string
   hideFromCombine:
     type: string
+  productType:
+    type: string
   price:
     type: object
     properties:

openapi/paths/openai/product-title/response.yaml

@@ -6,6 +6,13 @@ properties:
   payload:
     type: object
     properties:
+      collection:
+        type: object
+        properties:
+          id:
+            type: string
+          title:
+            type: string
       title:
         type: string
       description:

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

@@ -1,9 +1,9 @@
 import { HttpRequest, InvocationContext } from "@azure/functions";
 
 import {
-  HttpSuccessResponse,
   createContext,
   createHttpRequest,
+  HttpSuccessResponse,
 } from "~/library/jest/azure";
 
 import { createUser } from "~/library/jest/helpers";
@@ -142,6 +142,7 @@ describe("CustomerProductControllerAdd", () => {
       hideFromProfile: true,
       title,
       description: "ok",
+      productType: "test",
       descriptionHtml: "<b>test</b>",
       scheduleId: newSchedule._id,
       locations,

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

@@ -21,6 +21,7 @@ const CustomerProductControllerAddQuerySchema = z.object({
 const CustomerProductControllerAddBodySchema = ScheduleProductZodSchema.pick({
   locations: true,
   price: true,
+  productType: true,
   compareAtPrice: true,
   hideFromCombine: true,
   hideFromProfile: true,

src/functions/customer/orchestrations/product/update/update-product.spec.ts

@@ -244,10 +244,6 @@ describe("CustomerProductUpdateOrchestration", () => {
       `user-${user.username}`,
       `userid-${user.customerId}`,
       `treatments`,
-      `productid-${GidFormat.parse(
-        mockProductUpdate.productUpdate?.product?.id
-      )}`,
-      `product-${product.productHandle}`,
       `scheduleid-${newSchedule._id}`,
       `location_type-${location.locationType}`,
       "active",
@@ -265,6 +261,7 @@ describe("CustomerProductUpdateOrchestration", () => {
       variables: {
         id: mockProductUpdate.productUpdate?.product?.id,
         title: product.title,
+        productType: product.productType,
         descriptionHtml: product.descriptionHtml,
         metafields: [
           {

src/functions/customer/orchestrations/product/update/update-product.ts

@@ -124,6 +124,7 @@ export const updateProduct = async ({
   const variables = {
     title: product.title,
     descriptionHtml: product.descriptionHtml || "",
+    productType: product.productType || "Andet",
     id: `gid://shopify/Product/${product.productId}`,
     metafields: [
       {
@@ -180,8 +181,6 @@ export const updateProduct = async ({
       `user-${user.username}`,
       `userid-${user.customerId}`,
       "treatments",
-      `productid-${product.productId}`,
-      `product-${product.productHandle}`,
       `scheduleid-${schedule._id}`,
     ]
       .concat(tags)

src/functions/customer/services/product/add.spec.ts

@@ -156,6 +156,7 @@ describe("CustomerProductServiceAdd", () => {
       },
       {
         ...productBody,
+        productType: "Andet",
         scheduleId: newSchedule._id,
         title,
       }

src/functions/customer/services/product/add.ts

@@ -15,6 +15,7 @@ export type CustomerProductServiceAdd = {
 
 export type CustomerProductServiceAddBody = Pick<
   ScheduleProduct,
+  | "productType"
   | "description"
   | "descriptionHtml"
   | "locations"
@@ -62,6 +63,7 @@ export const CustomerProductServiceAdd = async (
     productHandle: shopifyProduct.handle,
     productId: shopifyProductId,
     variantId: GidFormat.parse(variant.id),
+    productType: body.productType,
     price: {
       amount: body.price.amount,
       currencyCode: "DKK",

src/functions/openai/services/product-categorize.ts

@@ -57,7 +57,7 @@ Respond with this JSON structure:
           content,
         },
       ],
-      max_tokens: 300,
+      max_tokens: 20000,
       response_format: {
         type: "json_object",
       },

src/functions/openai/services/product-title.ts

@@ -1,10 +1,16 @@
 import OpenAI from "openai";
+import { shopifyAdmin } from "~/library/shopify";
+import { COLLECTIONS } from "./product-categorize";
 
 const openai = new OpenAI({
   apiKey: process.env.OPENAI_API_KEY,
 });
 
 type OpenAIServiceProductTitleReturn = {
+  collection: {
+    id: string;
+    title: string;
+  };
   title: string;
   description: string;
 };
@@ -16,12 +22,35 @@ export const OpenAIServiceProductTitle = async ({
   title: string;
   description?: string;
 }) => {
+  const { data } = await shopifyAdmin().request(COLLECTIONS);
+
+  const onlyRootcollections = data?.collections.nodes.filter(
+    (col: any) => col.ruleSet.rules.length > 1
+  );
+
+  const collectionsContext = JSON.stringify(onlyRootcollections, null, 2);
+
   const response = await openai.chat.completions.create({
     model: "gpt-4o-2024-05-13",
     messages: [
       {
         role: "system",
-        content: `You are an expert in correcting treatment titles and descriptions. Please correct any grammatical errors in title and description. If the description is missing, add a short sentence that encourages customers to buy this treatment, the text should be from the indiviual beauty professional as seller of the treatment. Please responds with title, description json format and keep the language in danish.`,
+        content: `
+You are an expert in correcting treatment titles and descriptions.
+Please correct any grammatical errors in title and description. If the description is missing, add a short sentence that encourages customers to buy this treatment, the text should be from the indiviual beauty professional as seller of the treatment.
+Also figure out the collection the treatment belongs to.
+### Collections
+${collectionsContext}
+
+Respond with this JSON structure, and choose danish language for title and description.
+{
+  "collection": {
+    id: "gid://shopify/Collection/1111",
+    title: "example",
+  },
+  title: "example",
+  description: "example",
+}`,
       },
       {
         role: "user",

src/functions/schedule/schedule.types.ts

@@ -84,6 +84,7 @@ export const ScheduleProductZodSchema = z.object({
   productHandle: z.string(),
   collectionIds: z.array(GidFormat),
   productId: GidFormat,
+  productType: z.string(),
   variantId: GidFormat,
   user: z
     .object({

src/functions/schedule/schemas/product.schema.ts

@@ -59,6 +59,7 @@ export const ProductSchema = new mongoose.Schema<ScheduleProduct>(
       type: String,
       index: true,
     },
+    productType: String,
     productId: {
       type: Number,
       index: true,

src/library/jest/helpers/product.ts

@@ -9,6 +9,7 @@ export const getProductObject = (
 ): ScheduleProduct => ({
   title: "test",
   collectionIds: [],
+  productType: "test",
   productHandle: faker.internet.displayName(),
   productId: faker.number.int({ min: 1, max: 10000000 }),
   scheduleIdMetafieldId: String(faker.number.int({ min: 1, max: 10000000 })),