fix: reminder

Author: andresionek91

.github/actions/setup/action.yaml

@@ -16,7 +16,7 @@ inputs:
   poetry_version:
     description: Poetry version
     required: false
-    default: 1.8.3
+    default: 2.0.0
 
 runs:
   using: composite

functions/download_service/Dockerfile.lambda

@@ -5,7 +5,6 @@ LABEL language=python \
     runtime=aws-lambda \
     extras=poetry
 
-ARG LAMBDA_INSIGHTS_VERSION=1.0.229.0
 ENV POETRY_VIRTUALENVS_CREATE=false
 ENV PATH="/root/.local/bin:$PATH"
 
@@ -16,14 +15,13 @@ WORKDIR /
 
 # Install python poetry
 # Install Lambda Insights
-RUN curl -sSL https://install.python-poetry.org | python3 - \
-    && curl -O https://lambda-insights-extension.s3-ap-northeast-1.amazonaws.com/amazon_linux/lambda-insights-extension.${LAMBDA_INSIGHTS_VERSION}.rpm \
-    && rpm -U lambda-insights-extension.${LAMBDA_INSIGHTS_VERSION}.rpm \
-    && rm -f lambda-insights-extension.${LAMBDA_INSIGHTS_VERSION}.rpm
+RUN curl -sSL https://install.python-poetry.org | python3 -
 
 # Copy the dependencies files to the Docker image
 COPY pyproject.toml poetry.lock /
 
+RUN poetry self add poetry-plugin-export@latest
+
 # Extract dependencies from poetry.lock and install them with pip
 RUN poetry export --format requirements.txt --without-hashes --output requirements.txt && \
     pip3 install -r requirements.txt --target "${LAMBDA_TASK_ROOT}" --no-cache-dir --no-deps

functions/download_service/code/repos/download.py

@@ -134,8 +134,8 @@ async def remind(
             .group_by(Download.email, Download.name, Download.country_code)
             .having(
                 func.sum(cast(Download.is_downloaded, Integer)) == 0,
-                func.count() == 1,
-                func.max(Download.expires_at) > dt.datetime.now(dt.UTC) + dt.timedelta(days=2),
+                func.count() <= 2,
+                func.max(Download.expires_at) < dt.datetime.now(dt.UTC),
             )
         )
 

functions/download_service/poetry.lock

@@ -5,6 +5,9 @@ description = "Download service API Handler"
 authors = ["Andre Sionek <[email protected]>"]
 package-mode = false
 
+[tool.poetry.requires-plugins]
+poetry-plugin-export = ">1.8"
+
 [tool.poetry.dependencies]
 python = "^3.11"
 aws-lambda-powertools = {version = "^3.2.0", extras = ["tracer"]}
@@ -19,6 +22,7 @@ sqlmodel = "^0.0.22"
 alembic = "^1.14.0"
 sqlalchemy = "^2.0.32"
 asyncpg = "^0.29.0"
+poetry = "^2.0.0"
 
 [tool.poetry.group.test]
 optional = true

functions/download_service/pyproject.toml

@@ -5,7 +5,6 @@ LABEL language=python \
     runtime=aws-lambda \
     extras=poetry
 
-ARG LAMBDA_INSIGHTS_VERSION=1.0.229.0
 ENV POETRY_VIRTUALENVS_CREATE=false
 ENV PATH="/root/.local/bin:$PATH"
 
@@ -15,15 +14,13 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 WORKDIR /
 
 # Install python poetry
-# Install Lambda Insights
-RUN curl -sSL https://install.python-poetry.org | python3 - \
-    && curl -O https://lambda-insights-extension.s3-ap-northeast-1.amazonaws.com/amazon_linux/lambda-insights-extension.${LAMBDA_INSIGHTS_VERSION}.rpm \
-    && rpm -U lambda-insights-extension.${LAMBDA_INSIGHTS_VERSION}.rpm \
-    && rm -f lambda-insights-extension.${LAMBDA_INSIGHTS_VERSION}.rpm
+RUN curl -sSL https://install.python-poetry.org | python3 -
 
 # Copy the dependencies files to the Docker image
 COPY pyproject.toml poetry.lock /
 
+RUN poetry self add poetry-plugin-export@latest
+
 # Extract dependencies from poetry.lock and install them with pip
 RUN poetry export --format requirements.txt --without-hashes --output requirements.txt && \
     pip3 install -r requirements.txt --target "${LAMBDA_TASK_ROOT}" --no-cache-dir --no-deps