Merge pull request #32 from Code4GovTech/dev

Fix: PR status - Merged before closed.

Author: karntrehan

app.py

@@ -242,6 +242,7 @@ def get_issues_by_owner_id(owner, issue):
                 
   """
   try:         
+    print('inside get issues')
     SUPABASE_DB = SupabaseInterface().get_instance()
     response = SUPABASE_DB.client.table('dmp_issue_updates').select('*').eq('owner', owner).eq('issue_number', issue).execute()
     if not response.data:
@@ -335,4 +336,4 @@ def check_secret_key():
 app.register_blueprint(v2, url_prefix='/v2')
 
 if __name__ == '__main__':
-    app.run(debug=True)
+    app.run(debug=True)

v2_app.py

@@ -86,12 +86,15 @@ def get_issues_by_owner_id_v2(owner, issue):
         transformed = {"pr_details": []}
         if pr_Data.data:
             for pr in pr_Data.data:
+                pr_status = pr.get("status", "")
+                if pr_status == "closed" and pr.get("merged_at"):
+                    pr_status = "merged"
                 transformed["pr_details"].append({
                     "id": pr.get("pr_id", ""),
                     "name": pr.get("title", ""),
                     "week": determine_week(pr['created_at']),
                     "link": pr.get("link", ""),
-                    "status": pr.get("status", ""),
+                    "status": pr_status ,
                 })
 
         res['pr_details'] = transformed['pr_details']