Task3.0 prepare.1

.github/workflows/main.yml

@@ -22,11 +22,11 @@ jobs:
       - name: Get npm cache directory
         id: npm-cache-dir
         run: |
-          echo "::set-output name=dir::$(npm config get cache)"
+          echo "NPM_DIR=$(npm config get cache)" >> $GITHUB_ENV
       - uses: actions/cache@v3
         id: npm-cache
         with:
-          path: ${{ steps.npm-cache-dir.outputs.dir }}
+          path: ${{ env.NPM_DIR }}
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
@@ -43,11 +43,10 @@ jobs:
         run: |
           # slugify branch ref
           slug=$(echo ${{ github.event.pull_request.head.ref || 'stg' }} | tr '[:upper:]' '[:lower:]' | sed -E 's/[^a-z0-9]+/-/g' | sed -E 's/^-+\|-+$//g')
-          body="$(npm run deploy -- --stage $slug 2>&1)"
-          body="${body//'%'/'%25'}"
-          body="${body//$'\n'/'%0A'}"
-          body="${body//$'\r'/'%0D'}" 
-          echo "::set-output name=result::$body"
+          npm run deploy -- --stage $slug
+          echo 'COMMENT_BODY<<EOF' >> $GITHUB_ENV
+          cat ./.serverless/compose.log >> $GITHUB_ENV
+          echo 'EOF' >> $GITHUB_ENV
       - name: Find Comment
         uses: peter-evans/find-comment@v2
         if: ${{ github.event_name == 'pull_request' }}
@@ -65,5 +64,5 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
             Build output
-            ${{ steps.deploy.outputs.result }}
+            ${{ env.COMMENT_BODY }}
           edit-mode: replace

commons/constants/api-paths.ts

@@ -0,0 +1 @@
+export const PRODUCTS_API_PATH = "products";

services/shop-frontend-app/src/mocks/data.ts → commons/mocks/index.ts

@@ -1,7 +1,7 @@
-import { OrderStatus } from "~/constants/order";
-import { CartItem } from "~/models/CartItem";
-import { Order } from "~/models/Order";
-import { AvailableProduct, Product } from "~/models/Product";
+import { OrderStatus } from "../models/Order";
+import { CartItem } from "../models/CartItem";
+import { Order } from "../models/Order";
+import { AvailableProduct, Product } from "../models/Product";
 
 export const products: Product[] = [
   {
@@ -24,7 +24,7 @@ export const products: Product[] = [
   },
   {
     description: "Short Product Description4",
-    id: "7567ec4b-b10c-48c5-9345-fc73348a80a1",
+    id: "7567ec4b-b10c-48c5-9345-fc73348a80a4",
     price: 15,
     title: "ProductTest",
   },
@@ -36,7 +36,7 @@ export const products: Product[] = [
   },
   {
     description: "Short Product Description7",
-    id: "7567ec4b-b10c-45c5-9345-fc73c48a80a1",
+    id: "7567ec4b-b10c-45c5-9345-fc73c48a80a5",
     price: 15,
     title: "ProductName",
   },

services/shop-frontend-app/src/models/CartItem.ts → commons/models/CartItem.ts

@@ -1,4 +1,4 @@
-import { Product } from "~/models/Product";
+import { Product } from "./Product";
 
 export type CartItem = {
   product: Product;

services/shop-frontend-app/src/models/Order.ts → commons/models/Order.ts

@@ -1,5 +1,15 @@
 import * as Yup from "yup";
-import { OrderStatus } from "~/constants/order";
+
+export enum OrderStatus {
+  Open = "OPEN",
+  Approved = "APPROVED",
+  Confirmed = "CONFIRMED",
+  Sent = "SENT",
+  Completed = "COMPLETED",
+  Cancelled = "CANCELLED",
+}
+
+export const ORDER_STATUS_FLOW = Object.values(OrderStatus);
 
 export const AddressSchema = Yup.object({
   firstName: Yup.string().required().default(""),

commons/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "@guria.dev/aws-js-practitioner-commons",
+  "version": "1.0.0",
+  "engines": {
+    "node": ">=16.0.0"
+  },
+  "dependencies": {
+    "yup": "^0.32.11"
+  }
+}

commons/tsconfig.json

@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "lib": ["ESNext"],
+    "moduleResolution": "node",
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "removeComments": true,
+    "sourceMap": true,
+    "target": "ES2020",
+    "outDir": "lib"
+  },
+  "include": ["serverless.ts", "*.ts", "mocks/*", "models/*", "constants/*"],
+  "exclude": [
+    "node_modules/**/*",
+    ".serverless/**/*"
+  ]
+}