-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: analytics module gets and updates PlanX DB (#4071)
- Loading branch information
Showing
7 changed files
with
193 additions
and
3 deletions.
There are no files selected for viewing
93 changes: 92 additions & 1 deletion
93
api.planx.uk/modules/analytics/metabase/collection/collection.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,92 @@ | ||
test.todo("should test collection check and creation"); | ||
import { $api } from "../../../../client/index.js"; | ||
import { updateMetabaseId } from "./updateMetabaseId.js"; | ||
import { getTeamIdAndMetabaseId } from "./getTeamIdAndMetabaseId.js"; | ||
|
||
describe("getTeamIdAndMetabaseId", () => { | ||
beforeEach(() => { | ||
vi.clearAllMocks(); | ||
}); | ||
|
||
test("successfully gets team and existing metabase id", async () => { | ||
vi.spyOn($api.client, "request").mockResolvedValue({ | ||
teams: [ | ||
{ | ||
id: 26, | ||
slug: "barnet", | ||
metabaseId: 20, | ||
}, | ||
], | ||
}); | ||
|
||
const teamAndMetabaseId = await getTeamIdAndMetabaseId("barnet"); | ||
|
||
expect(teamAndMetabaseId.id).toEqual(26); | ||
expect(teamAndMetabaseId.metabaseId).toEqual(20); | ||
}); | ||
|
||
test("handles team with null metabase id", async () => { | ||
vi.spyOn($api.client, "request").mockResolvedValue({ | ||
teams: [ | ||
{ | ||
id: 26, | ||
slug: "barnet", | ||
metabaseId: null, | ||
}, | ||
], | ||
}); | ||
|
||
const teamAndMetabaseId = await getTeamIdAndMetabaseId("Barnet"); | ||
|
||
expect(teamAndMetabaseId.id).toEqual(26); | ||
expect(teamAndMetabaseId.metabaseId).toBeNull(); | ||
}); | ||
}); | ||
|
||
describe("updateMetabaseId", () => { | ||
beforeEach(() => { | ||
vi.clearAllMocks(); | ||
}); | ||
|
||
test("successfully updates metabase ID", async () => { | ||
// Mock the GraphQL request | ||
vi.spyOn($api.client, "request").mockResolvedValue({ | ||
update_teams: { | ||
returning: [ | ||
{ | ||
id: 1, | ||
slug: "testteam", | ||
metabase_id: 123, | ||
}, | ||
], | ||
}, | ||
}); | ||
|
||
const result = await updateMetabaseId(1, 123); | ||
|
||
expect(result).toEqual({ | ||
update_teams: { | ||
returning: [ | ||
{ | ||
id: 1, | ||
slug: "testteam", | ||
metabase_id: 123, | ||
}, | ||
], | ||
}, | ||
}); | ||
|
||
expect($api.client.request).toHaveBeenCalledWith(expect.any(String), { | ||
id: 1, | ||
metabaseId: 123, | ||
}); | ||
}); | ||
|
||
test("handles GraphQL error", async () => { | ||
// Mock a failed GraphQL request | ||
vi.spyOn($api.client, "request").mockRejectedValue( | ||
new Error("GraphQL error"), | ||
); | ||
|
||
await expect(updateMetabaseId(1, 123)).rejects.toThrow("GraphQL error"); | ||
}); | ||
}); |
38 changes: 38 additions & 0 deletions
38
api.planx.uk/modules/analytics/metabase/collection/getTeamIdAndMetabaseId.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
import { gql } from "graphql-request"; | ||
import { $api } from "../../../../client/index.js"; | ||
|
||
interface GetMetabaseId { | ||
teams: { | ||
id: number; | ||
slug: string; | ||
metabaseId: number | null; | ||
}[]; | ||
} | ||
|
||
export const getTeamIdAndMetabaseId = async (slug: string) => { | ||
try { | ||
const response = await $api.client.request<GetMetabaseId>( | ||
gql` | ||
query GetTeamAndMetabaseId($slug: String!) { | ||
teams(where: { slug: { _eq: $slug } }) { | ||
id | ||
slug | ||
metabaseId: metabase_id | ||
} | ||
} | ||
`, | ||
{ | ||
slug: slug, | ||
}, | ||
); | ||
|
||
const result = response.teams[0]; | ||
return result; | ||
} catch (e) { | ||
console.error( | ||
"Error fetching team's ID / Metabase ID from PlanX DB:", | ||
(e as Error).stack, | ||
); | ||
throw e; | ||
} | ||
}; |
43 changes: 43 additions & 0 deletions
43
api.planx.uk/modules/analytics/metabase/collection/updateMetabaseId.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
import { gql } from "graphql-request"; | ||
import { $api } from "../../../../client/index.js"; | ||
|
||
interface UpdateMetabaseId { | ||
teams: { | ||
id: number; | ||
slug: string; | ||
metabaseId: number; | ||
}; | ||
} | ||
|
||
/** Updates column `metabase_id` in the Planx DB `teams` table */ | ||
export const updateMetabaseId = async (teamId: number, metabaseId: number) => { | ||
try { | ||
const response = await $api.client.request<UpdateMetabaseId>( | ||
gql` | ||
mutation UpdateTeamMetabaseId($id: Int!, $metabaseId: Int!) { | ||
update_teams( | ||
where: { id: { _eq: $id } } | ||
_set: { metabase_id: $metabaseId } | ||
) { | ||
returning { | ||
id | ||
slug | ||
metabase_id | ||
} | ||
} | ||
} | ||
`, | ||
{ | ||
id: teamId, | ||
metabaseId: metabaseId, | ||
}, | ||
); | ||
return response; | ||
} catch (e) { | ||
console.error( | ||
"There's been an error while updating the Metabase ID for this team", | ||
(e as Error).stack, | ||
); | ||
throw e; | ||
} | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
...lanx.uk/migrations/1733738650997_alter_table_public_teams_add_column_metabase_id/down.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
alter table "public"."teams" drop column "metabase_id"; |
2 changes: 2 additions & 0 deletions
2
....planx.uk/migrations/1733738650997_alter_table_public_teams_add_column_metabase_id/up.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
alter table "public"."teams" add column "metabase_id" integer | ||
null; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters