From 0ee6400d7d9b53ad1d9f70c33edb62bf8add44ed Mon Sep 17 00:00:00 2001
From: nolash <dev@holbrook.no>
Date: Sun, 17 Oct 2021 18:32:08 +0200
Subject: [PATCH] WIP rehabilitate ussd builds

---
 .../runnable/daemons/cic_user_ussd_server.py  |  4 +-
 apps/cic-ussd/requirements.txt                |  6 +--
 docker-compose_local.yml                      | 43 +++++++++++++++++--
 3 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_ussd_server.py b/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_ussd_server.py
index ac624327..2037c27a 100644
--- a/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_ussd_server.py
+++ b/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_ussd_server.py
@@ -12,6 +12,7 @@ import i18n
 import redis
 from chainlib.chain import ChainSpec
 from confini import Config
+from cic_types.ext.metadata.signer import Signer
 
 # local imports
 from cic_ussd.account.chain import Chain
@@ -25,8 +26,7 @@ from cic_ussd.files.local_files import create_local_file_data_stores, json_file_
 from cic_ussd.http.requests import get_request_endpoint, get_request_method
 from cic_ussd.http.responses import with_content_headers
 from cic_ussd.menu.ussd_menu import UssdMenu
-from cic_ussd.metadata.base import Metadata
-from cic_ussd.metadata.signer import Signer
+#from cic_ussd.metadata.base import Metadata
 from cic_ussd.phone_number import process_phone_number, Support, E164Format
 from cic_ussd.processor.ussd import handle_menu_operations
 from cic_ussd.runnable.server_base import exportable_parser, logg
diff --git a/apps/cic-ussd/requirements.txt b/apps/cic-ussd/requirements.txt
index 8d697075..512ec24d 100644
--- a/apps/cic-ussd/requirements.txt
+++ b/apps/cic-ussd/requirements.txt
@@ -4,9 +4,9 @@ billiard==3.6.4.0
 bcrypt==3.2.0
 celery==4.4.7
 cffi==1.14.6
-#cic-eth[services]~=0.12.4a11
-#cic-notify~=0.4.0a10
-#cic-types~=0.2.0a3
+cic-eth[services]~=0.12.4a11
+cic-notify~=0.4.0a10
+cic-types~=0.2.0a3
 confini>=0.3.6rc4,<0.5.0
 phonenumbers==8.12.12
 psycopg2==2.8.6
diff --git a/docker-compose_local.yml b/docker-compose_local.yml
index 06d302c1..4a0fbde6 100644
--- a/docker-compose_local.yml
+++ b/docker-compose_local.yml
@@ -481,7 +481,6 @@ services:
 
   cic-user-tasker:
     image: ${DEV_DOCKER_REGISTRY:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-user:${TAG:-latest}
-    hostname: meta
     build:
       context: apps/cic-ussd
       dockerfile: docker/Dockerfile
@@ -490,7 +489,7 @@ services:
     environment:
       DATABASE_HOST: ${DATABASE_HOST:-postgres}
       DATABASE_PORT: ${DATABASE_PORT:-5432}
-      DATABASE_NAME: ${DATABASE_NAME:-cic_user}
+      DATABASE_NAME: ${DATABASE_NAME:-cic_ussd}
       DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala}
       DATABASE_USER: ${DATABASE_USER:-grassroots}
       DATABASE_ENGINE: ${DATABASE_ENGINE:-postgres}
@@ -513,7 +512,7 @@ services:
     command: "/root/start_cic_user_tasker.sh -q cic-ussd -vv"
 
 
-  cic-user-tasker:
+  cic-user-server:
     image: ${DEV_DOCKER_REGISTRY:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-user:${TAG:-latest}
     build:
       context: apps/cic-ussd
@@ -526,7 +525,7 @@ services:
     environment:
       DATABASE_HOST: ${DATABASE_HOST:-postgres}
       DATABASE_PORT: ${DATABASE_PORT:-5432}
-      DATABASE_NAME: ${DATABASE_NAME:-cic_user}
+      DATABASE_NAME: ${DATABASE_NAME:-cic_ussd}
       DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala}
       DATABASE_USER: ${DATABASE_USER:-grassroots}
       DATABASE_ENGINE: ${DATABASE_ENGINE:-postgres}
@@ -540,3 +539,39 @@ services:
       - postgres
       - redis
     command: "/root/start_cic_user_server.sh -vv"
+
+
+  cic-user-ussd-server:
+    image: ${DEV_DOCKER_REGISTRY:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-user:${TAG:-latest}
+    build:
+      context: apps/cic-ussd
+      dockerfile: docker/Dockerfile
+      args:
+        DOCKER_REGISTRY: ${DEV_DOCKER_REGISTRY:-registry.gitlab.com/grassrootseconomics}
+        PIP_INDEX_URL: ${PIP_INDEX_URL:-https://pypi.org/simple}
+        EXTRA_PIP_INDEX_URL: ${EXTRA_PIP_INDEX_URL:-https://pip.grassrootseconomics.net:8433}
+        EXTRA_PIP_ARGS: $EXTRA_PIP_ARGS
+    environment:
+      DATABASE_HOST: ${DATABASE_HOST:-postgres}
+      DATABASE_PORT: ${DATABASE_PORT:-5432}
+      DATABASE_NAME: ${DATABASE_NAME:-cic_ussd}
+      DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala}
+      DATABASE_USER: ${DATABASE_USER:-grassroots}
+      DATABASE_ENGINE: ${DATABASE_ENGINE:-postgres}
+      DATABASE_DRIVER: ${DATABASE_DRIVER:-psycopg2}
+      DATABASE_DEBUG: ${DATABASE_DEBUG:-0}
+      DATABASE_POOL_SIZE: 0
+    restart: on-failure 
+    ports:
+      - ${DEV_CIC_USER_SERVER_PORT:-63415}:9500
+    depends_on:
+      - postgres
+      - redis
+      - cic-eth-tasker
+      - cic-cache-tasker
+    ports:
+      - ${DEV_CIC_USER_USSD_SERVER_PORT:-63315}:9500
+    volumes:
+      - ./apps/contract-migration/testdata/pgp/:/usr/src/secrets/
+    command: "/root/start_cic_user_ussd_server.sh -vv"
+