Skip to content

Refactor/remove team tags and slug #82

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.

Sign up for GitHub

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

Merged
soorq merged 6 commits into from
Jun 7, 2026
Merged

Refactor/remove team tags and slug #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8d4bc0d
refactor(teams): remove team tags and related functionality
maksberegovoi Jun 7, 2026
bcc55ad
refactor(teams): remove team slug and related functionality
maksberegovoi Jun 7, 2026
6872778
refactor(teams): remove team slug from media
maksberegovoi Jun 7, 2026
8679781
refactor(projects): replace team slug with teamId
maksberegovoi Jun 7, 2026
4be5cbc
refactor(k6): refactor k6 tests due to removing teams slug
maksberegovoi Jun 7, 2026
8043a3e
chore: fix conflicts
maksberegovoi Jun 7, 2026
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
1 change: 0 additions & 1 deletion infra/k6/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"test:teams": "k6 run scenarios/teams.js",
"test:teams-members": "k6 run scenarios/teams-members.js",
"test:teams-invitations": "k6 run scenarios/teams-invitations.js",
"test:teams-settings": "k6 run scenarios/teams-settings.js",
"test:teams-me": "k6 run scenarios/teams-me.js",
"test:projects": "k6 run scenarios/projects.js",
"test:users": "k6 run scenarios/users.js",
Expand Down
6 changes: 3 additions & 3 deletions infra/k6/scenarios/boards-columns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ export default function () {
description: 'k6 columns scenario project',
visibility: 'public',
};
const createProjectRes = client.post(`/teams/${team.slug}/projects`, project, {
const createProjectRes = client.post(`/teams/${team.id}/projects`, project, {
tags: { name: 'post-teams-projects' },
});
const projectId = createProjectRes.json().projectId;

check(createProjectRes, {
'POST /teams/:slug/projects: has projectId': (r) => r.json().projectId !== undefined,
'POST /teams/:id/projects: has projectId': (r) => r.json().projectId !== undefined,
});

sleep(1);
Expand Down Expand Up @@ -125,7 +125,7 @@ export default function () {
sleep(1);

// --- delete project ---
client.delete(`/teams/${team.slug}/projects/${projectId}`, {
client.delete(`/teams/${team.id}/projects/${projectId}`, {
tags: { name: 'delete-teams-projects' },
});

Expand Down
6 changes: 3 additions & 3 deletions infra/k6/scenarios/boards-views.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ export default function () {
description: 'k6 views scenario project',
visibility: 'public',
};
const createProjectRes = client.post(`/teams/${team.slug}/projects`, project, {
const createProjectRes = client.post(`/teams/${team.id}/projects`, project, {
tags: { name: 'post-teams-projects' },
});
const projectId = createProjectRes.json().projectId;

check(createProjectRes, {
'POST /teams/:slug/projects: has projectId': (r) => r.json().projectId !== undefined,
'POST /teams/:id/projects: has projectId': (r) => r.json().projectId !== undefined,
});

sleep(1);
Expand Down Expand Up @@ -121,7 +121,7 @@ export default function () {
sleep(1);

// --- delete project ---
client.delete(`/teams/${team.slug}/projects/${projectId}`, {
client.delete(`/teams/${team.id}/projects/${projectId}`, {
tags: { name: 'delete-teams-projects' },
});

Expand Down
6 changes: 3 additions & 3 deletions infra/k6/scenarios/boards.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ export default function () {
description: 'k6 boards scenario project',
visibility: 'public',
};
const createProjectRes = client.post(`/teams/${team.slug}/projects`, project, {
const createProjectRes = client.post(`/teams/${team.id}/projects`, project, {
tags: { name: 'post-teams-projects' },
});
const projectId = createProjectRes.json().projectId;

check(createProjectRes, {
'POST /teams/:slug/projects: has projectId': (r) => r.json().projectId !== undefined,
'POST /teams/:id/projects: has projectId': (r) => r.json().projectId !== undefined,
});

sleep(1);
Expand Down Expand Up @@ -106,7 +106,7 @@ export default function () {
sleep(1);

// --- delete project ---
client.delete(`/teams/${team.slug}/projects/${projectId}`, {
client.delete(`/teams/${team.id}/projects/${projectId}`, {
tags: { name: 'delete-teams-projects' },
});

Expand Down
16 changes: 8 additions & 8 deletions infra/k6/scenarios/projects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default function () {
description: 'description for k6_test_project',
visibility: 'public',
};
const createRes = client.post(`/teams/${team.slug}/projects`, project, {
const createRes = client.post(`/teams/${team.id}/projects`, project, {
tags: { name: 'post-teams-projects' },
});
const projectId = createRes.json().projectId;
Expand All @@ -54,7 +54,7 @@ export default function () {
const updatedProject = {
name: newProjectName,
};
client.patch(`/teams/${team.slug}/projects/${projectId}`, updatedProject, {
client.patch(`/teams/${team.id}/projects/${projectId}`, updatedProject, {
tags: { name: 'patch-teams-projects' },
});

Expand All @@ -63,7 +63,7 @@ export default function () {
// --- get all teams projects ---

const getAllRes = client.get(
`/teams/${team.slug}/projects`,
`/teams/${team.id}/projects`,
{},
{ tags: { name: 'get-teams-projects' } },
);
Expand All @@ -74,7 +74,7 @@ export default function () {

// --- get one team project ---
client.get(
`/teams/${team.slug}/projects/${projectId}`,
`/teams/${team.id}/projects/${projectId}`,
{},
{ tags: { name: 'teams-projects-id' } },
);
Expand All @@ -83,13 +83,13 @@ export default function () {

// --- generate share token ---
const shareTokenRes = client.post(
`/teams/${team.slug}/projects/${projectId}/share`,
`/teams/${team.id}/projects/${projectId}/share`,
{},
{ tags: { name: 'teams-projects-generate-token' } },
);

check(shareTokenRes, {
'POST /teams/:slug/projects/:id/share: has token': (r) =>
'POST /teams/:id/projects/:id/share: has token': (r) =>
r.json().payload.token !== undefined,
});

Expand All @@ -98,7 +98,7 @@ export default function () {
// --- archive project ---

client.post(
`/teams/${team.slug}/projects/${projectId}/archive`,
`/teams/${team.id}/projects/${projectId}/archive`,
{},
{ tags: { name: 'teams-projects-archive' } },
);
Expand All @@ -108,7 +108,7 @@ export default function () {
// --- delete project ---

client.delete(
`/teams/${team.slug}/projects/${projectId}`,
`/teams/${team.id}/projects/${projectId}`,
{},
{ tags: { name: 'delete-teams-projects' } },
);
Expand Down
24 changes: 12 additions & 12 deletions infra/k6/scenarios/teams-invitations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ export default function () {

sleep(1);

// --- GET /teams/:slug/invitations ---
// --- GET /teams/:id/invitations ---
const listRes = client.get(
`/teams/${team.slug}/invitations`,
`/teams/${team.id}/invitations`,
{},
{
tags: { name: 'teams-invitations-list' },
Expand All @@ -56,9 +56,9 @@ export default function () {
const invite = items.length ? items[0] : null;

if (invite && invite.code) {
// --- GET /teams/:slug/invitations/:code ---
// --- GET /teams/:id/invitations/:code ---
client.get(
`/teams/${team.slug}/invitations/${invite.code}`,
`/teams/${team.id}/invitations/${invite.code}`,
{},
{
tags: { name: 'teams-invitations-get' },
Expand All @@ -67,24 +67,24 @@ export default function () {

sleep(1);

// --- PATCH /teams/:slug/invitations/:code ---
// --- PATCH /teams/:id/invitations/:code ---
client.patch(
`/teams/${team.slug}/invitations/${invite.code}`,
`/teams/${team.id}/invitations/${invite.code}`,
{ role: 'member' },
{ tags: { name: 'teams-invitations-update' } },
);

sleep(1);

// --- POST /teams/:slug/invitations/:code/accept ---
// --- POST /teams/:id/invitations/:code/accept ---
if (__ITER === 0 && invite.email && userByEmail[invite.email]) {
const invitedUser = userByEmail[invite.email];
const { client: invitedClient } = getAuthUser(invitedUser, {
tags: { name: 'auth-sign-in' },
});

invitedClient.post(
`/teams/${team.slug}/invitations/${invite.code}/accept`,
`/teams/${team.id}/invitations/${invite.code}/accept`,
{},
{ tags: { name: 'teams-invitations-accept' } },
);
Expand All @@ -93,10 +93,10 @@ export default function () {

sleep(1);

// --- POST /teams/:slug/invitations ---
// --- POST /teams/:id/invitations ---
const randomEmail = `k6_invite_${__VU}_${__ITER}@tasktracker.local`;
client.post(
`/teams/${team.slug}/invitations`,
`/teams/${team.id}/invitations`,
{ email: randomEmail, role: 'member' },
{
tags: { name: 'teams-invitations-create' },
Expand All @@ -105,9 +105,9 @@ export default function () {

sleep(1);

// --- POST /teams/:slug/invitations (duplicate) ---
// --- POST /teams/:id/invitations (duplicate) ---
client.post(
`/teams/${team.slug}/invitations`,
`/teams/${team.id}/invitations`,
{ email: randomEmail, role: 'member' },
{
tags: { name: 'teams-invitations-create-duplicate' },
Expand Down
6 changes: 3 additions & 3 deletions infra/k6/scenarios/teams-members.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ export default function () {

sleep(1);

// --- GET /teams/:slug/members ---
// --- GET /teams/:id/members ---
const membersRes = client.get(
`/teams/${team.slug}/members`,
`/teams/${team.id}/members`,
{},
{
tags: { name: 'teams-members-list' },
Expand All @@ -50,7 +50,7 @@ export default function () {
// --- PATCH /teams/:slug/members/:userId ---
if (target && target.id) {
client.patch(
`/teams/${team.slug}/members/${target.id}`,
`/teams/${team.id}/members/${target.id}`,
{ role: 'member' },
{ tags: { name: 'teams-members-update' } },
);
Expand Down
51 changes: 0 additions & 51 deletions infra/k6/scenarios/teams-settings.js
View file
Open in desktop

This file was deleted.

30 changes: 12 additions & 18 deletions infra/k6/scenarios/teams.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,31 +34,25 @@ export default function () {
sleep(1);

// --- POST /teams ---
const slug = randomStr(10);
const team = {
name: 'k6_team_' + slug,
name: 'k6_team_' + randomStr(10),
description: randomStr(15),
slug: slug,
};
client.post('/teams', team, { tags: { name: 'teams-create' } });

sleep(1);

// --- GET /check-slug/:slug ---
client.get(`/teams/check-slug/${slug}`, {}, { tags: { name: 'teams-check-slug' } });

const teamRes = client.post('/teams', team, { tags: { name: 'teams-create' } });
console.log(teamRes);
const teamId = teamRes.json().teamId;
sleep(1);

// --- GET /:slug ---
client.get(`/teams/${slug}`, {}, { tags: { name: 'teams-find-one' } });
// --- GET /:teamId ---
client.get(`/teams/${teamId}`, {}, { tags: { name: 'teams-find-one' } });

sleep(1);

// --- PATCH /:slug ---
// --- PATCH /:teamId ---
const updatedTeam = {
description: randomStr(25),
};
client.patch(`/teams/${slug}`, updatedTeam, {
client.patch(`/teams/${teamId}`, updatedTeam, {
tags: { name: 'teams-update' },
});

Expand All @@ -67,7 +61,7 @@ export default function () {
// --- Update team avatar ---
const fdAvatar = new FormData();
fdAvatar.append('file', http.file(avatar, 'avatar.png', 'image/png'));
fdAvatar.append('slug', slug);
fdAvatar.append('teamId', teamId);
fdAvatar.append('context', 'team.avatar');

client.post('/upload', fdAvatar.body(), {
Expand All @@ -83,7 +77,7 @@ export default function () {
// --- Update team banner ---
const fdBanner = new FormData();
fdBanner.append('file', http.file(avatar, 'avatar.png', 'image/png'));
fdBanner.append('slug', slug);
fdBanner.append('teamId', teamId);
fdBanner.append('context', 'team.banner');
client.post('/upload', fdBanner.body(), {
rawBody: true,
Expand All @@ -95,8 +89,8 @@ export default function () {

sleep(1);

// --- DELETE /:slug ---
client.delete(`/teams/${slug}`, {
// --- DELETE /:teamId ---
client.delete(`/teams/${teamId}`, {
tags: { name: 'teams-delete' },
});

Expand Down
1 change: 0 additions & 1 deletion infra/k6/scripts/clear-k6-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ async function clearDB(db: PostgresJsDatabase<typeof sc>) {
return await db.transaction(async (tx) => {
await tx.delete(sc.users).where(sql`${sc.users.email} LIKE 'k6_user_%'`);
await tx.delete(sc.teams).where(sql`${sc.teams.name} LIKE 'k6_team_%'`);
await tx.delete(sc.tags).where(sql`${sc.tags.name} LIKE 'k6_tag_%'`);
});
}

Expand Down
Loading
Loading