Jelajahi Sumber

[FIX] resource name

Gogs 7 tahun lalu
induk
melakukan
0271ae61e0
1 mengubah file dengan 19 tambahan dan 18 penghapusan
  1. 19 18
      api/resources/odoo_resource.py

+ 19 - 18
api/resources/odoo_resource.py

@@ -70,12 +70,12 @@ class OdooResource(Resource):
         name_exists = check_name(name)
 
         if name_exists:
-            r.issue = 'name is already exists'
+            r.issue = '%s: name is already exists' % name
             r.status = 5
             r.save()
 
             return self.create_response(request, {
-                'error_message': 'name is already exists'
+                'error_message': '%s: name is already exists' % name
             })
         
         # 2. Get port
@@ -85,72 +85,72 @@ class OdooResource(Resource):
         folders_created = create_folders(name)
 
         if not folders_created:
-            r.issue = 'folders structure cannot be created'
+            r.issue = '%s: folders structure cannot be created' % name
             r.status = 5
             r.save()
 
             return self.create_response(request, {
-                'error_message': 'folders structure cannot be created'
+                'error_message': '%s: folders structure cannot be created' % name
             })
 
         # 4. Configuration create
         conf_created = create_configuration(name)
 
         if not conf_created:
-            r.issue = 'configuration cannot be created'
+            r.issue = '%s: configuration cannot be created' % name
             r.status = 5
             r.save()
 
             return self.create_response(request, {
-                'error_message': 'configuration cannot be created'
+                'error_message': '%s: configuration cannot be created' % name
             })
 
         # 5. Database create
         db_created = create_database(name)
 
         if not db_created:
-            r.issue = 'database cannot be created'
+            r.issue = '%s: database cannot be created' % name
             r.status = 5
             r.save()
 
             return self.create_response(request, {
-                'error_message': 'database cannot be created'
+                'error_message': '%s: database cannot be created' % name
             })
 
         # 6. Copy a database backup
         seed_copied = copy_database_seed()
 
         if not seed_copied:
-            r.issue = 'database seed cannot be copied'
+            r.issue = '%s: database seed cannot be copied' % name
             r.status = 5
             r.save()
 
             return self.create_response(request, {
-                'error_message': 'database seed cannot be copied'
+                'error_message': '%s: database seed cannot be copied' % name
             })
         
         # 7. Restore database schema 
         db_restored = restore_database(name)
         
         if not db_restored:
-            r.issue = 'database cannot be restored'
+            r.issue = '%s: database cannot be restored' % name
             r.status = 5
             r.save()
 
             return self.create_response(request, {
-                'error_message': 'database cannot be restored'
+                'error_message': '%s: database cannot be restored' % name
             })
 
         # 8. Remove unused bakup file
         seed_removed = remove_database_seed()
 
         if not seed_removed:
-            r.issue = 'seed cannot be removed'
+            r.issue = '%s: seed cannot be removed' % name
             r.status = 5
             r.save()
 
             return self.create_response(request, {
-                'error_message': 'seed cannot be removed'
+                'error_message': '%s: seed cannot be removed' % name
             })
 
 
@@ -158,26 +158,27 @@ class OdooResource(Resource):
         odoo_created = create_odoo_container(name, [port])
 
         if not odoo_created:
-            r.issue = 'odoo container cannot be created'
+            r.issue = '%s: odoo container cannot be created' % name
             r.status = 5
             r.save()
 
             return self.create_response(request, {
-                'error_message': 'odoo container cannot be created'
+                'error_message': '%s: odoo container cannot be created' % name
             })
 
         # 10. Apply permissions 
         permissions_applied = apply_permissions(name)
 
         if not permissions_applied:
-            r.issue = 'odoo container cannot be started'
+            r.issue = '%s: odoo container cannot be started' % name
             r.status = 5
             r.save()
 
             return self.create_response(request, {
-                'error_message': 'odoo container cannot be started'
+                'error_message': '%s: odoo container cannot be started' % name
             })
 
+        r.issue = '%s: odoo container created successfully' % name
         r.status = 4
         r.save()