Merge pull request #23 from Code4GovTech/dev

Fixes to 1.0.0

Author: karntrehan

app.py

@@ -131,44 +131,54 @@ async def dmp_updates():
                                      str(issue_response.status_code) + " for dmp_id: "+str(dmp_id))
 
             # 2. Read & Update comments of the ticket
-            GITHUB_COMMENTS_URL = "https://api.github.com/repos/{owner}/{repo}/issues/{issue_number}/comments"
-            comments_url = GITHUB_COMMENTS_URL.format(
-                owner=owner, repo=repo, issue_number=issue_number)
-            async with httpx.AsyncClient() as client:
-                comments_response = await client.get(comments_url, headers=headers)
-                if comments_response.status_code == 200:
-                    week_update_status = False
-                    # Loop through comments
-                    for val in comments_response.json():
-                        # Handle if any of the comments are week data                        
-                        plain_text_body = markdown2.markdown(val['body'])
-                        if "Weekly Goals" in plain_text_body and not week_update_status:
-                            week_update_status = handle_week_data(val, dmp['issue_url'], dmp_id, issue_update['mentor_username'])
-                        
-                        # Parse comments
-                        comment_update = define_issue_update(
-                            val, dmp_id=dmp_id)
-                        app.logger.info(
-                            'Comment from remote: ', comment_update)
-                        upsert_comments = db.upsert_data(
-                            comment_update, 'dmp_issue_updates')
-                        app.logger.info(upsert_comments)
-                else:
-                    app.logger.error("Comments API failed: " +
-                                     str(issue_response.status_code) + " for dmp_id: "+str(dmp_id))
+            page = 1
+            while True:
+                GITHUB_COMMENTS_URL = "https://api.github.com/repos/{owner}/{repo}/issues/{issue_number}/comments?page={page}"
+                comments_url = GITHUB_COMMENTS_URL.format(
+                    owner=owner, repo=repo, issue_number=issue_number, page=page)
+                async with httpx.AsyncClient() as client:
+                    comments_response = await client.get(comments_url, headers=headers)
+                    if comments_response.status_code == 200:
+                        week_update_status = False
+                        week_learning_status = False
+                        # Loop through comments
+                        comments_array = comments_response.json()
+                        if comments_array == [] or len(comments_array)==0:
+                            break
+                        for val in comments_response.json():
+                            # Handle if any of the comments are week data                        
+                            plain_text_body = markdown2.markdown(val['body'])
+                            if "Weekly Goals" in plain_text_body and not week_update_status:
+                                week_update_status = handle_week_data(val, dmp['issue_url'], dmp_id, issue_update['mentor_username'])
+                            
+                            if "Weekly Learnings" in plain_text_body and not week_learning_status:
+                                week_learning_status = handle_week_data(val, dmp['issue_url'], dmp_id, issue_update['mentor_username'])
+                            
+                            # Parse comments
+                            comment_update = define_issue_update(
+                                val, dmp_id=dmp_id)
+                            app.logger.info(
+                                'Comment from remote: ', comment_update)
+                            upsert_comments = db.upsert_data(
+                                comment_update, 'dmp_issue_updates')
+                            app.logger.info(upsert_comments)
+                    else:
+                        app.logger.error("Comments API failed: " +
+                                        str(issue_response.status_code) + " for dmp_id: "+str(dmp_id))
+                page = page + 1
 
             # 3. Read & Update PRs of the ticket
-            GITHUB_PR_URL = "https://api.github.com/repos/{owner}/{repo}/pulls"
+            GITHUB_PR_URL = "https://api.github.com/repos/{owner}/{repo}/pulls?state=all"
             pr_url = GITHUB_PR_URL.format(owner=owner, repo=repo)
             async with httpx.AsyncClient() as client:
                 pr_response = await client.get(pr_url, headers=headers)
                 if pr_response.status_code == 200:
                     for pr_val in pr_response.json():
                         # Select only those prs which have the issue number in ticket
-                        if "#"+str(issue_number) not in pr_val['title']:
+                        if str(issue_number) not in pr_val['title']:
                             continue
                         pr_created_at = pr_val['created_at']
-                        if (pr_created_at >= TARGET_DATE) or 1 == 1:
+                        if (pr_created_at >= TARGET_DATE):
                             pr_data = define_pr_update(pr_val, dmp_id)
                             upsert_pr = db.upsert_data(
                                 pr_data, 'dmp_pr_updates')

utils.py

@@ -43,13 +43,13 @@ def handle_week_data(comment, issue_url, dmp_id, mentor_name):
         plain_text_body = markdown2.markdown(comment['body'])
 
         # If weekly goals is not in the body, ignore everything else and return
-        if "Weekly Goals" not in plain_text_body:
+        if "Weekly Goals" not in plain_text_body and "Weekly Learnings" not in plain_text_body:
             return False
 
         db = SupabaseInterface().get_instance()
 
         # find matched from issue body
-        week_matches = re.findall(r'<h3>(Week \d+)</h3>', plain_text_body)
+        week_matches = re.findall(r'(<.*?>Week \d+<.*?>)', plain_text_body)
 
         weekly_updates = []
         # Take content after index 0 (first one is a heading)