From d988dd6921398a74373692a7f2402ba26aba69cd Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Thu, 5 Aug 2021 16:29:58 -0700 Subject: [PATCH] init --- apps/data-seeding/.dockerignore | 2 +- apps/data-seeding/docker/.env | 2 ++ apps/data-seeding/docker/Dockerfile | 5 ++--- .../scripts/run_ussd_user_imports.sh | 19 ++++++++++++++++--- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/apps/data-seeding/.dockerignore b/apps/data-seeding/.dockerignore index 8e2ae51e..a3c84504 100644 --- a/apps/data-seeding/.dockerignore +++ b/apps/data-seeding/.dockerignore @@ -2,7 +2,7 @@ .cache .dot **/doc -**/node_modules +node_modules/ **/venv **/.venv diff --git a/apps/data-seeding/docker/.env b/apps/data-seeding/docker/.env index 44c596b5..d4ee2a6e 100644 --- a/apps/data-seeding/docker/.env +++ b/apps/data-seeding/docker/.env @@ -8,3 +8,5 @@ REDIS_PORT=6379 USER_USSD_HOST=cic-user-ussd-server USER_USSD_PORT=9000 KEYSTORE_FILE_PATH=/root/keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c +OUT_DIR=out +NUMBER_OF_USERS=100 diff --git a/apps/data-seeding/docker/Dockerfile b/apps/data-seeding/docker/Dockerfile index 2d032960..4b1f9e15 100644 --- a/apps/data-seeding/docker/Dockerfile +++ b/apps/data-seeding/docker/Dockerfile @@ -8,11 +8,9 @@ RUN mkdir -vp /usr/local/etc/cic COPY package.json \ package-lock.json \ . - -RUN --mount=type=cache,mode=0755,target=/root/node_modules npm install +RUN npm ci --production COPY requirements.txt . - ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433" ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple" RUN --mount=type=cache,mode=0755,target=/root/.cache/pip pip install \ @@ -21,4 +19,5 @@ RUN --mount=type=cache,mode=0755,target=/root/.cache/pip pip install \ COPY . . + ENTRYPOINT [ ] diff --git a/apps/data-seeding/scripts/run_ussd_user_imports.sh b/apps/data-seeding/scripts/run_ussd_user_imports.sh index 142df1d9..fbd33c1c 100644 --- a/apps/data-seeding/scripts/run_ussd_user_imports.sh +++ b/apps/data-seeding/scripts/run_ussd_user_imports.sh @@ -41,14 +41,27 @@ echo "purging existing ussd tasks..." celery -A cic_ussd.import_task purge -Q cic-import-ussd --broker $CELERY_BROKER_URL -f - echo "running import_balance in the background..." python cic_ussd/import_balance.py -v -c config -p $ETH_PROVIDER \ - -r $CIC_REGISTRY_ADDRESS --token-symbol $TOKEN_SYMBOL -y $KEYSTORE_FILE_PATH $OUT_DIR 2>&1 & + -r $CIC_REGISTRY_ADDRESS --token-symbol $TOKEN_SYMBOL -y $KEYSTORE_FILE_PATH $OUT_DIR > import_task_log.log & -echo "import_balance pid: $!" +import_pid=$! +echo "import_balance pid: $import_pid" echo "importing accounts" python cic_ussd/import_users.py -vv -c config --ussd-host $USER_USSD_HOST --ussd-port $USER_USSD_PORT --ussd-no-ssl out + +echo "importing user meta data" +node cic_meta/import_meta.js $OUT_DIR $NUMBER_OF_USERS + +echo "import meta prefereneces" +node cic_meta/import_meta_preferences.js $OUT_DIR $NUMBER_OF_USERS + +echo "Running validation!" +python verify.py -v -c config -r $CIC_REGISTRY_ADDRESS -p $ETH_PROVIDER \ + --token-symbol $TOKEN_SYMBOL $OUT_DIR + +kill $import_pid +exit 0