Skip to content

Commit

Permalink
6 scheduled production worker
Browse files Browse the repository at this point in the history
  • Loading branch information
Asirwad committed Aug 2, 2024
1 parent 84f613e commit 7b12d94
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 10 deletions.
53 changes: 53 additions & 0 deletions .github/workflows/6-scheduled-production-worker.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: 6 scheduled production worker

on:
workflow_dispatch:
schedule:
- cron: '0 1,12 * * *'
- cron: '0 4 1 * *'

jobs:
test:
runs-on: ubuntu-latest
env:
DJANGO_DEBUG: 0
STRIPE_SECRET_KEY: ${{ secrets.STRIPE_SECRET_KEY }}
NEON_API_KEY: ${{ secrets.NEON_API_KEY }}
NEON_PROD_BRANCH: "main"
NEON_PROJECT_ID: ${{ secrets.NEON_PROJECT_ID }}
steps:
- name: Checkout Code
uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Setup NodeJs
uses: actions/setup-node@v4
with:
node-version: '20.11'
- name: Install Neon CLI
run: |
npm install -g neonctl
- name: Database URL Env Val for new Github Actions branch
run: |
MY_NEON_CONN_STRING=$(neonctl connection-string --branch "${{ env.NEON_PROD_BRANCH }}" --project-id "${{ env.NEON_PROJECT_ID }}")
echo "DATABASE_URL=$MY_NEON_CONN_STRING" >> $GITHUB_ENV
- name: Setup Django Secret key
run: |
MY_GEN_KEY=$(openssl rand -base64 32)
echo "DJANGO_SECRET_KEY=$MY_GEN_KEY" >> $GITHUB_ENV
- name: Install Requirements
run: |
python -m pip install pip --upgrade
python -m pip install -r requirements.txt
- name: Django Users sync stripe subscriptions
working-directory: ./src
if: github.event.schedule != '0 4 1 * *'
run: |
python manage.py sync_user_subs --day-start 0 --day-end 1
- name: Django Users clear dangling stripe subscriptions
working-directory: ./src
if: github.event.schedule == '0 4 1 * *'
run: |
python manage.py sync_user_subs --clear-dangling
4 changes: 2 additions & 2 deletions src/subscriptions/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,13 @@ class SubscriptionStatus(models.TextChoices):
PAUSED = "paused", "Paused"

class UserSubscriptionQuerySet(models.QuerySet):
def by_days_range(self, days_start=7,days_end=120):
def by_days_range(self, days_start=7,days_end=120, verbose=True):
now = timezone.now()
days_start_from_now = now + datetime.timedelta(days=days_start)
days_end_from_now = now + datetime.timedelta(days=days_end)
range_start = days_start_from_now.replace(hour=0, minute=0, second=0, microsecond=0)
range_end = days_end_from_now.replace(hour=23, minute=59, second=59, microsecond=59)

if verbose: print("range_start", range_start, "range_end", range_end)
return self.filter(
current_period_end__gte=range_start,
current_period_end__lte=range_end
Expand Down
16 changes: 8 additions & 8 deletions src/subscriptions/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@
def refresh_users_subscription(
user_ids=None,
active_only=True,
days_ago=0,
days_left=0,
day_start=0,
day_end=0,
days_ago=-1,
days_left=-1,
day_start=-1,
day_end=-1,
verbose=False
):
qs = UserSubscription.objects.all()
if active_only:
qs = qs.by_active_trailing()
if user_ids is not None:
qs = qs.by_user_ids(user_ids=user_ids)
if days_ago>0:
if days_ago>-1:
qs = qs.by_days_ago(days_ago=days_ago)
if days_left > 0:
if days_left > -1:
qs = qs.by_days_left(days_left=days_left)
if day_start > 0 and day_end > 0:
qs = qs.by_days_range(days_start=day_start, days_end=day_end)
if day_start > -1 and day_end > -1:
qs = qs.by_days_range(days_start=day_start, days_end=day_end, verbose=verbose)

complete_count, qs_count = 0, qs.count()
for obj in qs:
Expand Down

0 comments on commit 7b12d94

Please sign in to comment.