From 4cdd152ab8895231978169ad648364c848d439c6 Mon Sep 17 00:00:00 2001 From: Karan Trehan Date: Tue, 2 Jul 2024 13:14:52 +0530 Subject: [PATCH 1/4] Update Dockerfile for prod deployment --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 53f495c..f841f72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,12 +11,12 @@ COPY . /app RUN pip install --no-cache-dir -r requirements.txt # Make port 5000 available to the world outside this container -EXPOSE 5000 +EXPOSE 7000 # Define environment variable ENV FLASK_APP=wsgi.py ENV FLASK_RUN_HOST=0.0.0.0 # Run the application -CMD ["flask", "run"] +CMD ["flask", "run", "--host=0.0.0.0", "--port=7000"] From dbf06a4a0e0b1334747c1810f2bc37113760db88 Mon Sep 17 00:00:00 2001 From: Karan Trehan Date: Tue, 2 Jul 2024 13:15:45 +0530 Subject: [PATCH 2/4] Update docker-compose.yml for prod deployment --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5d41718..a8bf2ee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,8 +4,9 @@ services: web: build: . ports: - - "5000:5000" + - "7000:7000" environment: FLASK_ENV: ${FLASK_ENV:-development} SUPABASE_URL: ${SUPABASE_URL} SUPABASE_KEY: ${SUPABASE_KEY} + SECRET_KEY: ${SECRET_KEY} From 113e3ad54b9ed11b735a5b2b79b35e3b234b6ab2 Mon Sep 17 00:00:00 2001 From: jaanbaaz <106968030+jaanbaaz@users.noreply.github.com> Date: Wed, 10 Jul 2024 15:36:45 +0530 Subject: [PATCH 3/4] Update app.py a print statement added --- app.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app.py b/app.py index 5f8c60b..54565fc 100644 --- a/app.py +++ b/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) \ No newline at end of file + app.run(debug=True) From 35084351305b5947eb10b652852558f752c0f276 Mon Sep 17 00:00:00 2001 From: jaanbaaz Date: Fri, 12 Jul 2024 17:35:24 +0530 Subject: [PATCH 4/4] pr status fix --- v2_app.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/v2_app.py b/v2_app.py index 6f8ee2a..ebb278c 100644 --- a/v2_app.py +++ b/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']