From 96b4f44497a9a6f7c07bebd8e7204b370ac36274 Mon Sep 17 00:00:00 2001
From: Sara Salim <ssalim@student.uef.fi>
Date: Fri, 5 Dec 2025 23:25:14 +0200
Subject: [PATCH 1/5] Removed join_message from IJoin

---
 frontend-next-migration/src/entities/Clan/types/clan.d.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend-next-migration/src/entities/Clan/types/clan.d.ts b/frontend-next-migration/src/entities/Clan/types/clan.d.ts
index ff9992121..260f681bd 100644
--- a/frontend-next-migration/src/entities/Clan/types/clan.d.ts
+++ b/frontend-next-migration/src/entities/Clan/types/clan.d.ts
@@ -37,11 +37,10 @@ export type ICreateClanResponse = {
 export type IJoin = {
     clan_id: string;
     player_id: string;
-    join_message: string;
 };
 
 export type IClanCreateDto = Pick<IClan, 'name' | 'tag' | 'phrase' | 'labels' | 'isOpen'>;
 
 export type IClanUpdateDto = Pick<IClan, '_id' | 'name' | 'tag' | 'phrase' | 'labels' | 'isOpen'>;
 
-export type IJoinDto = Pick<IJoin, 'clan_id' | 'player_id' | 'join_message'>;
+export type IJoinDto = Pick<IJoin, 'clan_id' | 'player_id'>;

From 04e6b90e0da71470b982713f1c703aad11eda20c Mon Sep 17 00:00:00 2001
From: Sara Salim <ssalim@student.uef.fi>
Date: Thu, 11 Dec 2025 01:11:41 +0200
Subject: [PATCH 2/5] Updated IClan fields, and created IClanRole type

---
 .../src/entities/Clan/types/clan.d.ts            | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/frontend-next-migration/src/entities/Clan/types/clan.d.ts b/frontend-next-migration/src/entities/Clan/types/clan.d.ts
index 260f681bd..7be609adc 100644
--- a/frontend-next-migration/src/entities/Clan/types/clan.d.ts
+++ b/frontend-next-migration/src/entities/Clan/types/clan.d.ts
@@ -16,6 +16,20 @@ export type IClan = {
     phrase: string;
     labels: Array[];
     positionLeaderboard?: number;
+
+    IClanRole: Array[];
+    goal: string;
+    clanLogo: string;
+    battlePoints: number;
+    language: string;
+    points: number;
+    ageRange: string;
+};
+
+export type IClanRole = {
+    _id: string;
+    name: string;
+    clanRoleType: string;
 };
 
 export type IClanPosition = {
@@ -44,3 +58,5 @@ export type IClanCreateDto = Pick<IClan, 'name' | 'tag' | 'phrase' | 'labels' |
 export type IClanUpdateDto = Pick<IClan, '_id' | 'name' | 'tag' | 'phrase' | 'labels' | 'isOpen'>;
 
 export type IJoinDto = Pick<IJoin, 'clan_id' | 'player_id'>;
+
+export type IClanRoleDto = Pick<IClanRole, '_id' | 'name' | 'clanRoleType'>;

From 17d6be75e21ebfd698677415ea188e430d106a96 Mon Sep 17 00:00:00 2001
From: Sara Salim <ssalim@student.uef.fi>
Date: Thu, 11 Dec 2025 12:37:54 +0200
Subject: [PATCH 3/5] Small fix

---
 frontend-next-migration/src/entities/Clan/types/clan.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend-next-migration/src/entities/Clan/types/clan.d.ts b/frontend-next-migration/src/entities/Clan/types/clan.d.ts
index 7be609adc..b3f17c68a 100644
--- a/frontend-next-migration/src/entities/Clan/types/clan.d.ts
+++ b/frontend-next-migration/src/entities/Clan/types/clan.d.ts
@@ -17,7 +17,7 @@ export type IClan = {
     labels: Array[];
     positionLeaderboard?: number;
 
-    IClanRole: Array[];
+    roles: IClanRole[];
     goal: string;
     clanLogo: string;
     battlePoints: number;

From 2beee8f12f067d49be6da7d9585bce211890ff3f Mon Sep 17 00:00:00 2001
From: Sara Salim <ssalim@student.uef.fi>
Date: Thu, 18 Dec 2025 03:59:55 +0200
Subject: [PATCH 4/5] Fixes to IClan interface

---
 frontend-next-migration/src/entities/Clan/types/clan.d.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend-next-migration/src/entities/Clan/types/clan.d.ts b/frontend-next-migration/src/entities/Clan/types/clan.d.ts
index b3f17c68a..8e7fddad8 100644
--- a/frontend-next-migration/src/entities/Clan/types/clan.d.ts
+++ b/frontend-next-migration/src/entities/Clan/types/clan.d.ts
@@ -11,10 +11,10 @@ export type IClan = {
     itemCount: number;
     tag: string;
     admin_ids: string[];
-    Player: Array[];
+    Player: Array[]; // conflict with swagger
     isOpen: boolean;
     phrase: string;
-    labels: Array[];
+    labels: Array[]; // conflict with swagger
     positionLeaderboard?: number;
 
     roles: IClanRole[];
@@ -30,6 +30,7 @@ export type IClanRole = {
     _id: string;
     name: string;
     clanRoleType: string;
+    rights?: Record<string, boolean>;
 };
 
 export type IClanPosition = {

From 104d932db51d998646302cd718d15be94a9a816e Mon Sep 17 00:00:00 2001
From: Sara Salim <ssalim@student.uef.fi>
Date: Mon, 22 Dec 2025 01:20:34 +0200
Subject: [PATCH 5/5] Small fixes

---
 frontend-next-migration/src/entities/Clan/types/clan.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend-next-migration/src/entities/Clan/types/clan.d.ts b/frontend-next-migration/src/entities/Clan/types/clan.d.ts
index 8e7fddad8..858ea44c2 100644
--- a/frontend-next-migration/src/entities/Clan/types/clan.d.ts
+++ b/frontend-next-migration/src/entities/Clan/types/clan.d.ts
@@ -11,10 +11,10 @@ export type IClan = {
     itemCount: number;
     tag: string;
     admin_ids: string[];
-    Player: Array[]; // conflict with swagger
+    Player: Array[];
     isOpen: boolean;
     phrase: string;
-    labels: Array[]; // conflict with swagger
+    labels: Array[];
     positionLeaderboard?: number;
 
     roles: IClanRole[];