notebook

10ReadPozadavky/PRAVIDELNE_1_ReadLast300DonePozadavku.py

@@ -5,14 +5,14 @@ import pymysql
 import requests
 from pathlib import Path
 from datetime import datetime
+from dateutil import parser
 
 # ================================
 # 🔧 CONFIGURATION
 # ================================
 TOKEN_PATH = Path("token.txt")
 CLINIC_SLUG = "mudr-buzalkova"
-
-LIMIT = 300   # download the latest 300 requests
+LIMIT = 300   # stáhneme posledních 300 ukončených požadavků
 
 DB_CONFIG = {
     "host": "192.168.1.76",
@@ -24,21 +24,22 @@ DB_CONFIG = {
     "cursorclass": pymysql.cursors.DictCursor,
 }
 
+# ⭐ Ověřený dotaz s lastMessage
 GRAPHQL_QUERY = r"""
-query ClinicRequestGrid_ListPatientRequestsForClinic2(
+query ClinicRequestList2(
   $clinicSlug: String!,
   $queueId: String,
   $queueAssignment: QueueAssignmentFilter!,
+  $state: PatientRequestState,
   $pageInfo: PageInfo!,
-  $locale: Locale!,
-  $state: PatientRequestState
+  $locale: Locale!
 ) {
   requestsResponse: listPatientRequestsForClinic2(
     clinicSlug: $clinicSlug,
     queueId: $queueId,
     queueAssignment: $queueAssignment,
-    pageInfo: $pageInfo,
-    state: $state
+    state: $state,
+    pageInfo: $pageInfo
   ) {
     count
     patientRequests {
@@ -53,6 +54,9 @@ query ClinicRequestGrid_ListPatientRequestsForClinic2(
         surname
         identificationNumber
       }
+      lastMessage {
+        createdAt
+      }
     }
   }
 }
@@ -61,29 +65,46 @@ query ClinicRequestGrid_ListPatientRequestsForClinic2(
 # ================================
 # TOKEN
 # ================================
-def read_token(p: Path) -> str:
-    tok = p.read_text(encoding="utf-8").strip()
+def read_token(path: Path) -> str:
+    tok = path.read_text(encoding="utf-8").strip()
     if tok.startswith("Bearer "):
         return tok.split(" ", 1)[1]
     return tok
 
 # ================================
-# DATE PARSER
+# DATETIME PARSER (UTC → MySQL)
 # ================================
 def to_mysql_dt(iso_str):
     if not iso_str:
         return None
     try:
-        dt = datetime.fromisoformat(iso_str.replace("Z", "+00:00"))
+        dt = parser.isoparse(iso_str)   # ISO8601 → aware datetime (UTC)
+        dt = dt.astimezone()            # převede na lokální čas (CET/CEST)
         return dt.strftime("%Y-%m-%d %H:%M:%S")
     except:
         return None
 
 # ================================
-# UPSERT
+# UPSERT WITH MERGED UPDATED TIME
 # ================================
 def upsert(conn, r):
-    p = (r.get("extendedPatient") or {})
+    p = r.get("extendedPatient") or {}
+
+    # API pole
+    api_updated = to_mysql_dt(r.get("updatedAt"))
+
+    # poslední zpráva
+    last_msg = r.get("lastMessage") or {}
+    msg_at = to_mysql_dt(last_msg.get("createdAt"))
+
+    # vybereme novější čas
+    def max_dt(a, b):
+        if a and b:
+            return max(a, b)
+        return a or b
+
+    final_updated = max_dt(api_updated, msg_at)
+
     sql = """
         INSERT INTO pozadavky (
             id, displayTitle, createdAt, updatedAt, doneAt, removedAt,
@@ -98,36 +119,39 @@ def upsert(conn, r):
             pacient_prijmeni=VALUES(pacient_prijmeni),
             pacient_rodnecislo=VALUES(pacient_rodnecislo)
     """
+
     vals = (
         r.get("id"),
         r.get("displayTitle"),
         to_mysql_dt(r.get("createdAt")),
-        to_mysql_dt(r.get("updatedAt")),
+        final_updated,
         to_mysql_dt(r.get("doneAt")),
         to_mysql_dt(r.get("removedAt")),
         p.get("name"),
         p.get("surname"),
         p.get("identificationNumber"),
     )
+
     with conn.cursor() as cur:
         cur.execute(sql, vals)
+
     conn.commit()
 
 # ================================
-# FETCH LATEST 300 REQUESTS
+# FETCH LAST 300 DONE REQUESTS
 # ================================
-def fetch_latest_requests(headers):
+def fetch_done(headers):
     vars = {
         "clinicSlug": CLINIC_SLUG,
         "queueId": None,
         "queueAssignment": "ANY",
         "pageInfo": {"first": LIMIT, "offset": 0},
         "locale": "cs",
-        "state": "DONE"  # ALL STATES (ACTIVE, DONE, REMOVED)
+        "state": "DONE",
     }
 
     payload = {
-        "operationName": "ClinicRequestGrid_ListPatientRequestsForClinic2",
+        "operationName": "ClinicRequestList2",
         "query": GRAPHQL_QUERY,
         "variables": vars,
     }
@@ -151,17 +175,16 @@ def main():
 
     conn = pymysql.connect(**DB_CONFIG)
 
-    print(f"\n=== Downloading last {LIMIT} requests @ {datetime.now():%Y-%m-%d %H:%M:%S} ===")
-
-    requests_list = fetch_latest_requests(headers)
+    print(f"\n=== Downloading last {LIMIT} DONE requests @ {datetime.now():%Y-%m-%d %H:%M:%S} ===")
 
+    requests_list = fetch_done(headers)
     print(f"📌 Requests returned: {len(requests_list)}")
 
     for r in requests_list:
         upsert(conn, r)
 
     conn.close()
-    print("\n✅ Done. Latest requests synced.\n")
+    print("\n✅ DONE - latest closed requests synced.\n")
 
 
 if __name__ == "__main__":