fixed the reports getting the wrong apps field and did a little bit of refactoring

Author: Marcelo RS Soares

dbaas/dbaas_services/analyzing/views.py

@@ -13,11 +13,11 @@
 from dbaas.middleware import UserMiddleware
 from django.conf import settings
 from account.models import Team, Role
+from datetime import datetime
 
 import models
 import csv
 import logging
-import datetime
 
 
 class SubUsedResourceReport(ListView):
@@ -55,34 +55,55 @@ def get(self, request, *args, **kwargs):
     def post(self, request, *args, **kwargs):
         self.has_perm(request)
 
-        header = ['Name', 'VM', 'Env', 'Team', 'Created At', 'In Quarantine', 'Apps Bind Name']
-        databases = Database.objects.all()
         database_report = request.POST.get("database_report", "")
 
+        if database_report == 'database_report':
+            return self.default_database_report()
+        else:
+            return self.vm_by_line_database_report()
+
+
+    def vm_by_line_database_report(self):
+
+        header = ['Name', 'VM', 'Env', 'Team', 'Created At', 'In Quarantine', 'Apps Bind Name']
+        databases = Database.objects.all()
         response = HttpResponse(content_type='text/csv')
-        response['Content-Disposition'] = 'attachment; filename="report.csv"'
+
+        filename = 'dbaas_databases_vm_by_line-' + datetime.now().strftime("%Y-%m-%m") + ".csv"
+
+        response['Content-Disposition'] = 'attachment; filename="'+ filename + '"'
         writer = csv.writer(response, csv.excel)
         response.write(u'\ufeff'.encode('utf8'))
         writer.writerow(header)
 
         for database in databases:
-            database_history = DatabaseHistory.objects.filter(database_id=database.id).last()
-            try:
-                apps_bind_name = database_history.apps_bind_name
-            except:
-                apps_bind_name = ''
-            if database_report == 'database_report':
-                hostname = [instance.hostname.hostname.encode("utf-8") for instance in
-                            database.infra.instances.all()]
-                data = [database.name, hostname, database.environment, database.team,
-                        database.created_at, database.is_in_quarantine, apps_bind_name]
+            for instance in database.infra.instances.all():
+                data = [database.name, instance.hostname.hostname.encode("utf-8"), database.environment,
+                        database.team,
+                        database.created_at, database.is_in_quarantine, database.apps_bind_name]
                 writer.writerow(data)
-            else:
-                for instance in database.infra.instances.all():
-                    data = [database.name, instance.hostname.hostname.encode("utf-8"), database.environment,
-                            database.team,
-                            database.created_at, database.is_in_quarantine, apps_bind_name]
-                    writer.writerow(data)
-
+            
+            
         return response
 
+    def default_database_report(self):
+
+        header = ['Name', 'VM', 'Env', 'Team', 'Created At', 'In Quarantine', 'Apps Bind Name']
+        databases = Database.objects.all()
+        response = HttpResponse(content_type='text/csv')
+
+        filename = 'dbaas_databases-' + datetime.now().strftime("%Y-%m-%m") + ".csv"
+        response['Content-Disposition'] = 'attachment; filename="'+ filename + '"'
+
+        writer = csv.writer(response, csv.excel)
+        response.write(u'\ufeff'.encode('utf8'))
+        writer.writerow(header)
+
+        for database in databases:
+            hostname = [instance.hostname.hostname.encode("utf-8") for instance in
+                        database.infra.instances.all()]
+            data = [database.name, hostname, database.environment, database.team,
+                    database.created_at, database.is_in_quarantine, database.apps_bind_name]
+            writer.writerow(data)
+            
+        return response

dev/docker-compose.yml

@@ -3,6 +3,7 @@ networks:
   gntw:
     driver: bridge
 services:
+  
   app:
     image: dbaas_dev
     volumes:
@@ -29,6 +30,7 @@ services:
         - SSL_CERT_FILE=/etc/ssl/certsg/AC_RAIZ.pem
     networks:
       - gntw
+  
   app_celery:
     image: dbaas_dev
     volumes:
@@ -54,26 +56,32 @@ services:
         - SSL_CERT_FILE=/etc/ssl/certsg/AC_RAIZ.pem
     networks:
       - gntw
+  
   dev_redisdb:
-        image: redis:3.2
-        container_name: dev_redis32
-        networks:
-            - gntw
+    image: redis:3.2
+    container_name: dev_redis32
+    networks:
+        - gntw
+  
   dev_mongodb:
-        image: mongo:3.4
-        container_name: dev_mongo34
-        networks:
-          - gntw
+    image: mongo:3.4
+    container_name: dev_mongo34
+    networks:
+      - gntw
+  
   dev_mysqldb57:
-        platform: linux/x86_64
-        image: mysql:5.7
-        container_name: dev_mysql57
-        volumes:
-            - ./data/mysql:/var/lib/mysql
-        environment:
-            - MYSQL_ROOT_PASSWORD=123
-            - MYSQL_USER=rute
-            - MYSQL_PASSWORD=123
-            - MYSQL_DATABASE=dbaas
-        networks:
-            - gntw
+    platform: linux/x86_64
+    image: mysql:5.7
+    container_name: dev_mysql57
+    volumes:
+        - ./data/mysql:/var/lib/mysql
+    environment:
+        - MYSQL_ROOT_PASSWORD=123
+        - MYSQL_USER=rute
+        - MYSQL_PASSWORD=123
+        - MYSQL_DATABASE=dbaas
+    networks:
+        - gntw
+    ports:
+      - "4406:3306"
+