Merge branch 'master' of https://gitlab.com/grassrootseconomics/cic-internal-integration

Refactors language transitions to fix language changes errors.

See merge request grassrootseconomics/cic-internal-integration!332

.drone.yml

@@ -0,0 +1,29 @@
+kind: pipeline
+name: default
+
+steps:
+  - name: fetch
+    image: alpine/git
+    commands:
+      - git fetch --tags
+
+  - name: build
+    image: kamikazechaser/docker-build:latest
+    environment:
+      DOCKER_BUILDKIT: 1
+      COMPOSE_DOCKER_CLI_BUILD: 1
+      IMAGE_BASE_URL: docker.grassecon.net/cic-stack
+      PASSWORD:
+        from_secret: docker_password
+    volumes:
+      - name: docker_sock
+        path: /var/run/docker.sock
+    commands:
+      - echo $PASSWORD | docker login docker.grassecon.net --username ci --password-stdin
+      - export TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
+      - docker-compose -f docker-compose.build.yml build --progress plain
+      - docker-compose -f docker-compose.build.yml push
+volumes:
+  - name: docker_sock
+    host:
+      path: /var/run/docker.sock

apps/cic-ussd/transitions/language_setting_transitions.json

@@ -87,8 +87,8 @@
   {
     "trigger": "scan_data",
     "source": "select_preferred_language",
-    "dest": "account_creation_prompt",
-    "after": "cic_ussd.state_machine.logic.account.process_account_creation",
+    "dest": "complete",
+    "after": "cic_ussd.state_machine.logic.language.change_preferred_language",
     "conditions": "cic_ussd.state_machine.logic.language.is_valid_language_selection"
   },
   {
@@ -101,7 +101,7 @@
   {
     "trigger": "scan_data",
     "source": "select_preferred_language",
-    "dest": "initial_middle_language_set",
+    "dest": "middle_language_set",
     "conditions": "cic_ussd.state_machine.logic.menu.menu_eleven_selected",
     "unless": "cic_ussd.state_machine.logic.language.is_valid_language_selection"
   },
@@ -113,8 +113,8 @@
   {
     "trigger": "scan_data",
     "source": "middle_language_set",
-    "dest": "account_creation_prompt",
-    "after": "cic_ussd.state_machine.logic.account.process_account_creation",
+    "dest": "complete",
+    "after": "cic_ussd.state_machine.logic.language.change_preferred_language",
     "conditions": "cic_ussd.state_machine.logic.language.is_valid_language_selection"
   },
   {
@@ -134,7 +134,7 @@
   {
     "trigger": "scan_data",
     "source": "middle_language_set",
-    "dest": "select_preferred_langauge",
+    "dest": "select_preferred_language",
     "conditions": "cic_ussd.state_machine.logic.menu.menu_twenty_two_selected",
     "unless": "cic_ussd.state_machine.logic.language.is_valid_language_selection"
   },
@@ -146,8 +146,8 @@
   {
     "trigger": "scan_data",
     "source": "last_language_set",
-    "dest": "account_creation_prompt",
-    "after": "cic_ussd.state_machine.logic.account.process_account_creation",
+    "dest": "complete",
+    "after": "cic_ussd.state_machine.logic.language.change_preferred_language",
     "conditions": "cic_ussd.state_machine.logic.language.is_valid_language_selection"
   },
   {

docker-compose.build.yml

@@ -1,52 +1,52 @@
-version: '3.2'
+version: "3.2"
 
 services:
   cic-cache:
-    image: ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-cache:${TAG:-latest}
+    image: docker.grassecon.net/cic-stack/cic-cache:${TAG:-latest}
     build:
       context: apps/cic-cache
       dockerfile: docker/Dockerfile
       cache_from:
-        - ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-cache:latest
+        - docker.grassecon.net/cic-stack/cic-cache:${TAG:-latest}
   cic-eth:
-    image: ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-eth:${TAG:-latest}
+    image: docker.grassecon.net/cic-stack/cic-eth:${TAG:-latest}
     build:
       context: apps/cic-eth
       dockerfile: docker/Dockerfile
       cache_from:
-        - ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-eth:latest
+        - docker.grassecon.net/cic-stack/cic-eth:${TAG:-latest}
   cic-meta:
-    image: ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-meta:${TAG:-latest}
+    image: docker.grassecon.net/cic-stack/cic-meta:${TAG:-latest}
     build:
       context: apps/cic-meta
       dockerfile: docker/Dockerfile
       cache_from:
-        - ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-meta:latest
+        - docker.grassecon.net/cic-stack/cic-meta:${TAG:-latest}
   cic-notify:
-    image: ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-notify:${TAG:-latest}
+    image: docker.grassecon.net/cic-stack/cic-notify:${TAG:-latest}
     build:
       context: apps/cic-notify
       dockerfile: docker/Dockerfile
       cache_from:
-        - ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-notify:latest
+        - docker.grassecon.net/cic-stack/cic-notify:${TAG:-latest}
   funga-eth:
-    image: ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/funga-eth:${TAG:-latest}
+    image: docker.grassecon.net/cic-stack/funga-eth:${TAG:-latest}
     build:
       context: apps/cic-signer
       dockerfile: Dockerfile
       cache_from:
-        - ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/funga-eth:latest
+        - docker.grassecon.net/cic-stack/funga-eth:${TAG:-latest}
   cic-ussd:
-    image: ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-ussd:${TAG:-latest}
+    image: docker.grassecon.net/cic-stack/cic-ussd:${TAG:-latest}
     build:
       context: apps/cic-ussd
       dockerfile: docker/Dockerfile
       cache_from:
-        - ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-ussd:latest
+        - docker.grassecon.net/cic-stack/cic-ussd:${TAG:-latest}
   cic-contract-bootstrap:
-    image: ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-contract-bootstrap:${TAG:-latest}
+    image: docker.grassecon.net/cic-stack/cic-contract-bootstrap:${TAG:-latest}
     build:
       context: apps/contract-migration
       dockerfile: docker/Dockerfile
       cache_from:
-        - ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-ussd:latest
+        - docker.grassecon.net/cic-stack/cic-ussd:${TAG:-latest}