From 992c7b4022dc67c2197c2e1bfeafa50c58428e2a Mon Sep 17 00:00:00 2001
From: Philip Wafula <philipwafula2@gmail.com>
Date: Fri, 23 Jul 2021 15:15:30 +0000
Subject: [PATCH] Philip/notify fixes

---
 apps/cic-notify/cic_notify/ext/__init__.py      |  0
 apps/cic-notify/cic_notify/runnable/__init__.py |  0
 apps/cic-notify/docker/Dockerfile               |  7 ++-----
 apps/cic-notify/docker/start_tasker.sh          |  2 +-
 apps/cic-notify/setup.cfg                       | 11 ++---------
 apps/cic-ussd/.config/app.ini                   |  2 +-
 apps/cic-ussd/requirements.txt                  |  2 +-
 7 files changed, 7 insertions(+), 17 deletions(-)
 create mode 100644 apps/cic-notify/cic_notify/ext/__init__.py
 create mode 100644 apps/cic-notify/cic_notify/runnable/__init__.py

diff --git a/apps/cic-notify/cic_notify/ext/__init__.py b/apps/cic-notify/cic_notify/ext/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/apps/cic-notify/cic_notify/runnable/__init__.py b/apps/cic-notify/cic_notify/runnable/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/apps/cic-notify/docker/Dockerfile b/apps/cic-notify/docker/Dockerfile
index 36b09e1..6ce2cab 100644
--- a/apps/cic-notify/docker/Dockerfile
+++ b/apps/cic-notify/docker/Dockerfile
@@ -12,14 +12,11 @@ RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
 	  --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \
     -r requirements.txt
 
-COPY . . 
-
+COPY . .
 RUN python setup.py install
 
-# TODO please review..can this go into requirements?
-RUN pip install $pip_extra_index_url_flag .[africastalking,notifylog]
-
 COPY docker/*.sh .
+RUN chmod +x /root/*.sh
 
 # ini files in config directory defines the configurable parameters for the application
 # they can all be overridden by environment variables
diff --git a/apps/cic-notify/docker/start_tasker.sh b/apps/cic-notify/docker/start_tasker.sh
index b58f0e9..2b8bccd 100755
--- a/apps/cic-notify/docker/start_tasker.sh
+++ b/apps/cic-notify/docker/start_tasker.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-. ./db.sh
+. /root/db.sh
 
 /usr/local/bin/cic-notify-tasker -vv $@
diff --git a/apps/cic-notify/setup.cfg b/apps/cic-notify/setup.cfg
index ea3a2f0..2ed1f08 100644
--- a/apps/cic-notify/setup.cfg
+++ b/apps/cic-notify/setup.cfg
@@ -29,18 +29,11 @@ packages =
 	cic_notify.db
 	cic_notify.db.models
 	cic_notify.ext
+	cic_notify.tasks
 	cic_notify.tasks.sms
 	cic_notify.runnable
 scripts =
-	scripts/migrate.py
-[options.extras_require]
-africastalking = africastalking==1.2.3
-notifylog = psycopg2==2.8.6
-testing =
-	pytest==6.0.1
-	pytest-celery==0.0.0a1
-	pytest-mock==3.3.1
-	pysqlite3==0.4.3
+	./scripts/migrate.py
 
 [options.entry_points]
 console_scripts =
diff --git a/apps/cic-ussd/.config/app.ini b/apps/cic-ussd/.config/app.ini
index 7fdb8c4..75c73d3 100644
--- a/apps/cic-ussd/.config/app.ini
+++ b/apps/cic-ussd/.config/app.ini
@@ -1,6 +1,6 @@
 [app]
 ALLOWED_IP=0.0.0.0/0
-LOCALE_FALLBACK=en
+LOCALE_FALLBACK=sw
 LOCALE_PATH=var/lib/locale/
 MAX_BODY_LENGTH=1024
 PASSWORD_PEPPER=QYbzKff6NhiQzY3ygl2BkiKOpER8RE/Upqs/5aZWW+I=
diff --git a/apps/cic-ussd/requirements.txt b/apps/cic-ussd/requirements.txt
index e47f87b..2494496 100644
--- a/apps/cic-ussd/requirements.txt
+++ b/apps/cic-ussd/requirements.txt
@@ -10,7 +10,7 @@ tinydb==4.2.0
 phonenumbers==8.12.12
 redis==3.5.3
 celery==4.4.7
-python-i18n==0.3.9
+python-i18n[YAML]==0.3.9
 pyxdg==0.27
 bcrypt==3.2.0
 uWSGI==2.0.19.1