From a7de75116080209a04fe27d1d5b80dcbeeb101f9 Mon Sep 17 00:00:00 2001
From: ImMin5 <mino@megazone.com>
Date: Sun, 8 Sep 2024 00:55:07 +0900
Subject: [PATCH] feat: modify namespace and metrics and remove debug code

---
 src/plugin/connector/base.py                  | 32 ++-----------------
 src/plugin/manager/base.py                    |  1 -
 src/plugin/manager/issue_manager.py           | 11 +++++++
 .../Projects/issue/projects_issue_count.yaml  |  4 +++
 4 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/src/plugin/connector/base.py b/src/plugin/connector/base.py
index 9c3edd8..d4ddf1d 100644
--- a/src/plugin/connector/base.py
+++ b/src/plugin/connector/base.py
@@ -31,38 +31,13 @@ def dispatch_request(
         auth = self.get_auth(secret_data)
 
         try:
-            max_results = params.get("maxResults")
-            start_at = params.get("startAt")
-            total_count = params.get("total_count")
-            if max_results and start_at and total_count:
-                for response in self._pagination_with_count(
-                    method, url, headers, auth, params, data
-                ):
-                    yield response
-
-            else:
-                for response in self._pagination(
-                    method, url, headers, auth, params, data
-                ):
-                    yield response
+            for response in self._pagination(method, url, headers, auth, params, data):
+                yield response
 
         except Exception as e:
             _LOGGER.error(f"[dispatch_request] Error {e}")
             raise ERROR_UNKNOWN(message=e)
 
-    @staticmethod
-    def _pagination_with_count(
-        method: str,
-        url: str,
-        headers: dict,
-        auth: HTTPBasicAuth,
-        params: dict,
-        data: dict = None,
-    ) -> list:
-        responses = []
-        while True:
-            print(url, params)
-
     @staticmethod
     def _pagination(
         method: str,
@@ -74,7 +49,6 @@ def _pagination(
     ) -> list:
         responses = []
         while True:
-            print(url, params)
             response = requests.request(
                 method,
                 url,
@@ -89,8 +63,6 @@ def _pagination(
             else:
                 response_values = response_json.get("values")
 
-            print(response_json)
-
             _LOGGER.debug(
                 f"[dispatch_request] {url} {response.status_code} {response.reason}"
             )
diff --git a/src/plugin/manager/base.py b/src/plugin/manager/base.py
index 3229fae..05a9601 100644
--- a/src/plugin/manager/base.py
+++ b/src/plugin/manager/base.py
@@ -65,7 +65,6 @@ def collect_metrics(cls, cloud_service_group: str):
                         _METRIC_DIR, cloud_service_group, dirname, filename
                     )
                     info = utils.load_yaml_from_file(file_path)
-                    print(file_path)
                     if filename == "namespace.yaml":
                         yield make_response(
                             namespace=info,
diff --git a/src/plugin/manager/issue_manager.py b/src/plugin/manager/issue_manager.py
index ad3e43e..5710d08 100644
--- a/src/plugin/manager/issue_manager.py
+++ b/src/plugin/manager/issue_manager.py
@@ -1,4 +1,5 @@
 import logging
+from datetime import datetime
 from typing import Generator
 
 from plugin.connector.project_connector import ProjectConnector
@@ -73,6 +74,11 @@ def _list_issue_from_project(
                 "external_link": f"https://{domain}.atlassian.net/browse/{issue_info['key']}",
             }
 
+            issue_created: str = issue_info.get("fields", {}).get("created")
+            if issue_created:
+                issue_created_display = issue_created.split("T")[0]
+                issue_info["issue_created_display"] = issue_created_display
+
             cloud_service = make_cloud_service(
                 name=issue_info["fields"]["summary"],
                 cloud_service_type=self.cloud_service_type,
@@ -95,3 +101,8 @@ def _list_issue_from_project(
                     ]
                 ],
             )
+
+    @staticmethod
+    def convert_datetime(created_at: str) -> str:
+        datetime_obj = datetime.strptime(created_at, "%Y-%m-%d")
+        return datetime_obj.strftime("%Y-%m-%d")
diff --git a/src/plugin/metrics/Projects/issue/projects_issue_count.yaml b/src/plugin/metrics/Projects/issue/projects_issue_count.yaml
index f188ba4..b9216ca 100644
--- a/src/plugin/metrics/Projects/issue/projects_issue_count.yaml
+++ b/src/plugin/metrics/Projects/issue/projects_issue_count.yaml
@@ -10,12 +10,16 @@ query_options:
     - key: data.fields.status.name
       name: Status
       default: true
+    - key: data.fields.priority.name
+      name: Priority
     - key: data.fields.assignee.displayName
       name: Assignee
     - key: data.fields.issuetype.name
       name: Issue Type
     - key: data.fields.reporter.displayName
       name: Reporter
+    - key: data.issue_created_display
+      name: Created Date
   fields:
     value:
       operator: count