From 84236532ef8da8acee200e8ff9a8be8858accde1 Mon Sep 17 00:00:00 2001 From: spwoodcock Date: Mon, 16 Sep 2024 23:17:23 +0100 Subject: [PATCH] build: rename fmtm-public-beta --> hotosm in all code --- src/backend/app/auth/roles.py | 6 +++--- src/backend/app/organisations/organisation_crud.py | 10 +++++----- src/backend/tests/conftest.py | 6 +----- src/frontend/e2e/01-create-new-project.spec.ts | 2 +- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/backend/app/auth/roles.py b/src/backend/app/auth/roles.py index 5da2934df6..b05e90a438 100644 --- a/src/backend/app/auth/roles.py +++ b/src/backend/app/auth/roles.py @@ -65,7 +65,7 @@ async def check_access( Access is determined based on the user's role and permissions: - If the user has an 'ADMIN' role, access is granted. - If the user has a 'READ_ONLY' role, access is denied. - - If the organisation is the public beta, then grant access. + - If the organisation is HOTOSM, then grant access. - For other roles, access is granted if the user is an organisation manager for the specified organisation (org_id) or has the specified role in the specified project (project_id). @@ -95,13 +95,13 @@ async def check_access( SELECT 1 FROM organisations WHERE (organisations.id = :org_id - AND organisations.slug = 'fmtm-public-beta') + AND organisations.slug = 'hotosm') OR EXISTS ( SELECT 1 FROM projects JOIN organisations AS org ON projects.organisation_id = org.id - WHERE org.slug = 'fmtm-public-beta' + WHERE org.slug = 'hotosm' AND projects.id = :project_id ) ) THEN true diff --git a/src/backend/app/organisations/organisation_crud.py b/src/backend/app/organisations/organisation_crud.py index 3c07871776..796c5e17b1 100644 --- a/src/backend/app/organisations/organisation_crud.py +++ b/src/backend/app/organisations/organisation_crud.py @@ -44,7 +44,7 @@ async def init_admin_org(db: Session): -- Start a transaction BEGIN; - -- Insert FMTM Public Beta organisation + -- Insert HOTOSM organisation INSERT INTO public.organisations ( name, slug, @@ -58,10 +58,10 @@ async def init_admin_org(db: Session): odk_central_password ) VALUES ( - 'FMTM Public Beta', - 'fmtm-public-beta', + 'HOTOSM', + 'hotosm', 'https://avatars.githubusercontent.com/u/458752?s=280&v=4', - 'HOTOSM Public Beta for FMTM.', + 'Humanitarian OpenStreetMap Team.', 'https://hotosm.org', 'FREE', true, @@ -106,7 +106,7 @@ async def init_admin_org(db: Session): -- Set localadmin user as org admin WITH org_cte AS ( SELECT id FROM public.organisations - WHERE name = 'FMTM Public Beta' + WHERE name = 'HOTOSM' ) INSERT INTO public.organisation_managers (organisation_id, user_id) SELECT (SELECT id FROM org_cte), :admin_user_id diff --git a/src/backend/tests/conftest.py b/src/backend/tests/conftest.py index 34070ff5d6..dacecd0aa5 100644 --- a/src/backend/tests/conftest.py +++ b/src/backend/tests/conftest.py @@ -116,11 +116,7 @@ async def admin_user(db): @pytest.fixture(scope="function") def organisation(db): """A test organisation.""" - return ( - db.query(DbOrganisation) - .filter(DbOrganisation.name == "FMTM Public Beta") - .first() - ) + return db.query(DbOrganisation).filter(DbOrganisation.name == "HOTOSM").first() @pytest.fixture(scope="function") diff --git a/src/frontend/e2e/01-create-new-project.spec.ts b/src/frontend/e2e/01-create-new-project.spec.ts index bdd03a8f96..96395ff6b6 100644 --- a/src/frontend/e2e/01-create-new-project.spec.ts +++ b/src/frontend/e2e/01-create-new-project.spec.ts @@ -30,7 +30,7 @@ test('create new project', async ({ browserName, page }) => { await page.locator('#description').click(); await page.locator('#description').fill('desc'); await page.getByRole('combobox').click(); - await page.getByLabel('FMTM Public Beta').click(); + await page.getByLabel('HOTOSM').click(); await page.getByRole('button', { name: 'NEXT' }).click(); // 2. Upload Area Step