Merge branch '95-wrong-path-to-sftp-sync-job' into 'main'

Resolve "wrong path in cv sync job"

Closes #95

See merge request !152

.gitignore

@@ -14,3 +14,4 @@ data/
 !data/tomcat/context/.gitkeep
 /Pipfile
 docker-compose-dev.yml
+cron/crontab.txt

cron/crontab.example.txt

+30 1-23/3 * * * /scripts/sms_sync/sms_cv_tables.py > $STDOUT 2>$STDERR

cron/crontab.txt

-15,45 * * * * /usr/bin/python3 /scripts/sms_sync/sms_cv_tables.py > $STDOUT 2>$STDERR

cron/scripts/sms_sync/sms_cv_tables.py

+#!/usr/bin/python3
+
 from sync_utils import (
     create_table,
     upsert_table,
     get_connection_from_env,
 )
-from os import chdir, environ
+import os
 import json
 
-url = environ.get("CV_API_URL")
-home = environ.get("HOME")
-chdir(home)
+script_dir = os.path.dirname(os.path.abspath(__file__))
+
+file_names = [
+    "sms_cv_measured_quantity.json"
+]
 
-file_path_list = ["scripts/sms_sync/tables/sms_cv_measured_quantity.json"]
+file_path_list = [os.path.join(script_dir, "tables", file_name) for file_name in file_names]
 
 if __name__ == "__main__":
+    url = os.environ.get("CV_API_URL")
+    home = os.environ.get("HOME")
+    os.chdir(home)
     for file_path in file_path_list:
         db = get_connection_from_env()
         try:

docker-compose.yml

@@ -25,6 +25,7 @@ services:
     volumes:
       - "./data/minio/certs/:/tmp/certs"
       - "./nginx/html/:/home/tsm/html"
+      - "./cron:/tmp/cron"
 
 
   # Summary
@@ -697,6 +698,8 @@ services:
     depends_on:
         mqtt-broker:
             condition: "service_healthy"
+        init:
+          condition: "service_completed_successfully"
     environment:
       LOG_LEVEL: "${LOG_LEVEL}"
       TOPIC: "thing_creation"
@@ -791,6 +794,9 @@ services:
         ${FRONTEND_POSTGRES_PASS}@\
         ${FRONTEND_POSTGRES_HOST}/\
         ${FRONTEND_POSTGRES_DB}"
+    depends_on:
+      init:
+        condition: "service_completed_successfully"
     healthcheck:
       test: [ "CMD-SHELL", "service cron status || exit 1" ]
       interval: 5s

init/init.sh

@@ -22,4 +22,10 @@ chmod a+x /home/tsm/html/css
 chmod a+x /home/tsm/html/images
 chmod -R a+r /home/tsm/html
 
-tree -pugfi /home/tsm/html
\ No newline at end of file
+tree -pugfi /home/tsm/html
+
+# Create crontab.txt if it not already exists
+if [ ! -f "/tmp/cron/crontab.txt" ]; then
+    touch "/tmp/cron/crontab.txt"
+    chmod 666 "/tmp/cron/crontab.txt"
+fi