From 88a6832b85f144683b0bb1119e05a5ef40f314e6 Mon Sep 17 00:00:00 2001 From: jungmir Date: Mon, 7 Oct 2024 05:03:15 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Fix:=20=EC=97=86=EB=8A=94=20=EC=98=B5?= =?UTF-8?q?=EC=85=98=EC=9D=84=20=EB=94=94=EC=8A=A4=ED=94=8C=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=20=ED=95=98=EB=A0=A4=EB=8D=98=20=EB=B2=84=EA=B7=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sponsor/admin.py | 1 - 1 file changed, 1 deletion(-) diff --git a/sponsor/admin.py b/sponsor/admin.py index cf92fd9..e62b8ec 100644 --- a/sponsor/admin.py +++ b/sponsor/admin.py @@ -20,7 +20,6 @@ class SponsorAdmin(SummernoteModelAdmin): "submitted", "accepted", "paid_at", - "year", ) list_filter = ("accepted", "submitted", "paid_at") ordering = ("-created_at",) From 99c580f5b9f75b662c77cf9b6c53a04998652aba Mon Sep 17 00:00:00 2001 From: Bae KwonHan Date: Sun, 13 Oct 2024 15:47:55 +0900 Subject: [PATCH 2/3] fix api url with trailing slash --- pyconkr/external_apis/pretalx/client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyconkr/external_apis/pretalx/client.py b/pyconkr/external_apis/pretalx/client.py index 6b39dc6..4656306 100644 --- a/pyconkr/external_apis/pretalx/client.py +++ b/pyconkr/external_apis/pretalx/client.py @@ -43,7 +43,7 @@ def list_sessions(self, event_name: str, only_confirmed: bool = True) -> dict: """세션 목록 조회""" query_params = {"limit": 300, "state": "confirmed" if only_confirmed else None} filtered_query_params = {k: v for k, v in query_params.items() if v is not None} - endpoint = f"api/events/{event_name}/submissions?{urllib.parse.urlencode(filtered_query_params)}" + endpoint = f"api/events/{event_name}/submissions/?{urllib.parse.urlencode(filtered_query_params)}" try: result = self._request("GET", endpoint) @@ -54,7 +54,7 @@ def list_sessions(self, event_name: str, only_confirmed: bool = True) -> dict: def retrieve_session(self, event_name: str, session_id: int) -> dict: """세션 상세 조회""" - endpoint = f"api/events/{event_name}/submissions/{session_id}" + endpoint = f"api/events/{event_name}/submissions/{session_id}/" try: result = self._request("GET", endpoint) From e4835c87c6fbc013b74c1288af2684537a100b2f Mon Sep 17 00:00:00 2001 From: MUsoftware Date: Sun, 12 Jan 2025 17:20:34 +0900 Subject: [PATCH 3/3] =?UTF-8?q?PostgreSQL=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyconkr/settings-dev.py | 31 +++++++++++++++++++++---------- pyconkr/settings-prod.py | 31 +++++++++++++++++++++---------- requirements-local.txt | 1 + requirements.txt | 1 + 4 files changed, 44 insertions(+), 20 deletions(-) diff --git a/pyconkr/settings-dev.py b/pyconkr/settings-dev.py index b69f580..fd07976 100644 --- a/pyconkr/settings-dev.py +++ b/pyconkr/settings-dev.py @@ -13,17 +13,28 @@ ] # RDS -DATABASES = { - "default": { - # "ENGINE": "mysql.connector.django", - "ENGINE": "django.db.backends.mysql", - "NAME": os.getenv("AWS_RDS_DATABASE"), - "USER": os.getenv("AWS_RDS_USER_ID"), - "PASSWORD": os.getenv("AWS_RDS_PW"), - "HOST": os.getenv("AWS_RDS_HOST"), - "PORT": os.getenv("AWS_RDS_PORT"), +if os.environ.get("AWS_PSQL_HOST"): + DATABASES = { + "default": { + "ENGINE": "django.db.backends.postgresql", + "HOST": os.getenv("AWS_PSQL_HOST"), + "PORT": os.getenv("AWS_PSQL_PORT"), + "NAME": os.getenv("AWS_PSQL_DATABASE"), + "USER": os.getenv("AWS_PSQL_USER_ID"), + "PASSWORD": os.getenv("AWS_PSQL_PW"), + } + } +else: + DATABASES = { + "default": { + "ENGINE": "django.db.backends.mysql", + "NAME": os.getenv("AWS_RDS_DATABASE"), + "USER": os.getenv("AWS_RDS_USER_ID"), + "PASSWORD": os.getenv("AWS_RDS_PW"), + "HOST": os.getenv("AWS_RDS_HOST"), + "PORT": os.getenv("AWS_RDS_PORT"), + } } -} # django-storages: S3 del MEDIA_ROOT diff --git a/pyconkr/settings-prod.py b/pyconkr/settings-prod.py index 30d8047..cbe8b52 100644 --- a/pyconkr/settings-prod.py +++ b/pyconkr/settings-prod.py @@ -13,17 +13,28 @@ ] # RDS -DATABASES = { - "default": { - # "ENGINE": "mysql.connector.django", - "ENGINE": "django.db.backends.mysql", - "NAME": os.getenv("AWS_RDS_DATABASE"), - "USER": os.getenv("AWS_RDS_USER_ID"), - "PASSWORD": os.getenv("AWS_RDS_PW"), - "HOST": os.getenv("AWS_RDS_HOST"), - "PORT": os.getenv("AWS_RDS_PORT"), +if os.environ.get("AWS_PSQL_HOST"): + DATABASES = { + "default": { + "ENGINE": "django.db.backends.postgresql", + "HOST": os.getenv("AWS_PSQL_HOST"), + "PORT": os.getenv("AWS_PSQL_PORT"), + "NAME": os.getenv("AWS_PSQL_DATABASE"), + "USER": os.getenv("AWS_PSQL_USER_ID"), + "PASSWORD": os.getenv("AWS_PSQL_PW"), + } + } +else: + DATABASES = { + "default": { + "ENGINE": "django.db.backends.mysql", + "NAME": os.getenv("AWS_RDS_DATABASE"), + "USER": os.getenv("AWS_RDS_USER_ID"), + "PASSWORD": os.getenv("AWS_RDS_PW"), + "HOST": os.getenv("AWS_RDS_HOST"), + "PORT": os.getenv("AWS_RDS_PORT"), + } } -} # django-storages: S3 del MEDIA_ROOT diff --git a/requirements-local.txt b/requirements-local.txt index fcdeb46..33f3679 100644 --- a/requirements-local.txt +++ b/requirements-local.txt @@ -23,3 +23,4 @@ django-cors-headers==3.14.0 requests==2.28.2 django-picklefield==3.1 setuptools==74.1.2 +psycopg2-binary==2.9.10 diff --git a/requirements.txt b/requirements.txt index 2b9839a..b279e93 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,3 +26,4 @@ django-cors-headers==3.14.0 requests==2.28.2 PyFunctional==1.4.3 pymysql==1.0.3 +psycopg2-binary==2.9.10