Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	data

data @ 4607a054

-Subproject commit 317532010c74366f89fa95c068d3f97af39f8550
+Subproject commit 4607a0547d5be61e8e7b955e570d429af054b93b

src/covid19/blueprints/admin/admin_service.py

@@ -11,7 +11,7 @@ class AdminService:
         app.logger.debug("------------------------------------------------------------")
         self.__database = database
         self.limit_nr = 20
-        self.file_path = '..'+os.sep+'data'+os.sep+'db'+os.sep+'covid19data.sql'
+        self.file_path = '..'+os.sep+'..'+os.sep+'data'+os.sep+'db'+os.sep+'covid19data.sql'
         app.logger.debug("------------------------------------------------------------")
         app.logger.info(" Admin Service [ready]")
 
@@ -24,13 +24,13 @@ class AdminService:
     def run_admin_database_dump(self):
         app.logger.info(" run database dump [begin]")
         app.logger.info("------------------------------------------------------------")
+        app.logger.info(os.getcwd())
         user = app.config['SQLALCHEMY_DATABASE_USER']
         url = app.config['SQLALCHEMY_DATABASE_HOST']
         db = app.config['SQLALCHEMY_DATABASE_DB']
-        cmd = 'pg_dump -U '+user+' -h '+url+' '+db\
-              +' --clean --if-exists --no-tablespaces '\
+        cmd = 'pg_dump --if-exists --clean --no-tablespaces '\
               +' --on-conflict-do-nothing --rows-per-insert=1000 --column-inserts '\
-              +' --quote-all-identifiers --no-privileges > '\
+              +' --quote-all-identifiers --no-privileges -U '+user+' -h '+url+' '+db+' > '\
               + self.file_path
         app.logger.info(" start: "+str(cmd))
         returncode = self.__run_ome_shell_command(cmd)
@@ -48,21 +48,24 @@ class AdminService:
             result = subprocess.run(args, shell=True, check=True, capture_output=True, encoding='UTF-8')
             returncode = result.returncode
         except subprocess.CalledProcessError as error:
-            app.logger.warning("WARN: AdminService.__run_ome_shell_command")
-            app.logger.warning("cmd    :::" + cmd + ":::")
-            app.logger.warning("error  :::" + str(error) + ":::")
-            app.logger.warning("WARN: AdminService.__run_ome_shell_command")
+            app.logger.warning("---------------------------------------------------------")
+            app.logger.warning("  WARN:  AdminService.__run_ome_shell_command")
+            app.logger.warning("---------------------------------------------------------")
+            app.logger.warning("  cmd:    :::" + cmd + ":::")
+            app.logger.warning("  erro:   :::" + str(error) + ":::")
+            app.logger.warning("---------------------------------------------------------")
         return returncode
 
     def run_admin_database_dump_reimport(self):
-        flash(" run database dump reimport [begin]")
+        # flash(" run database dump reimport [begin]")
         app.logger.info(" run database dump reimport [begin]")
         app.logger.info("------------------------------------------------------------")
         user = app.config['SQLALCHEMY_DATABASE_USER']
         url = app.config['SQLALCHEMY_DATABASE_HOST']
         db = app.config['SQLALCHEMY_DATABASE_DB']
+        one_cmd = 'psql -U ' + user + ' -h ' + url + ' ' + db + ' < ' + self.file_path
         cmd_list = [
-            'psql -U ' + user + ' -h ' + url + ' ' + db + ' < ' + self.file_path
+            one_cmd
         ]
         for cmd in cmd_list:
             returncode = self.__run_ome_shell_command(cmd)
@@ -70,7 +73,7 @@ class AdminService:
             app.logger.info(msg)
         app.logger.info(" run database dump reimport [done]")
         app.logger.info("------------------------------------------------------------")
-        flash(" run database dump reimport [done]")
+        # flash(" run database dump reimport [done]")
         return self
 
     def run_admin_database_drop_and_create(self):

src/covid19/blueprints/application/application_service_config.py

@@ -26,7 +26,7 @@ class ApplicationServiceConfig:
         self.cvsfile_name = cvsfile_name
         self.url_src = url_src
         self.download_path = self.data_path + os.sep + self.cvsfile_name
-        self.cvsfile_path = ".." + os.sep + self.data_path + os.sep + self.cvsfile_subpath + os.sep + self.cvsfile_name
+        self.cvsfile_path = self.data_path + os.sep + self.cvsfile_subpath + os.sep + self.cvsfile_name
         self.msg_job = "download FILE: "+self.cvsfile_name+" from "+self.url_src
         self.msg_ok = "downloaded FILE: " + self.cvsfile_path + " from " + self.url_src
         self.msg_error = "Error while downloading: " + self.cvsfile_path + " from " + self.url_src