chore: remove v1 location endpoints from gateway #11129

jamil314 · 2025-11-21T06:01:15Z

Description

Clearly describe what has been changed. Include relevant context or background.
Explain how the issue was fixed (if applicable) and the root cause.

Link this pull request to the GitHub issue (and optionally name the branch ocrvs-<issue #>)

Checklist

I have linked the correct Github issue under "Development"
I have tested the changes locally, and written appropriate tests
I have tested beyond the happy path (e.g. edge cases, failure paths)
I have updated the changelog with this change (if applicable)
I have updated the GitHub issue status accordingly

makelicious

Looks good!
Let's add test cases so we know it works.

Whatever we use externalId for
data-seeder related changes.

makelicious · 2025-12-02T07:33:52Z

packages/client/src/App.test.tsx

-
-  it('loads languages, facilities and locations on startup', async () => {
-    const loadFacilities = vi.spyOn(referenceApi, 'loadFacilities')
-    const loadContent = vi.spyOn(referenceApi, 'loadContent')


content test might still have value?

makelicious · 2025-12-02T07:40:23Z

packages/events/src/storage/postgres/events/locations.ts

+      'parentId',
+      'validUntil',
+      'locationType',
+      'externalId'


test case needed for external id. what is the need?

Locations are read from csv file for seeding. id is generated during seeding. externalId is for referring to the csv row for each location.

When seeding user, their primary office is referred to as the externalId from the locations csv.

makelicious · 2025-12-02T07:40:53Z

packages/gateway/src/features/user/type-resolvers.ts

    },
-    async primaryOffice(userModel: IUserModelData, _, { dataSources }) {
-      return dataSources.locationsAPI.getLocation(userModel.primaryOfficeId)
+    async primaryOffice(userModel: IUserModelData, _, { headers }) {


Do we have corresponding scopes? anything to check

makelicious · 2025-12-02T07:40:57Z

packages/migration/src/migrations/events/1764168039557_add_back_external_id_in_locations.sql

@@ -0,0 +1,7 @@
+-- Up Migration
+ALTER TABLE locations ADD COLUMN external_id text UNIQUE;


What was the need, does administrative_areas need the same? We should have similar rows there

makelicious · 2025-12-02T07:41:09Z

packages/events/src/router/locations/__snapshots__/locations.set.test.ts.snap

intentional?

makelicious · 2025-12-02T07:42:54Z

packages/events/src/tests/generators.ts

        validUntil: null,
+        externalId:
+          location.externalId ??
+          generateTrackingId(prng) + generateTrackingId(prng),


Original externalIds are 11 characters long, TrackingIds are 6 characters.

makelicious · 2025-12-02T07:43:13Z

packages/events/package.json

    "build:clean": "rm -rf build",
    "generate-db-types": "kanel && prettier src/storage/postgres/events/schema --write",
-    "generate-db-schema": "docker run --rm postgres:17.6 pg_dump postgres://events_migrator:[email protected]:5432/events -s > src/tests/postgres-migrations.sql --exclude-schema=analytics"
+    "generate-db-schema": "docker run --rm postgres:17.6 pg_dump postgres://events_migrator:migrator_password@$( [[ '$OSTYPE' == darwin* ]] && echo host.docker.internal || echo 172.17.0.1 ):5432/events -s > src/tests/postgres-migrations.sql --exclude-schema=analytics"


what is the need?

host.docker.internal does not work for linux.

makelicious · 2025-12-02T07:44:10Z

packages/client/src/utils/referenceApi.ts

  }
 }

 async function loadLocations(): Promise<ILocationDataResponse> {


remove? no reason to return empty.

… into ocrvs-11067

chore: remove v1 location endpoints from gateway

e9a9df1

This comment has been minimized.

Sign in to view

jamil314 added 10 commits November 27, 2025 13:05

fix: directly seed v2 db

9a6c288

Merge branch 'develop' into ocrvs-11067

fa5cbca

fix: remove restrict-unrestrict

86af329

fix: events tests

0b8f3e7

fix: update V2_DEFAULT_MOCK_LOCATIONS to include externalId

c7aaad6

fix: update snapshot

eeb0141

chore: remove location endpoints from config

cace967

fix: remove craeteLocation from routes

e6a3fe3

fix: extract externalId corrently while seeding user

7ab6bbe

chore: remove unused export

5f56c34

jamil314 force-pushed the ocrvs-11067 branch from f475ef4 to eb69f57 Compare November 28, 2025 12:07

docs: update changelog

2ae48a1

jamil314 force-pushed the ocrvs-11067 branch from eb69f57 to 2ae48a1 Compare November 28, 2025 12:21

chore: add toolkit as a dependency of data-seeder

ca34702

jamil314 linked an issue Nov 28, 2025 that may be closed by this pull request

Delete location endpoints from Gateway, ensure Events service has all the same functionality now (3) #11067

Open

jamil314 added 5 commits December 1, 2025 18:10

fix: fetch v2 location in user type resolver

c854932

chore: remove v1 location prefetching from redux

7c3b422

Merge branch 'develop' into ocrvs-11067

8bc3eaa

chore: remove v1 location tests

a2dc35a

Merge branch 'develop' into ocrvs-11067

072d6f1

makelicious reviewed Dec 2, 2025

View reviewed changes

jamil314 added 7 commits December 3, 2025 00:01

fix: use v2 locations in organisation and team pages

e5cae03

fix: remove performance button and routes

66a2b44

fix: types

56194de

Merge branch 'ocrvs-11067' of https://github.com/opencrvs/opencrvs-core…

4180800

… into ocrvs-11067

fix: types

3dde8bb

Merge branch 'develop' into ocrvs-11067

4a23b29

fix: keep both v1 and v2 utils

7fcf254

jamil314 and others added 9 commits December 4, 2025 13:57

fix: use v2 location utils

5e90996

fix: LocationPicker and UserList tests

6a28fb9

Merge branch 'develop' into ocrvs-11067

66f91af

fix: addressName

0ede7d5

fix: remove v1 tests

af1c389

Merge branch 'develop' into ocrvs-11067

055052d

fix: include externalId while seeding

faa7d5c

chore: remove CompletenessRates test

ae13720

test: mock useLocations globally in tests

e846263

Zangetsu101 added the Skip e2e Helps run lint/unit test only for faster feedback. Remove before merge. label Dec 9, 2025

Zangetsu101 added 3 commits December 9, 2025 20:24

test: use v2 mock locations in AdministrativeLevels tests

482d44d

test: use original implementation of getLeafLocationIds

87780c2

test: blur inputs to reduce flakiness

daf2a11

Zangetsu101 removed the Skip e2e Helps run lint/unit test only for faster feedback. Remove before merge. label Dec 10, 2025

Zangetsu101 and others added 9 commits December 10, 2025 14:56

chore: remove unused exports

ffc02cf

Merge branch 'develop' into ocrvs-11067

768543f

test: restore deleted birth mock draft

692f954

test: remove remaining unused exports

10fcaaf

Merge branch 'develop' into ocrvs-11067

aa02c0b

Merge branch 'develop' into ocrvs-11067

ded763f

feat: expose getLocationHierarchy through trpc

80ff25f

fix: user creation flow

114e426

fix: add externalId

96a5ce8

		@@ -0,0 +1,7 @@
		-- Up Migration
		ALTER TABLE locations ADD COLUMN external_id text UNIQUE;

chore: remove v1 location endpoints from gateway #11129

Are you sure you want to change the base?

chore: remove v1 location endpoints from gateway #11129

Conversation

jamil314 commented Nov 21, 2025

Description

Checklist

Uh oh!

This comment has been minimized.

makelicious left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants