Skip to content

Commit df12799

Browse files
committed
chore: remove language role enum
1 parent ad753b5 commit df12799

16 files changed

Lines changed: 4 additions & 50 deletions

src/modules/languages/actions/inviteLanguageMember.test.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { test, expect } from "vitest";
44
import { initializeDatabase } from "@/tests/vitest/dbUtils";
55
import { EmailStatusRaw } from "@/modules/users/model/EmailStatus";
66
import { UserStatusRaw } from "@/modules/users/model/UserStatus";
7-
import { LanguageMemberRoleRaw } from "../model";
87
import { inviteLanguageMember } from "./inviteLanguageMember";
98
import { createScenario, ScenarioDefinition } from "@/tests/scenarios";
109
import { SystemRoleRaw } from "@/modules/users/model/SystemRole";
@@ -74,7 +73,6 @@ test("returns not found if not a platform admin", async () => {
7473
const formData = new FormData();
7574
formData.set("code", language.code);
7675
formData.set("email", "invite@example.com");
77-
formData.set("roles[0]", LanguageMemberRoleRaw.Translator);
7876
const response = inviteLanguageMember({ state: "idle" }, formData);
7977
await expect(response).toBeNextjsNotFound();
8078

@@ -89,7 +87,6 @@ test("returns not found if language does not exist", async () => {
8987
const formData = new FormData();
9088
formData.set("code", "garbage");
9189
formData.set("email", "invite@example.com");
92-
formData.set("roles[0]", LanguageMemberRoleRaw.Translator);
9390
const response = inviteLanguageMember({ state: "idle" }, formData);
9491
await expect(response).toBeNextjsNotFound();
9592
});
@@ -101,12 +98,9 @@ test("adds existing user to the language", async () => {
10198
const language = scenario.languages.spanish;
10299
const user = await userFactory.build();
103100

104-
const role = LanguageMemberRoleRaw.Translator;
105-
106101
const formData = new FormData();
107102
formData.set("code", language.code);
108103
formData.set("email", user.email);
109-
formData.set("roles[0]", role);
110104
const response = inviteLanguageMember({ state: "idle" }, formData);
111105

112106
await expect(response).toBeNextjsRedirect(
@@ -138,12 +132,10 @@ test("invites new user to the language", async () => {
138132
const language = scenario.languages.spanish;
139133

140134
const email = "testinvite@example.com";
141-
const role = LanguageMemberRoleRaw.Translator;
142135

143136
const formData = new FormData();
144137
formData.set("code", language.code);
145138
formData.set("email", email);
146-
formData.set("roles[0]", role);
147139
const response = inviteLanguageMember({ state: "idle" }, formData);
148140

149141
await expect(response).toBeNextjsRedirect(

src/modules/languages/actions/removeLanguageMember.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { ulid } from "@/shared/ulid";
33
import { initializeDatabase } from "@/tests/vitest/dbUtils";
44
import { expect, test } from "vitest";
55
import { removeLanguageMember } from "./removeLanguageMember";
6-
import { LanguageMemberRoleRaw } from "../model";
76
import { createScenario, ScenarioDefinition } from "@/tests/scenarios";
87
import { SystemRoleRaw } from "@/modules/users/model/SystemRole";
98
import logIn from "@/tests/vitest/login";

src/modules/languages/data-access/languageMemberRepository.test.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ describe("create", () => {
5252
languageMemberRepository.create({
5353
languageId: language.id,
5454
userId: user.id,
55-
roles: [],
5655
}),
5756
).resolves.toBeUndefined();
5857

@@ -74,7 +73,6 @@ describe("create", () => {
7473
languageMemberRepository.create({
7574
languageId: language.id,
7675
userId: ulid(),
77-
roles: [],
7876
}),
7977
).rejects.toThrowError(
8078
expect.objectContaining({
@@ -95,7 +93,6 @@ describe("create", () => {
9593
languageMemberRepository.create({
9694
languageId: ulid(),
9795
userId: user.id,
98-
roles: [],
9996
}),
10097
).rejects.toThrowError(
10198
expect.objectContaining({
@@ -115,7 +112,6 @@ describe("create", () => {
115112
await languageMemberRepository.create({
116113
languageId: language.id,
117114
userId: user.id,
118-
roles: [],
119115
});
120116
const previousLanguageMembers = await getDb()
121117
.selectFrom("language_member")
@@ -126,7 +122,6 @@ describe("create", () => {
126122
languageMemberRepository.create({
127123
languageId: ulid(),
128124
userId: user.id,
129-
roles: [],
130125
}),
131126
).rejects.toThrowError(
132127
expect.objectContaining({

src/modules/languages/data-access/mockLanguageMemberRepository.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,6 @@ const mockLanguageMemberRepo = {
2323
this.members.push(member);
2424
},
2525

26-
async update(member: LanguageMember): Promise<void> {
27-
const dbMember = this.members.find(
28-
(m) => m.languageId === member.languageId && m.userId === member.userId,
29-
);
30-
if (!dbMember) return;
31-
32-
dbMember.roles = member.roles;
33-
},
34-
3526
async delete(languageId: string, userId: string): Promise<void> {
3627
this.members = this.members.filter(
3728
(m) => m.languageId !== languageId || m.userId !== userId,

src/modules/languages/data-access/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Generated } from "kysely";
2-
import { LanguageMemberRoleRaw, TextDirectionRaw } from "../model";
2+
import { TextDirectionRaw } from "../model";
33

44
export interface LanguageTable {
55
id: Generated<string>;

src/modules/languages/model.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ export enum TextDirectionRaw {
55
RTL = "rtl",
66
}
77

8-
export enum LanguageMemberRoleRaw {
9-
Translator = "TRANSLATOR",
10-
Admin = "ADMIN",
11-
}
12-
138
export class LanguageAlreadyExistsError extends Error {
149
constructor(public code: string) {
1510
super();

src/modules/languages/public/LanguageClient.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { test, expect } from "vitest";
22
import { initializeDatabase } from "@/tests/vitest/dbUtils";
3-
import { LanguageMemberRoleRaw } from "../model";
43
import { languageClient } from "./LanguageClient";
54
import { createScenario } from "@/tests/scenarios";
65
import { findLanguageMembersForUser } from "../test-utils/dbUtils";

src/modules/languages/test-utils/factories.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
import { Async } from "factory.ts";
2-
import {
3-
DbLanguage,
4-
DbLanguageRole,
5-
DbLanguageMember,
6-
} from "../data-access/types";
2+
import { DbLanguage, DbLanguageMember } from "../data-access/types";
73
import { ulid } from "@/shared/ulid";
84
import { faker } from "@faker-js/faker/locale/en";
95
import localeMap from "@/data/locale-mapping.json";

src/modules/languages/use-cases/InviteLanguageMember.unit.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import mockLanguageRepo from "../data-access/mockLanguageRepository";
44
import mockLanguageMemberRepo from "../data-access/mockLanguageMemberRepository";
55
import fakeUserClient from "@/modules/users/public/FakeUserClient";
66
import { NotFoundError } from "@/shared/errors";
7-
import { LanguageMemberRoleRaw, TextDirectionRaw } from "../model";
7+
import { TextDirectionRaw } from "../model";
88
import { ulid } from "@/shared/ulid";
99

1010
const inviteLanguageMember = new InviteLanguageMember(
@@ -17,7 +17,6 @@ test("throws error if language could not be found", async () => {
1717
const response = inviteLanguageMember.execute({
1818
code: "spa",
1919
email: "invited@example.com",
20-
roles: [],
2120
});
2221
await expect(response).rejects.toThrow(new NotFoundError("Language"));
2322
});
@@ -36,15 +35,13 @@ test("invites language member", async () => {
3635
const response = await inviteLanguageMember.execute({
3736
code: "spa",
3837
email: "invited@example.com",
39-
roles: [LanguageMemberRoleRaw.Translator],
4038
});
4139
expect(response).toEqual({ userId: expect.toBeUlid() });
4240

4341
expect(mockLanguageMemberRepo.members).toEqual([
4442
{
4543
languageId: language.id,
4644
userId: response.userId,
47-
roles: [LanguageMemberRoleRaw.Translator],
4845
},
4946
]);
5047
});

src/modules/languages/use-cases/RemoveLanguageMember.unit.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { test, expect } from "vitest";
22
import mockLanguageRepo from "../data-access/mockLanguageRepository";
33
import mockLanguageMemberRepo from "../data-access/mockLanguageMemberRepository";
44
import { NotFoundError } from "@/shared/errors";
5-
import { LanguageMemberRoleRaw, TextDirectionRaw } from "../model";
5+
import { TextDirectionRaw } from "../model";
66
import { ulid } from "@/shared/ulid";
77
import RemoveLanguageMember from "./RemoveLanguageMember";
88

@@ -31,7 +31,6 @@ test("removes language member", async () => {
3131
const languageMember = {
3232
languageId: language.id,
3333
userId: ulid(),
34-
roles: [LanguageMemberRoleRaw.Translator],
3534
};
3635
mockLanguageRepo.languages = [language];
3736
mockLanguageMemberRepo.members = [languageMember];

0 commit comments

Comments
 (0)