#375: added tenant information for more bff functions

basmasking · basmasking · commit 23d5422666ae · 2025-07-22T21:59:39.000+02:00
diff --git a/src/domain/creator/getById/CreatorNotFound.ts b/src/domain/creator/getById/CreatorNotFound.ts
@@ -5,6 +5,6 @@ export default class CreatorNotFound extends NotFound
 {
     constructor(id: string, tenantId: string)
     {
-        super(`No creator for id: ${id} and tenant ${tenantId}`);
+        super(`No creator for id: ${id} and tenant '${tenantId}'`);
     }
 }
diff --git a/src/domain/creator/updateNickname/retrieveByNickname.ts b/src/domain/creator/updateNickname/retrieveByNickname.ts
@@ -4,9 +4,12 @@ import database from '^/integrations/database';
 import { RECORD_TYPE } from '../definitions';
 import type { DataModel } from '../types';
 
-export default async function retrieveByNickname(nickname: string): Promise<DataModel | undefined>
+export default async function retrieveByNickname(tenantId: string, nickname: string): Promise<DataModel | undefined>
 {
-    const query = { nickname: { EQUALS: nickname } };
+    const query = {
+        nickname: { EQUALS: nickname },
+        tenantId: { EQUALS: tenantId }
+    };
 
     return database.findRecord(RECORD_TYPE, query) as Promise<DataModel | undefined>;
 }
diff --git a/src/domain/creator/updateNickname/updateNickname.ts b/src/domain/creator/updateNickname/updateNickname.ts
@@ -1,16 +1,18 @@
 
 import type { Requester } from '^/domain/authentication';
+import type { Tenant } from '^/domain/tenant';
 
 import cleanNickname from '../cleanNickname';
 import update from '../update';
 import NicknameAlreadyExists from './NicknameAlreadyExists';
 import retrieveByNickname from './retrieveByNickname';
 
