[ DO NOT MERGE ] DEVELOP to MAIN

.github/workflows/function-deploy-cela-dev.yml

@@ -0,0 +1,71 @@
+
+name: functions deploy
+
+on:
+  push:
+    branches: [ cela-dev ]
+    paths:
+      - 'webhooks/**'
+      - '.github/workflows/function-deploy-cela-dev.yml'
+
+jobs:
+  deploy:
+    name: "Deploy Firebase functions"
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [16.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    env:
+      working-directory: './webhooks/functions'
+      project-id: 'cela-2'
+    defaults:
+      run:
+        working-directory: './webhooks/functions'
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+
+      - name : GITHUB CONTEXT
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: echo "$GITHUB_CONTEXT"
+
+      - name: Install node ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install Dependencies
+        run: npm ci --no-audit
+        working-directory: ${{ env.working-directory }}
+
+      - name: test
+        run: npm test
+        working-directory: ${{ env.working-directory }}
+
+      - name: lint
+        run: npm run lint
+        working-directory: ${{ env.working-directory }}
+
+      - name: build
+        run: npm run build
+        working-directory: ${{ env.working-directory }}
+
+      - name: set commit name to function config
+        uses: w9jds/firebase-action@master
+        with:
+          args: functions:config:set debug.message=\"${{ github.event.head_commit.message }}\" --project ${{ env.project-id }}
+        env:
+          FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
+          PROJECT_PATH: './webhooks'
+
+      - name: Deploy to Firebase
+        uses: w9jds/firebase-action@master
+        with:
+          args: deploy --only \"functions:ActionsOnGoogleFulfillment\" --project ${{ env.project-id }} --message \"${{ github.event.head_commit.message }}\"
+        env:
+          FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
+          PROJECT_PATH: './webhooks'

.github/workflows/functions-avh-dev.yml

@@ -0,0 +1,97 @@
+
+name: functions deploy
+
+on:
+  push:
+    branches: [ avh-dev ]
+    paths:
+      - 'webhooks/**'
+      - '.github/workflows/functions-avh-dev.yml'
+
+jobs:
+  deploy:
+    name: "Deploy Firebase functions"
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [16.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    env:
+      working-directory: './webhooks/functions'
+      project-id: 'valentin-5'
+    defaults:
+      run:
+        working-directory: './webhooks/functions'
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+
+      - name : GITHUB CONTEXT
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: echo "$GITHUB_CONTEXT"
+
+      - name: Install node ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install Dependencies
+        run: npm ci --no-audit
+        working-directory: ${{ env.working-directory }}
+
+      - name: test
+        run: npm test
+        working-directory: ${{ env.working-directory }}
+
+      - name: lint
+        run: npm run lint
+        working-directory: ${{ env.working-directory }}
+
+      - name: build
+        run: npm run build
+        working-directory: ${{ env.working-directory }}
+
+      - name: set commit name to function config
+        uses: w9jds/firebase-action@master
+        with:
+          args: functions:config:set debug.message=\"${{ github.event.head_commit.message }}\" --project ${{ env.project-id }}
+        env:
+          FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
+          PROJECT_PATH: './webhooks'
+
+      - name: Deploy to Firebase
+        uses: w9jds/firebase-action@master
+        with:
+          args: deploy --only \"functions:ActionsOnGoogleFulfillment\" --project ${{ env.project-id }} --message \"${{ github.event.head_commit.message }}\"
+        env:
+          FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
+          PROJECT_PATH: './webhooks'
+
+  sdk-test-dev:
+    name: "Test sdk DEV"
+    needs: deploy
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [14.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+    defaults:
+      run:
+        working-directory: './test/dev'
+
+    steps:
+
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
+
+      - name: save service_account
+        run: echo $SECRET >> service_account.json
+        env:
+          SECRET : ${{ secrets.SERVICE_ACCOUNT_VALENTIN5 }}
+      - run: npm install
+      - run: npm test

.github/workflows/functions.yml → .github/workflows/functions-edrlab-dev.yml

@@ -3,10 +3,10 @@ name: functions deploy
 
 on:
   push:
-    branches: [ main ]
+    branches: [ develop ]
     paths:
-      - 'functions/**'
-      - '.github/workflows/functions.yml'
+      - 'webhooks/**'
+      - '.github/workflows/functions-edrlab-dev.yml'
 
 jobs:
   deploy:
@@ -18,10 +18,11 @@ jobs:
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     env:
-      working-directory: './functions/functions'
+      working-directory: './webhooks/functions'
+      project-id: 'edrlab-1'
     defaults:
       run:
-        working-directory: './functions/functions'
+        working-directory: './webhooks/functions'
 
     steps:
       - name: Checkout repo
@@ -40,19 +41,31 @@ jobs:
       - name: Install Dependencies
         run: npm ci --no-audit
         working-directory: ${{ env.working-directory }}
+
+      - name: test
+        run: npm test
+        working-directory: ${{ env.working-directory }}
+
+      - name: lint
+        run: npm run lint
+        working-directory: ${{ env.working-directory }}
+
+      - name: build
+        run: npm run build
+        working-directory: ${{ env.working-directory }}
 
       - name: set commit name to function config
         uses: w9jds/firebase-action@master
         with:
-          args: functions:config:set debug.message=\"${{ github.event.head_commit.message }}\"
+          args: functions:config:set debug.message=\"${{ github.event.head_commit.message }}\" --project ${{ env.project-id }}
         env:
           FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
-          PROJECT_PATH: './functions'
+          PROJECT_PATH: './webhooks'
 
       - name: Deploy to Firebase
         uses: w9jds/firebase-action@master
         with:
-          args: deploy --only \"functions:ActionsOnGoogleFulfillment\" --message \"${{ github.event.head_commit.message }}\"
+          args: deploy --only \"functions:ActionsOnGoogleFulfillment\" --project ${{ env.project-id }} --message \"${{ github.event.head_commit.message }}\"
         env:
           FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
-          PROJECT_PATH: './functions'
+          PROJECT_PATH: './webhooks'

.github/workflows/webhooks-test.yml

@@ -0,0 +1,32 @@
+
+name: webhooks unitary tests
+
+on:
+  push:
+    branches: [ develop, avh-prod, avh-dev, cela-prod, cela-dev ]
+    #    paths:
+  pull_request:
+    branches: [ develop, avh-prod, avh-dev, cela-prod, cela-dev ]
+
+jobs:
+  sdk-test-prod:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: [12, 14, 16]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+    defaults:
+      run:
+        working-directory: './webhooks/functions'
+    name: Node ${{ matrix.node }} webhooks unitary tests
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
+      - run: node -v
+      - run: npm -v
+      - run: find . -type f
+      - run: npm ci
+      - run: npm test
+      - run: npm run lint

.gitignore

@@ -4,3 +4,7 @@
 
 node_modules
 service_account.json
+
+.nyc_output/
+firebase-debug.log
+ui-debug.log

README.md

@@ -1,7 +1,11 @@
 # lis-mon-livre
 
+> develop branch
 
+  - https://console.firebase.google.com/u/1/project/edrlab-1/firestore/data
+  - https://console.actions.google.com/u/1/project/edrlab-1/overview
+  - https://console.cloud.google.com/logs/query?referrer=search&authuser=1&project=edrlab-1
 
-## gactions
+## gactions sdk
 
-`cd sdk && gactions pull --force --clean --project-id valentin-4`
+`cd sdk && gactions pull --force --clean --project-id valentin-5`

flowchart.drawio

@@ -0,0 +1 @@
+<mxfile host="Electron" modified="2022-02-01T13:17:56.622Z" agent="5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/15.3.5 Chrome/94.0.4606.51 Electron/15.0.0 Safari/537.36" etag="2o0J2n3do_rvHPBzxqvV" version="15.3.5" type="device"><diagram id="5DJ4ssX4GwvDWGdRNTQ9" name="Page-1">7VlLc9s2EP4tOWimPUgjkqIkH23ZTtO6qTtuJ/EpA5EgCRsCWAC0pPz67ILgS5TcOGM7yrQXkthdLMDdbx8gB8FitXmrSJ79LmPKB/443gyC84Hv+8HEhxtStiUl8KdhSUkVi0ua1xBu2GfqiGNHLVhMdUfQSMkNy7vESApBI9OhEaXkuiuWSN5dNScp7RFuIsL71A8sNllJnfuzhv4LZWlWrexNT0rOilTC7k10RmK5bpGCi0GwUFKa8mm1WVCO1qvsUs67PMCtN6aoMF8zIZn/oT8ltx/Hp3/evRey+FVd3w2dlgfCC/fCA3/KQd+ZzomA5xSfKxoo30f+RtEPlEdyRa1HB7j58VYWCm6Li6tTuF2xpSJq+8byyulLtauwofyFSpKC8y3cqbiT20YjKWIml1LeaxyIGK9RRLVuRHKqtBQELaYpBygxCTtdlAJwXTNrTUFpXO2YM3Hf2zXolYUwo/4GP8iCx7U+zu7rV4/xovEiECGXB41ocWS2FTgVrBRT9K8H7HXGDL3JSYTcNcQj0DKz4o6dkSgrFH2L9PMJEHLJhKHq4gEAhFEyrpdog6pCCFWGblokB7K3FFxoFNracScO71XET9143YRPUEV31g6dwBGJC9m0Vt2gGh4csJ8A8rBnOBpDkLuhkAJuZ1GhHmpTNoZFo0hlMpkiOK6kzJ3IHTVm6/IVKcCNHWPTDTMfcfoodKPbFud84zTbwbYaCHjZ1iQc3rZ5zTQ7aubFp5jpYChzKjDKDFHG7c2blCLtoQbERvSaKgYGpgoxw0QK3DkwYW5KzQHmQXyUKh9xgisEpfZH5CalHHroUbQpyolhD900/ezQ8Xv58QZt2wMUJPccH8EyhHPKZarICmOsMuMu77ph/FvgJmxDa/e9YiAHs24kz/uB7Pl7Ann6UnEcHEWxWpLovkrcTyhYCynA76ZA1EqhUejWFoKMPKBaXWBBquoXlhYatwpYWVXq6hXhzmy1aFUyYk0ok2ZaQh6kAnDhtrH6vXlKVdKUqCizTZPdApJyGrGERU4frlaWV0iQqqyWWM6YjiTgDNl2Gwaypj8OEJAssjXYTlt3ls4VTewcm70w5ZRruoUSJVfNi9m3yShPfvRqGYY75TL87uVy/h3LZatYNqXzv1guJ19ZLr3nLpd2KhiIbFsCFvy6pfkaCQ2KvZOwg+KqBjQwLDU2oKy39u049Sa9evD3+6t373+7ON+L4CuyhNNpB3eEsxQQcB5RUZZiDFwGp79Tx1ixOEYdZ4pq9pksrb5xlQ6sdcKzQXi+19ePRVcvQ9RHWLdI55S4L3OMR5P5zO+a3VXIpzm78WYlIpNEU9NLJM/hs/Fe17xKcvH+Ty5PTC7BUSSX6bxbIv1Z+ArJpd9sHn1qqYLrOXLLeD6fdaw+9GbHnlz69eAd9MJTssLeTix13urts6Djxek/BX6HO1tBSDDwDrbz43wD16Ff3u1c8EEc2whsBBzfa4stpYqpGi6lMdC1WmGb2ip+JDl0wJau0uVPwcQ2ztg+dx5/rickUphhQlYMTgd2Wv1eAz8IbB6hqcQFCtZj1Ro1EXqoIZskzRtX7XJ9wijts25OCFdwFrHteI8DZ2FT6Fb/jVY91H1ncrUE4aPpvIOdzhv82T/fTvd13uFLdd7e4c+xeBLK4ITUQWtmDH4GP8VV/Utiv1nqoRTDVMqU01HKTFYsR0wiV2sGtQhgBLkArKTtOXQoZEzvwIWXwWg2gve6jDhIUqS05T5lcO7kVH0qAD4je7Eu8wOHG16CRFeI2EHXEe+0wi45CF0AlOliVBsl7+mijOKqa0kY5zukry8C+4Ki2/m82vfbnXLref24mOyNi9mLxUW4Jy6OPb94YfdMFM76dpzvMeP8xaw47VlxS3W/n+Gc5foQJr+DIYf1z0BnyemeXwr7LPlyeJz1LCnkD2DIk1ezIwybP5tlf9f8IA4uvgA=</diagram></mxfile>

sdk/custom/global/actions.intent.CANCEL.yaml

@@ -0,0 +1,3 @@
+handler:
+  webhookHandler: cancel
+transitionToScene: actions.scene.END_CONVERSATION

sdk/custom/global/actions.intent.MAIN.yaml

@@ -0,0 +1,2 @@
+handler:
+  webhookHandler: main

sdk/custom/global/actions.intent.MEDIA_STATUS_STOPPED.yaml

@@ -0,0 +1 @@
+transitionToScene: actions.scene.END_CONVERSATION

sdk/custom/global/actions.intent.NO_INPUT_1.yaml

@@ -0,0 +1,2 @@
+handler:
+  webhookHandler: silence_1

sdk/custom/global/actions.intent.NO_INPUT_2.yaml

@@ -0,0 +1,2 @@
+handler:
+  webhookHandler: silence_2

sdk/custom/global/actions.intent.NO_INPUT_FINAL.yaml

@@ -0,0 +1,3 @@
+handler:
+  webhookHandler: silence_end
+transitionToScene: actions.scene.END_CONVERSATION

sdk/custom/global/actions.intent.NO_MATCH_1.yaml

@@ -0,0 +1,2 @@
+handler:
+  webhookHandler: fallback_1

sdk/custom/global/actions.intent.NO_MATCH_2.yaml

@@ -0,0 +1,2 @@
+handler:
+  webhookHandler: fallback_2

sdk/custom/global/actions.intent.NO_MATCH_FINAL.yaml

@@ -0,0 +1,3 @@
+handler:
+  webhookHandler: fallback_end
+transitionToScene: actions.scene.END_CONVERSATION

sdk/custom/intents/another_one.yaml

@@ -0,0 +1,5 @@
+trainingPhrases:
+- prochain
+- suivant
+- page suivante
+- un autre

sdk/custom/intents/bookshelf.yaml

@@ -0,0 +1,10 @@
+trainingPhrases:
+- voir mon étagère
+- consulter ma liste personnelle
+- voir ma liste personnelle
+- liste personnelle
+- consulter mon étagère
+- étagère
+- mon étagère
+- bibliothèque
+- ma bibliothèque

sdk/custom/intents/by_genre.yaml

@@ -0,0 +1,4 @@
+trainingPhrases:
+- par genre
+- genre
+- je préfère par genre

sdk/custom/intents/by_theme.yaml

@@ -0,0 +1,6 @@
+trainingPhrases:
+- je veux par thème
+- je t'aime
+- par thème
+- thème
+- je préfère par thème

sdk/custom/intents/collections.yaml

@@ -0,0 +1,6 @@
+trainingPhrases:
+- recommandations
+- collections
+- navigue dans les collections
+- sélections
+- navigue dans les sélections

sdk/custom/intents/current_book.yaml

@@ -0,0 +1,8 @@
+trainingPhrases:
+- Reprendre ma lecture
+- Reprends ma lecture
+- Reprends
+- Reprends le dernier livre
+- Reprends la lecture
+- Reprendre la lecture
+- Reprendre

sdk/custom/intents/en/another_one.yaml

@@ -0,0 +1,5 @@
+trainingPhrases:
+- the next one
+- next
+- next page
+- another one

sdk/custom/intents/en/bookshelf.yaml

@@ -0,0 +1,7 @@
+trainingPhrases:
+- personal list
+- browse my bookshelf
+- book shelves
+- book shelf
+- my bookshelf
+- bookshelf

sdk/custom/intents/en/by_genre.yaml

@@ -0,0 +1,6 @@
+trainingPhrases:
+- by genre please
+- genre
+- I prefer by genre
+- I prefer collections by genre
+- by genre

sdk/custom/intents/en/by_theme.yaml

@@ -0,0 +1,6 @@
+trainingPhrases:
+- by theme please
+- theme
+- I prefer by theme
+- I prefer to get a book selection by theme
+- by theme

sdk/custom/intents/en/collections.yaml

@@ -0,0 +1,4 @@
+trainingPhrases:
+- recommendations
+- collections
+- Browse collections