fix comments

Author: admin

app/util/analytics/analytics.py

@@ -54,6 +54,7 @@ def __init__(self, application: BaseApplication):
         self.dataset_information = application.dataset_information
         self.apps_count = application.apps_count
         self.custom_apps_count = application.custom_app_count
+        self.custom_apps_count_enabled = application.custom_app_count_enabled
         if self.app_type != CROWD:
             self.processors = application.processors
             self.deployment = application.deployment

app/util/analytics/analytics_utils.py

@@ -108,6 +108,7 @@ def generate_report_summary(collector):
     summary_report.append(f'Has app-specific actions|{bool(collector.app_specific_rates)}')
     summary_report.append(f'Applications count|{collector.apps_count}')
     summary_report.append(f'Custom applications count|{collector.custom_apps_count}')
+    summary_report.append(f'Custom applications count enabled|{collector.custom_apps_count_enabled}')
 
     if collector.app_type == JSM:
         insight = collector.insight

app/util/analytics/application_info.py

@@ -34,6 +34,7 @@ class BaseApplication:
     dataset_information = None
     apps_count = None
     custom_app_count = None
+    custom_app_count_enabled = None
 
     def __init__(self, api_client, config_yml):
         self.client = api_client(host=config_yml.server_url,
@@ -110,13 +111,23 @@ def apps_count(self):
     def __get_apps(self):
         return self.client.get_installed_apps()
 
-    @property
-    def custom_app_count(self):
+    @cached_property
+    def __get_custom_apps(self):
         all_apps = self.__get_apps
         apps_with_vendor_defined = [app for app in all_apps if 'vendor' in app]
         non_atlassian_apps = [app for app in apps_with_vendor_defined if 'Atlassian' not in
                               app['vendor']['name'] and app['userInstalled'] == True]
-        return len(non_atlassian_apps)
+        return non_atlassian_apps
+
+    @property
+    def custom_app_count(self):
+        return len(self.__get_custom_apps)
+
+    @property
+    def custom_app_count_enabled(self):
+        non_atlassian_apps = self.__get_custom_apps
+        non_atlassian_apps_enabled = [app for app in non_atlassian_apps if app['enabled'] == True]
+        return len(non_atlassian_apps_enabled)
 
 
 class Confluence(BaseApplication):

app/util/data_preparation/jira_prepare_data.py

@@ -182,7 +182,10 @@ def __check_number_of_custom_app(client):
     apps_with_vendor_defined = [app for app in all_apps if 'vendor' in app]
     non_atlassian_apps = [app for app in apps_with_vendor_defined if 'Atlassian' not in
                           app['vendor']['name'] and app['userInstalled'] == True]
-    print(len(non_atlassian_apps))
+    non_atlassian_apps_names = [app['name'] for app in non_atlassian_apps]
+    print(f"Custom application count: {len(non_atlassian_apps)}")
+    print(f'Custom app names:')
+    print(*non_atlassian_apps_names, sep='\n')