@zodic/shared 0.0.407 → 0.0.409

package/app/api/index.ts

@@ -719,9 +719,7 @@ export const Api = (env: BackendBindings) => ({
           },
           config: {
             webhook_config: {
-              endpoint:
-                'https://zodic-backend.lucdelbel.workers.dev/api/webhook/faceswap',
-              // secret: '',
+              endpoint: `${env.API_BASE_URL}/api/webhook/faceswap`,
             },
           },
         });

package/app/services/ConceptService.ts

@@ -1,8 +1,4 @@
-import {
-  KVNamespaceListKey,
-  KVNamespaceListResult,
-} from '@cloudflare/workers-types';
-import { and, eq, inArray, isNull, sql } from 'drizzle-orm';
+import { and, eq, inArray, isNull } from 'drizzle-orm';
 import { drizzle } from 'drizzle-orm/d1';
 import { inject, injectable } from 'inversify';
 import 'reflect-metadata';
@@ -27,14 +23,9 @@ import {
   ControlNetConfig,
   DescriptionTemplateRow,
 } from '../../types';
-import {
-  KVConcept,
-  sizes,
-  StructuredConceptContent,
-} from '../../types/scopes/legacy';
+import { sizes, StructuredConceptContent } from '../../types/scopes/legacy';
 import { astroPrompts } from '../../utils/astroPrompts';
 import { leonardoInitImages } from '../../utils/initImages';
-import { buildConceptKVKey } from '../../utils/KVKeysBuilders';
 import { AppContext } from '../base/AppContext';
 
 @injectable()
@@ -902,7 +893,6 @@ export class ConceptService {
    * Fetch and initialize a KVConcept object if not present.
    */
 
-
   async generateAstroReportContent(
     params:
       | AstroReportParams
@@ -1662,7 +1652,7 @@ export class ConceptService {
 
   async queueUserConcepts(userId: string): Promise<void> {
     console.log(
-      `[${new Date().toISOString()}] 🔧 Starting queueing of user concepts for user ${userId}`
+      `[${new Date().toISOString()}] 🔧 Starting queueing of user concepts data for user ${userId}`
     );
 
     const lang = await this.getLang(userId);
@@ -1671,7 +1661,7 @@ export class ConceptService {
     );
 
     const db = this.context.drizzle();
-    const { userConcepts } = schema;
+    const { conceptsData } = schema;
 
     // Fetch all available concepts
     const concepts = await this.getAllConcepts();
@@ -1726,52 +1716,55 @@ export class ConceptService {
         `[${new Date().toISOString()}] 🔗 Generated combination string for ${conceptSlug}: ${combinationString}`
       );
 
-      // Create or retrieve conceptCombination
-      const conceptCombinationId = await this.getOrCreateConceptCombination(
-        conceptId,
-        combinationString,
-        planets,
-        userSigns
-      );
-      console.log(
-        `[${new Date().toISOString()}] ✅ Created/Retrieved concept combination ID for ${conceptSlug}: ${conceptCombinationId}`
-      );
-
-      // Check if a userConcept exists; create if not
-      const existingUserConcept = await db
-        .select({ conceptCombinationId: userConcepts.conceptCombinationId })
-        .from(userConcepts)
+      // Check conceptData completion
+      const [conceptDataEntry] = await db
+        .select({
+          name: conceptsData.name,
+          description: conceptsData.description,
+          content: conceptsData.content,
+          poem: conceptsData.poem,
+          postImages: conceptsData.postImages,
+          framedImages: conceptsData.framedImages,
+          reelImages: conceptsData.reelImages,
+        })
+        .from(conceptsData)
         .where(
           and(
-            eq(userConcepts.userId, userId),
-            eq(userConcepts.conceptId, conceptId)
+            eq(conceptsData.conceptSlug, conceptSlug),
+            eq(conceptsData.combination, combinationString),
+            eq(conceptsData.language, lang)
           )
         )
         .limit(1)
         .execute();
 
-      if (!existingUserConcept.length) {
-        const userConceptId = uuidv4();
-        await db
-          .insert(userConcepts)
-          .values({
-            id: userConceptId,
-            userId,
-            conceptId,
-            conceptCombinationId,
-            createdAt: sql`CURRENT_TIMESTAMP`,
-            updatedAt: sql`CURRENT_TIMESTAMP`,
-          })
-          .execute();
-        console.log(
-          `[${new Date().toISOString()}] ✅ Inserted new user concept with ID: ${userConceptId} for ${conceptSlug}`
-        );
-      } else {
+      const isComplete = await this.checkConceptCompletion(
+        conceptSlug as Concept,
+        combinationString,
+        lang
+      );
+      console.log(
+        `[${new Date().toISOString()}] ✅ Checked completion status: ${isComplete} for ${conceptSlug}:${combinationString}`
+      );
+
+      if (conceptDataEntry && isComplete) {
         console.log(
-          `[${new Date().toISOString()}] 🔍 Found existing user concept for user ${userId}, concept ${conceptSlug}`
+          `[${new Date().toISOString()}] ✅ Concept data already complete for ${conceptSlug}:${combinationString}, skipping queue`
         );
+        continue; // Skip to the next concept if data is complete
       }
 
+      // Create or retrieve conceptCombination
+      const conceptCombinationId = await this.getOrCreateConceptCombination(
+        conceptId,
+        combinationString,
+        planets,
+        userSigns
+      );
+      console.log(
+        `[${new Date().toISOString()}] ✅ Created/Retrieved concept combination ID for ${conceptSlug}: ${conceptCombinationId}`
+      );
+
       // Queue the generation
       const queuePayload = {
         userId,
@@ -1784,14 +1777,23 @@ export class ConceptService {
         `[${new Date().toISOString()}] ✅ Queue Payload for ${conceptSlug}:`,
         queuePayload
       );
-      await this.context.env.CONCEPT_GENERATION_QUEUE.send(queuePayload);
+
+      try {
+        await this.context.env.CONCEPT_GENERATION_QUEUE.send(queuePayload);
+        console.log(
+          `[${new Date().toISOString()}] ⏳ Queued concept generation for ${conceptSlug}:${combinationString}`
+        );
+      } catch (error) {
+        console.log(
+          `[${new Date().toISOString()}] Failed to queue concept generation for ${conceptSlug}:${combinationString}: Error ${
+            (error as Error).message
+          }`
+        );
+      }
+
       console.log(
-        `[${new Date().toISOString()}] ⏳ Queued concept generation for ${conceptSlug}:${combinationString}`
+        `[${new Date().toISOString()}] ✅ Completed queueing all concepts data for user ${userId}`
       );
     }
-
-    console.log(
-      `[${new Date().toISOString()}] ✅ Completed queueing all concepts for user ${userId}`
-    );
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zodic/shared",
-  "version": "0.0.407",
+  "version": "0.0.409",
   "module": "index.ts",
   "type": "module",
   "publishConfig": {