From 74f8cf74e7cf7856fffa03ce2a5ae87d3b93dd18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@nextcloud.com>
Date: Mon, 25 Sep 2023 18:20:18 +0200
Subject: [PATCH] Fix Zammad plugin by filtering tickets after search
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
---
 did/plugins/zammad.py | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/did/plugins/zammad.py b/did/plugins/zammad.py
index 309a8201..f593d97b 100644
--- a/did/plugins/zammad.py
+++ b/did/plugins/zammad.py
@@ -19,6 +19,8 @@
 import urllib.parse
 import urllib.request
 
+from datetime import datetime
+
 from did.base import Config, ReportError, get_token
 from did.stats import Stats, StatsGroup
 from did.utils import listed, log, pretty
@@ -61,7 +63,25 @@ def search(self, query):
         try:
             result = result["Ticket"]
         except KeyError:
-            result = dict()
+            result = {}
+        log.debug("Result: {0} fetched".format(listed(len(result), "item")))
+        log.data(pretty(result))
+        return result
+
+    def get_articles(self, ticket_id):
+        """ Perform Zammad query """
+        url = self.url + "/ticket_articles/by_ticket/" + str(ticket_id)
+        log.debug("Zammad query: {0}".format(url))
+        try:
+            request = urllib.request.Request(url, headers=self.headers)
+            response = urllib.request.urlopen(request)
+            log.debug("Response headers:\n{0}".format(
+                str(response.info()).strip()))
+        except urllib.error.URLError as error:
+            log.debug(error)
+            raise ReportError(
+                "Zammad search on {0} failed.".format(self.url))
+        result = json.loads(response.read())
         log.debug("Result: {0} fetched".format(listed(len(result), "item")))
         log.data(pretty(result))
         return result
@@ -97,10 +117,13 @@ def fetch(self):
         search = "article.from:\"{0}\" and article.created_at:[{1} TO {2}]".format(
             self.user.name, self.options.since, self.options.until)
         query = "tickets/search?query={0}".format(urllib.parse.quote(search))
-        self.stats = [
-            Ticket(ticket) for id,
-            ticket in self.parent.zammad.search(query).items()]
-
+        self.stats = []
+        for _,ticket in self.parent.zammad.search(query).items():
+            for article in self.parent.zammad.get_articles(ticket["id"]):
+                updated_at = datetime.fromisoformat(article["updated_at"].replace('Z', '+00:00')).date()
+                if (article["created_by"] == self.user.email) and (updated_at >= self.options.since.date) and (updated_at <= self.options.until.date):
+                    self.stats.append(Ticket(ticket))
+                    break
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #  Stats Group