Merge pull request #54 from yalla-coop/staging

Production release of producer bugfixes

Author: ajluker

.github/workflows/deploy-main-hodmedod.yml

@@ -0,0 +1,17 @@
+name: Create and publish a Docker image
+
+on:
+  push:
+    branches: ["main"]
+
+jobs:
+  build-and-push-image:
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
+    uses: ./.github/workflows/build-and-deploy-prod.yml
+    with:
+      jelastic_env: fdc-producer
+    secrets: inherit

.github/workflows/deploy-main.yml

@@ -11,6 +11,7 @@
     "generate": "shopify app generate",
     "deploy": "shopify app deploy",
     "test": "jest --runInBand --detectOpenHandles --forceExit web/${0}",
+    "acceptance-test": "jest --runInBand --detectOpenHandles --forceExit acceptance-tests/",
     "build:db": "node ./web/database/build.js"
   },
   "dependencies": {

package.json

@@ -14,7 +14,7 @@ const toProduct = (product) => ({
 async function findProducts(client) {
   const response = await client.request(`
     {
-      products(first: 250) {
+      products(first: 250, sortKey: TITLE) {
         edges {
           node {
             id

web/api-modules/products/use-cases/get-products.js

@@ -2,6 +2,7 @@ import { throwError } from '../utils/index.js';
 import loadConnectorWithResources from './index.js';
 import loadProductTypes from './mappedProductTypes.js';
 import config from '../config.js';
+import currencyMeasureFor from '../utils/currencyMeasureFor.js';
 
 const createQuantitativeValue = (connector, value, unit) =>
   connector.createQuantity({
@@ -45,7 +46,6 @@ async function createVariantSuppliedProduct(
   try {
     const connector = await loadConnectorWithResources();
     const kilogram = connector.MEASURES.UNIT.QUANTITYUNIT.KILOGRAM;
-    const euro = connector.MEASURES.UNIT.CURRENCYUNIT.EURO;
 
     const semanticBase = `${config.PRODUCER_SHOP_URL}api/dfc/Enterprises/${enterpriseName}/SuppliedProducts/${variant.id}`;
 
@@ -55,7 +55,12 @@ async function createVariantSuppliedProduct(
       kilogram
     );
     const hasVat = variant.taxable ? 1.0 : 0.0; // TODO check how the vat rate can be added
-    const price = createPrice(connector, variant.price, euro, hasVat);
+    const price = createPrice(
+      connector,
+      variant.price,
+      currencyMeasureFor(connector, variant.currencyCode),
+      hasVat
+    );
     const offer = createOffer(connector, semanticBase, price);
     const inventoryQuantity =
       variant.inventoryPolicy === 'CONTINUE' ? -1 : variant.inventoryQuantity;