Cleaned the function at service layer

Author: RISHIKESHk07

backend/analytics_server/mhq/api/pull_requests.py

@@ -168,12 +168,25 @@ def get_team_lead_time_trends(
         for week, average_lead_time_metrics in weekly_lead_time_metrics_avg_map.items()
     }
 
-@app.route("/teams/<team_id>/prs/merged_not_reviwed", methods={"GET"})
-def merge_not_reviwed(team_id : str):
+@app.route("/teams/<team_id>/prs/merged_without_review", methods={"GET"})
+@queryschema(
+    Schema(
+        {
+            Required("from_time"): All(str, Coerce(datetime.fromisoformat)),
+            Required("to_time"): All(str, Coerce(datetime.fromisoformat)),
+        }
+    ),
+)
+def merged_without_review(
+    team_id : str,
+    from_time: datetime,
+    to_time: datetime
+):
     query_validator = get_query_validator()
     team: Team = query_validator.team_validator(team_id)
+    interval: Interval = query_validator.interval_validator(from_time, to_time)
     pr_analytics = get_pr_analytics_service()
-    result = pr_analytics.get_prs_not_reviewed_merged(team.id)
-    return result
-    # return {'message':'hellothere'}
+    result = pr_analytics.get_prs_merged_without_review(team.id,interval)
+    prs_map = [pr.id for pr in result]
+    return {'PrsWithoutReviewMerged': prs_map}
 

backend/analytics_server/mhq/service/code/pr_analytics.py

@@ -1,7 +1,9 @@
 from mhq.store.models.code import OrgRepo, PullRequest
 from mhq.store.repos.code import CodeRepoService
 
-from typing import List, Optional
+
+from typing import List,Optional
+from mhq.utils.time import Interval
 
 
 class PullRequestAnalyticsService:
@@ -11,8 +13,8 @@ def __init__(self, code_repo_service: CodeRepoService):
     def get_prs_by_ids(self, pr_ids: List[str]) -> List[PullRequest]:
         return self.code_repo_service.get_prs_by_ids(pr_ids)
 
-    def get_prs_not_reviewed_merged(self,team_id):
-        return self.code_repo_service.get_prs_not_reviewed_merged(team_id)
+    def get_prs_merged_without_review(self,team_id:str,interval:Interval) -> List[PullRequest]:
+        return self.code_repo_service.get_prs_merged_without_review(team_id,interval)
 
     def get_team_repos(self, team_id: str) -> List[OrgRepo]:
         return self.code_repo_service.get_team_repos(team_id)

backend/analytics_server/mhq/store/repos/code.py

@@ -348,23 +348,14 @@ def get_team_repos(self, team_id) -> List[OrgRepo]:
         return self.get_repos_by_ids(team_repo_ids)
 
     @rollback_on_exc
-    def get_prs_not_reviewed_merged(self,team_id):
+    def get_prs_merged_without_review(self,team_id,interval) -> List[PullRequest]:
         AllOrg = self.get_team_repos(team_id)
         AllOrg_ids = [tr.id for tr in AllOrg]
-        print(AllOrg)
-        AllPullRequestEventReviweinOrgIds = (self._db.session.query(PullRequestEvent)
-                                  .filter(PullRequestEvent.org_repo_id.in_(AllOrg_ids))
-                                  .all()
-                                  )
-        ListofReviwedPrs = [ tr.pull_request_id for tr in AllPullRequestEventReviweinOrgIds]
-        AllPullRequestMergedNotReviwed = (self._db.session.query(PullRequest)
-                                          .filter(PullRequest.id.not_in(ListofReviwedPrs))
-                                          .filter(PullRequest.state == PullRequestState.MERGED)
+        return (self._db.session.query(PullRequest)
+                                          .filter(PullRequest.repo_id.in_(AllOrg_ids))
+                                          .filter(PullRequest.merge_time == None)
+                                          .filter(PullRequest.created_in_db_at.between(interval.from_time,interval.to_time))
                                           .all())
-        print(AllPullRequestMergedNotReviwed)
-        
-        return {"countofMergedReviewedPrs": len(AllPullRequestEventReviweinOrgIds),"countOfMergedNOtReviwedPrs":len(AllPullRequestMergedNotReviwed)}
-
 
     @rollback_on_exc
     def get_team_repos_by_team_id(self, team_id: str) -> List[TeamRepos]: