Mirrors/plane
1
0
Fork 0
mirror of https://github.com/makeplane/plane.git synced 2026-07-14 14:31:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: workspace license cron subscription (#869)

Browse Source
This commit is contained in:
Nikhil
2024-08-19 19:32:29 +05:30
committed by GitHub
parent a7a404f990
commit 75120cc5b6
2 changed files with 23 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
apiserver/plane/payment/bgtasks/workspace_subscription_sync_task.py
View File

@@ -4,24 +4,36 @@ import os
# Django imports
from django.conf import settings
from django.db.models import F
from django.db.models import F, Q
# Third party imports
from celery import shared_task
# Module imports
from plane.db.models import Workspace, WorkspaceMember
from plane.db.models import WorkspaceMember
from plane.ee.models import WorkspaceLicense
from plane.utils.exception_logger import log_exception
@shared_task
def workspace_member_sync_payment_task(slug):
try:
# Do not run this task if payment server base url is not set
if settings.PAYMENT_SERVER_BASE_URL:
# workspace from slug
workspace = Workspace.objects.filter(slug=slug).first()
workspace_id = str(workspace.id)
def workspace_billing_task(batch_size=1000, offset=0):
# Get total count of workspaces
total_workspaces = WorkspaceLicense.objects.filter(~Q(plan="FREE")).count()
# Process one batch of workspaces
end_offset = min(offset + batch_size, total_workspaces)
# Get the workspaces that are not free
workspaces = WorkspaceLicense.objects.filter(~Q(plan="FREE"))[
offset:end_offset
].values("workspace_id", "workspace__slug")
# Loop through workspaces in the current batch
for workspace in workspaces:
# Check if workspace subscription
try:
workspace_id = str(workspace["workspace_id"])
workspace_slug = workspace["workspace__slug"]
# Get all active workspace members
workspace_members = (
@@ -46,7 +58,7 @@ def workspace_member_sync_payment_task(slug):
response = requests.patch(
f"{settings.PAYMENT_SERVER_BASE_URL}/api/workspaces/{workspace_id}/subscriptions/",
json={
"slug": slug,
"slug": workspace_slug,
"workspace_id": str(workspace_id),
"members_list": list(workspace_members),
},
@@ -65,45 +77,6 @@ def workspace_member_sync_payment_task(slug):
# Invalid request
else:
return
else:
return
except requests.exceptions.RequestException as e:
log_exception(e)
return
except Exception as e:
log_exception(e)
return
@shared_task
def workspace_billing_task(batch_size=1000, offset=0):
# Get total count of workspaces
total_workspaces = Workspace.objects.count()
# Process one batch of workspaces
end_offset = min(offset + batch_size, total_workspaces)
workspaces = Workspace.objects.all()[offset:end_offset].values(
"id", "slug"
)
# Loop through workspaces in the current batch
for workspace in workspaces:
# Check if workspace subscription
try:
response = requests.get(
f"{settings.PAYMENT_SERVER_BASE_URL}/api/subscriptions/status/{str(workspace['id'])}/",
headers={
"content-type": "application/json",
"x-api-key": settings.PAYMENT_SERVER_AUTH_TOKEN,
},
)
# Check if the response is successful
response.raise_for_status()
# Return the response
response = response.json()
# Check if the response contains the product key
if response.get("status"):
workspace_member_sync_payment_task.delay(workspace["slug"])
except Exception as e:
log_exception(e)

2
apiserver/plane/payment/utils/workspace_license_request.py
View File

@@ -42,7 +42,7 @@ def resync_workspace_license(workspace_slug, force=False):
# If the license is present, then check if the last sync is more than 1 hour
if workspace_license:
# If the last sync is more than 1 hour, then sync the license
# If the last sync is more than 1 hour, then sync the license or if force is True
if (
workspace_license.last_synced_at - timezone.now()
).total_seconds() > 3600 or force: