Improve CI/DI

.github/workflows/all-push.yml

@@ -19,7 +19,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          npm install -g pnpm rollup
+          npm install -g pnpm
           pnpm install
 
       - name: Run tests

package.json

@@ -56,5 +56,7 @@
     "typescript": "^5.2.2"
   },
   "packageManager": "[email protected]",
-  "dependencies": {}
+  "dependencies": {
+    "rollup": "^4.12.0"
+  }
 }

packages/shopify/src/bot/flows/info.flow.ts

@@ -8,15 +8,8 @@ export default addKeyword(EVENTS.ACTION)
   .addAction(async (ctx, { state, flowDynamic }) => {
         const runnable = ClassManager.hub().get<RunnableV2>('runnablev2')
         const channel = ClassManager.hub().get('channel')
-        const store = ClassManager.hub().get('storeInformation')
-        let context: string;
-
-        if (store) {
-            context = Object.entries(store).map(s => s.join(': ')).join('\n')
-        }else {
-            context = await channel.getStoreInfo()
-        }
 
+        const context =  await channel.getStoreInfo()        
 
         const textLarge = await runnable.toInfo(ctx.body, context, state)
         const chunks = textLarge.split(/(?<!\d)\.\s+/g)

packages/shopify/src/channels/shopify.ts

@@ -4,6 +4,7 @@ import axios from "axios"
 import { Channel } from "./respository"
 import { Products, ShopDetail } from "../types"
 import { cleanHtml } from "../utils/cleanHtml"
+import { ClassManager } from "../ioc"
 
 
 /**
@@ -38,23 +39,31 @@ class Shopify implements Channel {
 
         try {
             const url = `${this.buildUrl}/shop.json`
-            const { data } = await axios.get<{ shop: ShopDetail }>(url, {
-                headers: {
-                    'Content-Type': 'application/json',
-                    'X-Shopify-Access-Token': this.apiKey,
-                }
-            })
-
-            const info = [
-                `Name: ${data.shop.name}`,
-                `Email: ${data.shop.email}`,
-                `City: ${data.shop.city}`,
-                `Address: ${data.shop.zip}, ${data.shop.city}`,
-                `Domain: ${data.shop.domain}`,
-                `Currency: ${data.shop.currency}`,
-                `Claims and complaints: For claims, complaints, 
-                    and refunds, please leave us an email at the following address ${data.shop.email}`
-            ].join('\n')
+            const store = ClassManager.hub().get('storeInformation')
+
+            let info: string;
+
+            if (!store) {
+                const { data } = await axios.get<{ shop: ShopDetail }>(url, {
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'X-Shopify-Access-Token': this.apiKey,
+                    }
+                })
+
+                info = [
+                    `Name: ${data.shop.name}`,
+                    `Email: ${data.shop.email}`,
+                    `City: ${data.shop.city}`,
+                    `Address: ${data.shop.zip}, ${data.shop.city}`,
+                    `Domain: ${data.shop.domain}`,
+                    `Currency: ${data.shop.currency}`,
+                    `Claims and complaints: For claims, complaints, 
+                        and refunds, please leave us an email at the following address ${data.shop.email}`
+                ].join('\n')
+            }else {
+                info = Object.entries(store).map(s => s.join(': ')).join('\n')
+            }
 
             return info