Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: analytics module gets and updates PlanX DB #4071

Merged
merged 7 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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,
name: "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,
name: "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,
name: "Test Team",
metabase_id: 123,
},
],
},
});

const result = await updateMetabaseId(1, 123);

expect(result).toEqual({
update_teams: {
returning: [
{
id: 1,
name: "Test Team",
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");
});
});
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;
name: string;
metabaseId: number | null;
}[];
}

export const getTeamIdAndMetabaseId = async (name: string) => {
try {
const response = await $api.client.request<GetMetabaseId>(
gql`
query GetTeamAndMetabaseId($name: String!) {
teams(where: { name: { _ilike: $name } }) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

_ilike could match both "North Somerset" and "South Somerset" - it would be better to match using _eq on team slugs if possible which are guaranteed to be unique.

Copy link
Collaborator Author

@zz-hh-aa zz-hh-aa Dec 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great catch! Updated in ba015dc.

id
name
metabaseId: metabase_id
}
}
`,
{
name: name,
},
);

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;
}
};
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;
name: 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
name
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;
}
};
8 changes: 8 additions & 0 deletions hasura.planx.uk/metadata/tables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2370,6 +2370,7 @@
- created_at
- domain
- id
- metabase_id
- name
- slug
- updated_at
Expand Down Expand Up @@ -2422,6 +2423,13 @@
- updated_at
filter: {}
update_permissions:
- role: api
permission:
columns:
- metabase_id
filter: {}
check: {}
comment: ""
- role: platformAdmin
permission:
columns:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
alter table "public"."teams" drop column "metabase_id";
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
alter table "public"."teams" add column "metabase_id" integer
null;
Loading