-export default async function updateNickname(requester: Requester, nickname: string): Promise<void>
+
+export default async function updateNickname(requester: Requester, tenant: Tenant, nickname: string): Promise<void>
 {
     const cleanedNickname = cleanNickname(nickname);
 
-    const data = await retrieveByNickname(cleanedNickname);
+    const data = await retrieveByNickname(tenant.id, cleanedNickname);
 
     if (data !== undefined)
     {
diff --git a/src/domain/notification/getById/getById.ts b/src/domain/notification/getById/getById.ts
@@ -5,12 +5,14 @@ import database from '^/integrations/database';
 import { RECORD_TYPE } from '../definitions';
 import type { DataModel } from '../types';
 
-export default async function getById(id: string): Promise<DataModel>
+export default async function getById(receiverId: string, id: string): Promise<DataModel>
 {
     const query: RecordQuery =
     {
         id: { EQUALS: id },
+        receiverId: { EQUALS: receiverId },
         deleted: { EQUALS: false }
     };
+
     return database.findRecord(RECORD_TYPE, query) as Promise<DataModel>;
 }
diff --git a/src/domain/notification/getByIdAggregated/getByIdAggregated.ts b/src/domain/notification/getByIdAggregated/getByIdAggregated.ts
@@ -8,7 +8,7 @@ import getById from '../getById';
 
 export default async function getByIdAggregated(requester: Requester, tenant: Tenant, id: string): Promise<AggregatedData>
 {
-    const data = await getById(id);
+    const data = await getById(requester.id, id);
 
     return aggregate(requester, tenant, data);
 }
diff --git a/src/domain/notification/notify/createdPost.ts b/src/domain/notification/notify/createdPost.ts
@@ -4,14 +4,14 @@ import getPost from '^/domain/post/getById';
 import create from '../create';
 import { Types } from '../definitions';
 
-export default async function createdPost(creatorId: string, postId: string, parentId?: string): Promise<void>
+export default async function createdPost(tenantId: string, creatorId: string, postId: string, parentId?: string): Promise<void>
 {
     if (parentId === undefined)
     {
         return;
     }
 
-    const parentPost = await getPost(parentId);
+    const parentPost = await getPost(tenantId, parentId);
 
     return create(Types.REACTED_TO_POST, creatorId, parentPost.creatorId, postId);
 }
diff --git a/src/domain/notification/notify/ratedPost.ts b/src/domain/notification/notify/ratedPost.ts
@@ -4,14 +4,14 @@ import getPost from '^/domain/post/getById';
 import create from '../create';
 import { Types } from '../definitions';
 
-export default async function ratedPost(creatorId: string, postId: string, rated: boolean): Promise<void>
+export default async function ratedPost(tenantId: string, creatorId: string, postId: string, rated: boolean): Promise<void>
 {
     if (rated === false)
     {
         return;
     }
 
-    const post = await getPost(postId);
+    const post = await getPost(tenantId, postId);
 
     return create(Types.RATED_POST, creatorId, post.creatorId, postId);
 }
diff --git a/src/domain/notification/notify/subscriptions.ts b/src/domain/notification/notify/subscriptions.ts
@@ -12,8 +12,8 @@ import startedFollowing from './startedFollowing';
 async function subscribe(): Promise<void>
 {
     await Promise.all([
-        subscribeToPostRated(({ creatorId, postId, rated }) => ratedPost(creatorId, postId, rated)),
-        subscribeToPostCreated(({ creatorId, postId, parentId }) => reactedToPost(creatorId, postId, parentId)),
+        subscribeToPostRated(({ tenantId, creatorId, postId, rated }) => ratedPost(tenantId, creatorId, postId, rated)),
+        subscribeToPostCreated(({ tenantId, creatorId, postId, parentId }) => reactedToPost(tenantId, creatorId, postId, parentId)),
         subscribeToRelationEstablished(({ followerId, followingId }) => startedFollowing(followerId, followingId)),
         subscribeToPostRemoved(({ postId }) => removedPost(postId)),
     ]);
diff --git a/src/domain/post/create/create.ts b/src/domain/post/create/create.ts
@@ -19,7 +19,7 @@ export default async function create(creatorId: string, tenantId: string, comicI
 
         postId = await insertData(data);
 
-        await publish(creatorId, postId, parentId);
+        await publish(tenantId, creatorId, postId, parentId);
 
         return postId;
     }
diff --git a/src/domain/post/create/publish.ts b/src/domain/post/create/publish.ts
@@ -5,12 +5,12 @@ import { EVENT_CHANNEL } from '../definitions';
 import { EVENT_NAME } from './definitions';
 import type { CreatedPublication } from './types';
 
-export default async function publish(creatorId: string, postId: string, parentId?: string): Promise<void>
+export default async function publish(tenantId: string, creatorId: string, postId: string, parentId?: string): Promise<void>
 {
     const publication: CreatedPublication = {
         channel: EVENT_CHANNEL,
         name: EVENT_NAME,
-        data: { creatorId, postId, parentId }
+        data: { tenantId, creatorId, postId, parentId }
     };
 
     return eventBroker.publish(publication);
diff --git a/src/domain/post/create/types.ts b/src/domain/post/create/types.ts
@@ -6,6 +6,7 @@ import type { DataModel } from '../types';
 export type ValidationModel = Pick<DataModel, 'creatorId' | 'tenantId' | 'comicId' | 'commentId' | 'parentId'>;
 
 export type CreatedEventData = {
+    tenantId: string;
     creatorId: string;
     postId: string;
     parentId?: string;
diff --git a/src/domain/post/getById/getById.ts b/src/domain/post/getById/getById.ts
@@ -6,12 +6,13 @@ import { RECORD_TYPE } from '../definitions';
 import PostNotFound from '../PostNotFound';
 import type { DataModel } from '../types';
 
-export default async function getById(id: string): Promise<DataModel>
+export default async function getById(tenantId: string, id: string): Promise<DataModel>
 {
     const query: RecordQuery =
     {
-        id: { 'EQUALS': id },
-        deleted: { 'EQUALS': false }
+        id: { EQUALS: id },
+        tenantId: { EQUALS: tenantId },
+        deleted: { EQUALS: false }
     };
 
     const record = await database.findRecord(RECORD_TYPE, query);
diff --git a/src/domain/post/getByIdAggregated/getByIdAggregated.ts b/src/domain/post/getByIdAggregated/getByIdAggregated.ts
@@ -10,7 +10,7 @@ export { type AggregatedData };
 
 export default async function getByIdAggregated(requester: Requester, tenant: Tenant, id: string): Promise<AggregatedData>
 {
-    const data = await getById(id);
+    const data = await getById(tenant.id, id);
 
     return aggregate(requester, tenant, data);
 }
diff --git a/src/domain/post/getByParent/getByParent.ts b/src/domain/post/getByParent/getByParent.ts
@@ -1,16 +1,17 @@
 
-import type { RecordQuery, RecordSort} from '^/integrations/database';
+import type { RecordQuery, RecordSort } from '^/integrations/database';
 import database, { SortDirections } from '^/integrations/database';
 
 import { RECORD_TYPE } from '../definitions';
 import type { DataModel } from '../types';
 
-export default async function getByParent(parentId: string, limit: number, offset: number): Promise<DataModel[]>
+export default async function getByParent(tenantId: string, parentId: string, limit: number, offset: number): Promise<DataModel[]>
 {
     const query: RecordQuery =
     {
-        parentId: { 'EQUALS': parentId },
-        deleted: { 'EQUALS': false }
+        parentId: { EQUALS: parentId },
+        tenantId: { EQUALS: tenantId },
+        deleted: { EQUALS: false }
     };
 
     const sort: RecordSort = { createdAt: SortDirections.DESCENDING };
diff --git a/src/domain/post/getByParentAggregated/getByParentAggregated.ts b/src/domain/post/getByParentAggregated/getByParentAggregated.ts
@@ -10,7 +10,7 @@ import getByParent from '../getByParent';
 
 export default async function getByParentAggregated(requester: Requester, tenant: Tenant, postId: string, range: Range): Promise<AggregatedData[]>
 {
-    const data = await getByParent(postId, range.limit, range.offset);
+    const data = await getByParent(tenant.id, postId, range.limit, range.offset);
 
     const aggregates = data.map(item => aggregate(requester, tenant, item));
 
diff --git a/src/domain/post/remove/remove.ts b/src/domain/post/remove/remove.ts
@@ -2,6 +2,7 @@
 import logger from '^/integrations/logging';
 
 import type { Requester } from '^/domain/authentication';
+import type { Tenant } from '^/domain/tenant';
 
 import getById from '../getById';
 import PostNotFound from '../PostNotFound';
@@ -10,7 +11,7 @@ import isNotOwner from './isNotOwner';
 import publish from './publish';
 import undeleteData from './undeleteData';
 
-export default async function remove(requester: Requester, id: string): Promise<void>
+export default async function remove(requester: Requester, tenant: Tenant, id: string): Promise<void>
 {
     // We only delete the post itself and do not cascade it towards it's children as it doesn't add
     // any value, and it would make the code more complex.
@@ -19,7 +20,7 @@ export default async function remove(requester: Requester, id: string): Promise<
 
     try
     {
-        const post = await getById(id);
+        const post = await getById(tenant.id, id);
 
         if (isNotOwner(post, requester.id))
         {
diff --git a/src/domain/rating/toggle/publish.ts b/src/domain/rating/toggle/publish.ts
@@ -5,12 +5,12 @@ import { EVENT_CHANNEL } from '../definitions';
 import { EVENT_NAME } from './definitions';
 import type { ToggledPublication } from './types';
 
-export default async function publish(creatorId: string, postId: string, rated: boolean): Promise<void>
+export default async function publish(tenantId: string, creatorId: string, postId: string, rated: boolean): Promise<void>
 {
     const publication: ToggledPublication = {
         channel: EVENT_CHANNEL,
         name: EVENT_NAME,
-        data: { creatorId, postId, rated }
+        data: { tenantId, creatorId, postId, rated }
     };
 
     return eventBroker.publish(publication);
diff --git a/src/domain/rating/toggle/switchOff.ts b/src/domain/rating/toggle/switchOff.ts
@@ -4,13 +4,13 @@ import erase from '../erase';
 import type { DataModel } from '../types';
 import publish from './publish';
 
-export default async function switchOff(rating: DataModel): Promise<boolean>
+export default async function switchOff(tenantId: string, rating: DataModel): Promise<boolean>
 {
     await erase(rating.id);
 
     try
     {
-        await publish(rating.creatorId, rating.postId, false);
+        await publish(tenantId, rating.creatorId, rating.postId, false);
 
         return false;
     }
diff --git a/src/domain/rating/toggle/switchOn.ts b/src/domain/rating/toggle/switchOn.ts
@@ -3,13 +3,13 @@ import create from '../create';
 import erase from '../erase';
 import publish from './publish';
 
-export default async function switchOn(creatorId: string, postId: string): Promise<boolean>
+export default async function switchOn(tenantId: string, creatorId: string, postId: string): Promise<boolean>
 {
     const id = await create(creatorId, postId);
 
     try
     {
-        await publish(creatorId, postId, true);
+        await publish(tenantId, creatorId, postId, true);
 
         return true;
     }
diff --git a/src/domain/rating/toggle/toggle.ts b/src/domain/rating/toggle/toggle.ts
@@ -1,15 +1,16 @@
 
 import type { Requester } from '^/domain/authentication';
+import type { Tenant } from '^/domain/tenant';
 
 import getData from './getData';
 import switchOff from './switchOff';
 import switchOn from './switchOn';
 
-export default async function toggle(requester: Requester, postId: string): Promise<boolean>
+export default async function toggle(requester: Requester, tenant: Tenant, postId: string): Promise<boolean>
 {
     const data = await getData(requester.id, postId);
 
     return data === undefined
-        ? switchOn(requester.id, postId)
-        : switchOff(data);
+        ? switchOn(tenant.id, requester.id, postId)
+        : switchOff(tenant.id, data);
 }
diff --git a/src/domain/rating/toggle/types.ts b/src/domain/rating/toggle/types.ts
@@ -2,6 +2,7 @@
 import type { Publication, Subscription } from '^/integrations/eventbroker';
 
 export type ToggledEventData = {
+    tenantId: string;
     creatorId: string;
     postId: string;
     rated: boolean;
diff --git a/src/domain/relation/establish/establish.ts b/src/domain/relation/establish/establish.ts
@@ -2,19 +2,23 @@
 import logger from '^/integrations/logging';
 
 import type { Requester } from '^/domain/authentication';
+import getCreator from '^/domain/creator/getById';
+import type { Tenant } from '^/domain/tenant';
 
 import create from '../create';
 import erase from '../erase';
 import exists from '../exists';
 import publish from './publish';
 import RelationAlreadyExists from './RelationAlreadyExists';
 
-export default async function establish(requester: Requester, followingId: string): Promise<void>
+export default async function establish(requester: Requester, tenant: Tenant, followingId: string): Promise<void>
 {
     let id;
 
     try
     {
+        await getCreator(followingId, tenant.id);
+
         const relationExists = await exists(requester.id, followingId);
 
         if (relationExists)
diff --git a/src/webui/features/hooks/useEstablishRelation.ts b/src/webui/features/hooks/useEstablishRelation.ts
@@ -4,12 +4,13 @@ import { useCallback } from 'react';
 import { requester } from '^/domain/authentication';
 import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate';
 import establishRelation from '^/domain/relation/establish';
+import { tenant } from '^/domain/tenant';
 
 export default function useEstablishRelation()
 {
     return useCallback((relation: AggregatedRelationData) =>
     {
-        return establishRelation(requester, relation.following.id);
+        return establishRelation(requester, tenant, relation.following.id);
 
     }, []);
 }
diff --git a/src/webui/features/hooks/useRemovePost.ts b/src/webui/features/hooks/useRemovePost.ts
@@ -7,6 +7,7 @@ import { useAppContext } from '^/webui/contexts';
 import { requester } from '^/domain/authentication';
 import type { AggregatedData as AggregatedPostData } from '^/domain/post/aggregate';
 import remove from '^/domain/post/remove';
+import { tenant } from '^/domain/tenant';
 
 export default function useRemovePost()
 {
@@ -15,7 +16,7 @@ export default function useRemovePost()
 
     return useCallback(async (post: AggregatedPostData) =>
     {
-        await remove(requester, post.id);
+        await remove(requester, tenant, post.id);
 
         navigate(`/profile/${identity?.nickname}`);
 
diff --git a/src/webui/features/hooks/useTogglePostRating.ts b/src/webui/features/hooks/useTogglePostRating.ts
@@ -4,12 +4,13 @@ import { useCallback } from 'react';
 import { requester } from '^/domain/authentication';
 import type { AggregatedData as AggregatedPostData } from '^/domain/post/aggregate';
 import toggleRating from '^/domain/rating/toggle';
+import { tenant } from '^/domain/tenant';
 
 export default function useTogglePostRating()
 {
     return useCallback((post: AggregatedPostData) =>
     {
-        return toggleRating(requester, post.id);
+        return toggleRating(requester, tenant, post.id);
 
     }, []);
 }
diff --git a/src/webui/features/hooks/useUpdateNickname.ts b/src/webui/features/hooks/useUpdateNickname.ts
@@ -5,6 +5,7 @@ import { requester } from '^/domain/authentication';
 import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate';
 import updateNickname from '^/domain/creator/updateNickname';
 import NicknameAlreadyExists from '^/domain/creator/updateNickname/NicknameAlreadyExists';
+import { tenant } from '^/domain/tenant';
 
 import { useAppContext } from '^/webui/contexts';
 
@@ -17,7 +18,7 @@ export default function useUpdateNickname()
     {
         try
         {
-            await updateNickname(requester, nickname);
+            await updateNickname(requester, tenant, nickname);
 
             setIdentity({ ...identity, nickname } as AggregatedCreatorData);
             setAlreadyInUse(false);
diff --git a/test/domain/creator/fixtures/index.ts b/test/domain/creator/fixtures/index.ts
@@ -2,4 +2,5 @@
 export * from './databases.fixture';
 export * from './records.fixture';
 export * from './requesters.fixture';
+export * from './tenants.fixture';
 export * from './values.fixture';
diff --git a/test/domain/creator/fixtures/records.fixture.ts b/test/domain/creator/fixtures/records.fixture.ts
diff --git a/test/domain/creator/fixtures/tenants.fixture.ts b/test/domain/creator/fixtures/tenants.fixture.ts
diff --git a/test/domain/creator/updateNickname.spec.ts b/test/domain/creator/updateNickname.spec.ts
diff --git a/test/domain/notification/fixtures/records.fixture.ts b/test/domain/notification/fixtures/records.fixture.ts
diff --git a/test/domain/post/remove.spec.ts b/test/domain/post/remove.spec.ts
diff --git a/test/domain/rating/fixtures/index.ts b/test/domain/rating/fixtures/index.ts
diff --git a/test/domain/rating/fixtures/tenants.fixture.ts b/test/domain/rating/fixtures/tenants.fixture.ts
diff --git a/test/domain/rating/toggle.spec.ts b/test/domain/rating/toggle.spec.ts
diff --git a/test/domain/relation/establish.spec.ts b/test/domain/relation/establish.spec.ts

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ export default class CreatorNotFound extends NotFound`
`5`	`5`	`{`
`6`	`6`	`constructor(id: string, tenantId: string)`
`7`	`7`	`{`
`8`		- super(`No creator for id: ${id} and tenant ${tenantId}`);
	`8`	+ super(`No creator for id: ${id} and tenant '${tenantId}'`);
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,12 @@ import database from '^/integrations/database';`
`4`	`4`	`import { RECORD_TYPE } from '../definitions';`
`5`	`5`	`import type { DataModel } from '../types';`
`6`	`6`
`7`		`-export default async function retrieveByNickname(nickname: string): Promise<DataModel \| undefined>`
	`7`	`+export default async function retrieveByNickname(tenantId: string, nickname: string): Promise<DataModel \| undefined>`
`8`	`8`	`{`
`9`		`- const query = { nickname: { EQUALS: nickname } };`
	`9`	`+ const query = {`
	`10`	`+ nickname: { EQUALS: nickname },`
	`11`	`+ tenantId: { EQUALS: tenantId }`
	`12`	`+ };`
`10`	`13`
`11`	`14`	`return database.findRecord(RECORD_TYPE, query) as Promise<DataModel \| undefined>;`
`12`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,14 @@ import database from '^/integrations/database';`
`5`	`5`	`import { RECORD_TYPE } from '../definitions';`
`6`	`6`	`import type { DataModel } from '../types';`
`7`	`7`
`8`		`-export default async function getById(id: string): Promise<DataModel>`
	`8`	`+export default async function getById(receiverId: string, id: string): Promise<DataModel>`
`9`	`9`	`{`
`10`	`10`	`const query: RecordQuery =`
`11`	`11`	`{`
`12`	`12`	`id: { EQUALS: id },`
	`13`	`+ receiverId: { EQUALS: receiverId },`
`13`	`14`	`deleted: { EQUALS: false }`
`14`	`15`	`};`
	`16`	`+`
`15`	`17`	`return database.findRecord(RECORD_TYPE, query) as Promise<DataModel>;`
`16`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import getById from '../getById';`
`8`	`8`
`9`	`9`	`export default async function getByIdAggregated(requester: Requester, tenant: Tenant, id: string): Promise<AggregatedData>`
`10`	`10`	`{`
`11`		`- const data = await getById(id);`
	`11`	`+ const data = await getById(requester.id, id);`
`12`	`12`
`13`	`13`	`return aggregate(requester, tenant, data);`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,14 @@ import getPost from '^/domain/post/getById';`
`4`	`4`	`import create from '../create';`
`5`	`5`	`import { Types } from '../definitions';`
`6`	`6`
`7`		`-export default async function createdPost(creatorId: string, postId: string, parentId?: string): Promise<void>`
	`7`	`+export default async function createdPost(tenantId: string, creatorId: string, postId: string, parentId?: string): Promise<void>`
`8`	`8`	`{`
`9`	`9`	`if (parentId === undefined)`
`10`	`10`	`{`
`11`	`11`	`return;`
`12`	`12`	`}`
`13`	`13`
`14`		`- const parentPost = await getPost(parentId);`
	`14`	`+ const parentPost = await getPost(tenantId, parentId);`
`15`	`15`
`16`	`16`	`return create(Types.REACTED_TO_POST, creatorId, parentPost.creatorId, postId);`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export default async function create(creatorId: string, tenantId: string, comicI`
`19`	`19`
`20`	`20`	`postId = await insertData(data);`
`21`	`21`
`22`		`- await publish(creatorId, postId, parentId);`
	`22`	`+ await publish(tenantId, creatorId, postId, parentId);`
`23`	`23`
`24`	`24`	`return postId;`
`25`	`25`	`}`