fix: admin panel delete domain and time calculation (#2449)

* fix(admin): only show delete domain if domain is not pending to be deleted

* fix(oneshot): oneshot script removal and time calculation fix

oneshot/schedule_sync_subscription_job.py

@@ -45,7 +45,7 @@ def process(start_pu_id: int, end_pu_id: int, step: int, only_lifetime: bool):
         if remaining == 0:
             mins_remaining = 0
         else:
-            mins_remaining = (time_per_user / remaining) / 60
+            mins_remaining = (time_per_user * remaining) / 60
         print(
             f"PartnerUser {batch_start}/{end_pu_id} | processed = {processed} | {mins_remaining:.2f} mins remaining"
         )

oneshot/schedule_sync_user_job.py

@@ -1,123 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import sys
-import time
-
-from sqlalchemy import func
-from typing import Optional
-
-from app.jobs.send_event_job import SendEventToWebhookJob
-from app.db import Session
-from app.events.generated.event_pb2 import UserPlanChanged, EventContent
-from app.models import PartnerUser, User
-
-
-def process(start_pu_id: int, end_pu_id: int, step: int, only_lifetime: bool):
-    print(
-        f"Checking partner user {start_pu_id} to {end_pu_id} (step={step}) (only_lifetime={only_lifetime})"
-    )
-    start_time = time.time()
-    with_lifetime = 0
-    with_plan = 0
-    with_free = 0
-    for batch_start in range(start_pu_id, end_pu_id, step):
-        query = (
-            Session.query(User)
-            .join(PartnerUser, PartnerUser.user_id == User.id)
-            .filter(PartnerUser.id >= batch_start, PartnerUser.id < batch_start + step)
-        )
-        if only_lifetime:
-            query = query.filter(
-                User.lifetime == True,  # noqa :E712
-            )
-        users = query.all()
-        for user in users:
-            # Just in case the == True cond is wonky
-            if user.lifetime:
-                event = UserPlanChanged(lifetime=True)
-                with_lifetime += 1
-            else:
-                plan_end = user.get_active_subscription_end(
-                    include_partner_subscription=False
-                )
-                if plan_end:
-                    event = UserPlanChanged(plan_end_time=plan_end.timestamp)
-                    with_plan += 1
-                else:
-                    event = UserPlanChanged()
-                    with_free += 1
-            job = SendEventToWebhookJob(
-                user=user, event=EventContent(user_plan_change=event)
-            )
-            job.store_job_in_db(run_at=None, commit=False)
-            Session.flush()
-        Session.commit()
-        elapsed = time.time() - start_time
-        last_batch_id = batch_start + step
-        time_per_user = elapsed / last_batch_id
-        remaining = end_pu_id - last_batch_id
-        time_remaining = remaining / time_per_user
-        hours_remaining = time_remaining / 60.0
-        print(
-            f"PartnerUser {batch_start}/{end_pu_id} lifetime {with_lifetime} paid {with_plan} free {with_free} {hours_remaining:.2f} mins remaining"
-        )
-        print(f"Sent lifetime {with_lifetime} paid {with_plan} free {with_free}")
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        prog="Schedule Sync User Jobs", description="Create jobs to sync users"
-    )
-    parser.add_argument(
-        "-s", "--start_pu_id", default=0, type=int, help="Initial partner_user_id"
-    )
-    parser.add_argument(
-        "-e", "--end_pu_id", default=0, type=int, help="Last partner_user_id"
-    )
-    parser.add_argument("-t", "--step", default=10000, type=int, help="Step to use")
-    parser.add_argument("-u", "--user", default="", type=str, help="User to sync")
-    parser.add_argument(
-        "-l", "--lifetime", action="store_true", help="Only sync lifetime users"
-    )
-
-    args = parser.parse_args()
-    start_pu_id = args.start_pu_id
-    end_pu_id = args.end_pu_id
-    user_id = args.user
-    only_lifetime = args.lifetime
-    step = args.step
-
-    if not end_pu_id:
-        end_pu_id = Session.query(func.max(PartnerUser.id)).scalar()
-
-    if user_id:
-        try:
-            user_id = int(user_id)
-        except ValueError:
-            user = User.get_by(email=user_id)
-            if not user:
-                print(f"User {user_id} not found")
-                sys.exit(1)
-            user_id = user.id
-        print(f"Limiting to user {user_id}")
-        partner_user: Optional[PartnerUser] = PartnerUser.get_by(user_id=user_id)
-        if not partner_user:
-            print(f"Could not find PartnerUser for user_id={user_id}")
-            sys.exit(1)
-
-        # So we only have one loop
-        step = 1
-        start_pu_id = partner_user.id
-        end_pu_id = partner_user.id
-
-    process(
-        start_pu_id=start_pu_id,
-        end_pu_id=end_pu_id,
-        step=step,
-        only_lifetime=only_lifetime,
-    )
-
-
-if __name__ == "__main__":
-    main()

templates/admin/custom_domain_search.html

@@ -163,9 +163,12 @@
               action="{{ url_for("admin.custom_domain_search.delete_custom_domain") }}"
               method="POST">
             <input type="hidden" name="domain_id" value="{{ domain.id }}">
+
+            {% if domain_with_data.domain_pending_deletion == False %}
             <button type="submit"
                     onclick="return confirm('Are you sure you would like to delete the custom domain?');"
                     class="btn btn-danger w-100">Delete</button>
+            {% endif %}
         </form>
       </div>
     </div>