adjust registered by to managed by on db aslo remove url and api key on adding sites for gm
This commit is contained in:
1 parent
64b37b6b6d
commit
521f36d22d
15 files changed
+112
-75
No files matched your search
@@ -18,9 +18,9 @@ def ensure_hq_site_for_active_site(active_site: ActiveSite) -> Site:
|
||||
if existing:
|
||||
return existing
|
||||
|
||||
owner = active_site.registered_by
|
||||
owner = active_site.managed_by
|
||||
if owner is None:
|
||||
raise ValueError("ActiveSite.registered_by is required to create an HQ site.")
|
||||
raise ValueError("ActiveSite.managed_by is required to create an HQ site.")
|
||||
|
||||
site_name = (active_site.name or active_site.code or "Site")[:30]
|
||||
orphan = (
|
||||
|
||||
@@ -11,12 +11,12 @@ from apps.sync.models import ActiveSite
|
||||
|
||||
|
||||
def _gm_visible_site(*, owner: User, site_name: str, code: str) -> Site:
|
||||
"""GM scope only sees sites linked to an ActiveSite they registered."""
|
||||
"""GM scope only sees sites linked to an ActiveSite they manage."""
|
||||
active_site = ActiveSite.objects.create(
|
||||
code=code,
|
||||
name=site_name,
|
||||
api_base_url=f"https://{code}.example/api/v1",
|
||||
registered_by=owner,
|
||||
managed_by=owner,
|
||||
)
|
||||
return Site.objects.create(
|
||||
site_name=site_name, user=owner, active_site=active_site
|
||||
|
||||
@@ -48,7 +48,7 @@ def _upsert_mirror_cycle_from_ingest(active_site: ActiveSite, payload: dict) ->
|
||||
|
||||
site_name = str(payload.get("site_name") or active_site.name)[:30]
|
||||
kandang_name = str(payload.get("kandang_name") or "Kandang")[:30]
|
||||
owner = active_site.registered_by
|
||||
owner = active_site.managed_by
|
||||
if owner is None:
|
||||
owner = User.objects.filter(status=User.STATUS_GM).first()
|
||||
if owner is None:
|
||||
|
||||
Reference in new issue
Block a user