From e2c860c670bd81f8457da2dc45caa431d0500ed4 Mon Sep 17 00:00:00 2001 From: Bas Meeuwissen Date: Thu, 19 Dec 2024 16:52:26 +0100 Subject: [PATCH 01/14] #357: defined resources --- resources/global.resource.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 resources/global.resource.json diff --git a/resources/global.resource.json b/resources/global.resource.json new file mode 100644 index 00000000..c9086376 --- /dev/null +++ b/resources/global.resource.json @@ -0,0 +1,6 @@ +[ + "./integrations/authentication/module", + "./integrations/database/module", + "./integrations/filestore/module", + "./integrations/notification/module" +] \ No newline at end of file From 05a130291e759880139aae856c30223c3f1abae8 Mon Sep 17 00:00:00 2001 From: Bas Meeuwissen Date: Mon, 23 Dec 2024 09:39:06 +0100 Subject: [PATCH 02/14] #357: file not found :) --- resources/{global.resource.json => global.resources.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename resources/{global.resource.json => global.resources.json} (100%) diff --git a/resources/global.resource.json b/resources/global.resources.json similarity index 100% rename from resources/global.resource.json rename to resources/global.resources.json From 19b5bcb2765ab446df3fa69706e5cf80814cb8b7 Mon Sep 17 00:00:00 2001 From: Bas Meeuwissen Date: Wed, 25 Dec 2024 13:27:32 +0100 Subject: [PATCH 03/14] #361: first index resolution for resource and segment --- resources/global.resources.json | 2 +- segments/reads.segment.json | 2 +- src/domain/authentication/login/feature.ts | 2 +- src/domain/comic/erase/feature.ts | 2 +- src/domain/comic/getById/{feature.ts => index.ts} | 0 src/domain/comic/getByIdAggregated/feature.ts | 2 +- src/integrations/authentication/{module.ts => index.ts} | 0 src/integrations/runtime/authenticationMiddleware.ts | 2 +- .../runtime/middlewares/AuthenticationMiddleware.ts | 2 +- src/integrations/runtime/setUpGateway.ts | 2 +- src/integrations/runtime/tearDownGateway.ts | 2 +- test/domain/authentication/fixtures/identities.fixture.ts | 2 +- 12 files changed, 10 insertions(+), 10 deletions(-) rename src/domain/comic/getById/{feature.ts => index.ts} (100%) rename src/integrations/authentication/{module.ts => index.ts} (100%) diff --git a/resources/global.resources.json b/resources/global.resources.json index c9086376..b4c647ca 100644 --- a/resources/global.resources.json +++ b/resources/global.resources.json @@ -1,5 +1,5 @@ [ - "./integrations/authentication/module", + "./integrations/authentication", "./integrations/database/module", "./integrations/filestore/module", "./integrations/notification/module" diff --git a/segments/reads.segment.json b/segments/reads.segment.json index 4292553f..43ed3d51 100644 --- a/segments/reads.segment.json +++ b/segments/reads.segment.json @@ -1,5 +1,5 @@ { - "./domain/comic/getById/feature": { "default": { "access": "protected" } }, + "./domain/comic/getById": { "default": { "access": "protected" } }, "./domain/comment/getById/feature": { "default": { "access": "protected" } }, diff --git a/src/domain/authentication/login/feature.ts b/src/domain/authentication/login/feature.ts index c4e99388..2eaf70d6 100644 --- a/src/domain/authentication/login/feature.ts +++ b/src/domain/authentication/login/feature.ts @@ -1,5 +1,5 @@ -import { Identity } from '^/integrations/authentication/module'; +import { Identity } from '^/integrations/authentication'; import getCreatorByEmail from '^/domain/creator/getByEmail/feature'; import registerCreator from '^/domain/creator/register/feature'; diff --git a/src/domain/comic/erase/feature.ts b/src/domain/comic/erase/feature.ts index ea4ff7ab..1b15c6ea 100644 --- a/src/domain/comic/erase/feature.ts +++ b/src/domain/comic/erase/feature.ts @@ -1,7 +1,7 @@ import eraseImage from '^/domain/image/erase/feature'; -import getById from '../getById/feature'; +import getById from '../getById'; import eraseData from './eraseData'; diff --git a/src/domain/comic/getById/feature.ts b/src/domain/comic/getById/index.ts similarity index 100% rename from src/domain/comic/getById/feature.ts rename to src/domain/comic/getById/index.ts diff --git a/src/domain/comic/getByIdAggregated/feature.ts b/src/domain/comic/getByIdAggregated/feature.ts index 4e851dfd..641c9380 100644 --- a/src/domain/comic/getByIdAggregated/feature.ts +++ b/src/domain/comic/getByIdAggregated/feature.ts @@ -1,7 +1,7 @@ import aggregate from '../aggregate/feature'; import type { AggregatedData } from '../aggregate/types'; -import getById from '../getById/feature'; +import getById from '../getById'; export default async function feature(id: string): Promise { diff --git a/src/integrations/authentication/module.ts b/src/integrations/authentication/index.ts similarity index 100% rename from src/integrations/authentication/module.ts rename to src/integrations/authentication/index.ts diff --git a/src/integrations/runtime/authenticationMiddleware.ts b/src/integrations/runtime/authenticationMiddleware.ts index 1390a46e..5f681446 100644 --- a/src/integrations/runtime/authenticationMiddleware.ts +++ b/src/integrations/runtime/authenticationMiddleware.ts @@ -1,5 +1,5 @@ -import identityProvider from '^/integrations/authentication/module'; +import identityProvider from '^/integrations/authentication'; import AuthenticationMiddleware from './middlewares/AuthenticationMiddleware'; diff --git a/src/integrations/runtime/middlewares/AuthenticationMiddleware.ts b/src/integrations/runtime/middlewares/AuthenticationMiddleware.ts index 978aec81..d1a8bc81 100644 --- a/src/integrations/runtime/middlewares/AuthenticationMiddleware.ts +++ b/src/integrations/runtime/middlewares/AuthenticationMiddleware.ts @@ -1,7 +1,7 @@ import { Middleware, NextHandler, Request, Response } from 'jitar'; -import { IdentityProvider, Session } from '^/integrations/authentication/module'; +import { IdentityProvider, Session } from '^/integrations/authentication'; import { generateKey } from '^/integrations/utilities/crypto'; import Unauthorized from '../errors/Unauthorized'; diff --git a/src/integrations/runtime/setUpGateway.ts b/src/integrations/runtime/setUpGateway.ts index a57a892c..3f639155 100644 --- a/src/integrations/runtime/setUpGateway.ts +++ b/src/integrations/runtime/setUpGateway.ts @@ -1,4 +1,4 @@ -import identityProvider from '^/integrations/authentication/module'; +import identityProvider from '^/integrations/authentication'; await identityProvider.connect(); diff --git a/src/integrations/runtime/tearDownGateway.ts b/src/integrations/runtime/tearDownGateway.ts index 36955900..f4c67229 100644 --- a/src/integrations/runtime/tearDownGateway.ts +++ b/src/integrations/runtime/tearDownGateway.ts @@ -1,4 +1,4 @@ -import identityProvider from '^/integrations/authentication/module'; +import identityProvider from '^/integrations/authentication'; if (identityProvider.connected) await identityProvider.disconnect(); diff --git a/test/domain/authentication/fixtures/identities.fixture.ts b/test/domain/authentication/fixtures/identities.fixture.ts index c1122198..29ccc970 100644 --- a/test/domain/authentication/fixtures/identities.fixture.ts +++ b/test/domain/authentication/fixtures/identities.fixture.ts @@ -1,5 +1,5 @@ -import { Identity } from '^/integrations/authentication/module'; +import { Identity } from '^/integrations/authentication'; import { VALUES } from './values.fixture'; From e75bc8bd54227697ab186c2868cd1755b4f02a51 Mon Sep 17 00:00:00 2001 From: Bas Meeuwissen Date: Wed, 25 Dec 2024 13:43:23 +0100 Subject: [PATCH 04/14] #361: second item, without the re-export for now --- segments/bff.segment.json | 2 +- src/domain/post/getAllAggregated/{feature.ts => index.ts} | 2 +- src/webui/features/hooks/usePostsAll.ts | 2 +- test/domain/post/getAllAggregated.spec.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename src/domain/post/getAllAggregated/{feature.ts => index.ts} (89%) diff --git a/segments/bff.segment.json b/segments/bff.segment.json index ea3af0e6..f02f3c0f 100644 --- a/segments/bff.segment.json +++ b/segments/bff.segment.json @@ -25,7 +25,7 @@ "./domain/post/exploreAggregated/feature": { "default": { "access": "public" } }, "./domain/post/getByIdAggregated/feature": { "default": { "access": "public" } }, "./domain/post/getByCreatorAggregated/feature": { "default": { "access": "public" } }, - "./domain/post/getAllAggregated/feature": { "default": { "access": "public"}}, + "./domain/post/getAllAggregated": { "default": { "access": "public"}}, "./domain/post/getByFollowingAggregated/feature": { "default": { "access": "public" } }, "./domain/post/remove/feature": { "default": { "access": "public" } }, "./domain/post/toggleRating/feature": { "default": { "access": "public" } }, diff --git a/src/domain/post/getAllAggregated/feature.ts b/src/domain/post/getAllAggregated/index.ts similarity index 89% rename from src/domain/post/getAllAggregated/feature.ts rename to src/domain/post/getAllAggregated/index.ts index b4003e4c..f0dac420 100644 --- a/src/domain/post/getAllAggregated/feature.ts +++ b/src/domain/post/getAllAggregated/index.ts @@ -8,7 +8,7 @@ import aggregate from '../aggregate/feature'; import type { AggregatedData } from '../aggregate/types'; import getAll from '../getAll/feature'; -export default async function feature(requester: Requester, range: Range): Promise +export default async function index(requester: Requester, range: Range): Promise { validateRange(range); diff --git a/src/webui/features/hooks/usePostsAll.ts b/src/webui/features/hooks/usePostsAll.ts index 35cba634..463f94de 100644 --- a/src/webui/features/hooks/usePostsAll.ts +++ b/src/webui/features/hooks/usePostsAll.ts @@ -2,7 +2,7 @@ import { useCallback } from 'react'; import requester from '^/domain/authentication/requester'; -import getPostsAll from '^/domain/post/getAllAggregated/feature'; +import getPostsAll from '^/domain/post/getAllAggregated'; import { usePagination } from '^/webui/hooks'; diff --git a/test/domain/post/getAllAggregated.spec.ts b/test/domain/post/getAllAggregated.spec.ts index f3b045ac..1cd07376 100644 --- a/test/domain/post/getAllAggregated.spec.ts +++ b/test/domain/post/getAllAggregated.spec.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import getAllAggregated from '^/domain/post/getAllAggregated/feature'; +import getAllAggregated from '^/domain/post/getAllAggregated'; import { DATA_URLS, DATABASES, FILE_STORES, REQUESTERS } from './fixtures'; beforeEach(async () => From fec5ecb35b9f561f8e8c45d8f3ba1784fe92389b Mon Sep 17 00:00:00 2001 From: Bas Meeuwissen Date: Fri, 3 Jan 2025 13:57:27 +0100 Subject: [PATCH 05/14] #361: updated segments with latest changes --- jitar.json | 4 +++- segments/{bff.segment.json => bff.json} | 0 segments/{notification.segment.json => notification.json} | 0 segments/{reads.segment.json => reads.json} | 0 segments/{writes.segment.json => writes.json} | 0 5 files changed, 3 insertions(+), 1 deletion(-) rename segments/{bff.segment.json => bff.json} (100%) rename segments/{notification.segment.json => notification.json} (100%) rename segments/{reads.segment.json => reads.json} (100%) rename segments/{writes.segment.json => writes.json} (100%) diff --git a/jitar.json b/jitar.json index b4c921fe..0b5cfb99 100644 --- a/jitar.json +++ b/jitar.json @@ -1,4 +1,6 @@ { "source": "./dist", - "target": "./dist" + "target": "./dist", + "segments": "./segments", + "resources": "./resources" } \ No newline at end of file diff --git a/segments/bff.segment.json b/segments/bff.json similarity index 100% rename from segments/bff.segment.json rename to segments/bff.json diff --git a/segments/notification.segment.json b/segments/notification.json similarity index 100% rename from segments/notification.segment.json rename to segments/notification.json diff --git a/segments/reads.segment.json b/segments/reads.json similarity index 100% rename from segments/reads.segment.json rename to segments/reads.json diff --git a/segments/writes.segment.json b/segments/writes.json similarity index 100% rename from segments/writes.segment.json rename to segments/writes.json From 7578073f17fc39be4437f859f26690c241c8a177 Mon Sep 17 00:00:00 2001 From: Peter van Vliet Date: Wed, 8 Jan 2025 13:38:23 +0100 Subject: [PATCH 06/14] #361: added index files to domain --- example.env | 2 +- package.json | 1 + segments/bff.json | 66 ++++++++----------- segments/notification.json | 6 +- segments/reads.json | 40 ++++++----- segments/writes.json | 28 ++++---- .../{feature.ts => getLoginUrl.ts} | 2 +- .../authentication/getLoginUrl/index.ts | 2 + src/domain/authentication/index.ts | 3 + src/domain/authentication/login/index.ts | 2 + .../login/{feature.ts => login.ts} | 6 +- src/domain/authentication/logout/index.ts | 2 + .../logout/{feature.ts => logout.ts} | 2 +- .../aggregate/{feature.ts => aggregate.ts} | 4 +- src/domain/comic/aggregate/index.ts | 4 ++ src/domain/comic/aggregate/types.ts | 2 +- .../comic/create/{feature.ts => create.ts} | 4 +- src/domain/comic/create/index.ts | 4 ++ .../comic/erase/{feature.ts => erase.ts} | 4 +- src/domain/comic/erase/index.ts | 2 + .../feature.ts => comic/getById/getById.ts} | 2 +- src/domain/comic/getById/index.ts | 10 +-- src/domain/comic/getByIdAggregated/feature.ts | 11 ---- .../getByIdAggregated/getByIdAggregated.ts | 10 +++ src/domain/comic/getByIdAggregated/index.ts | 2 + src/domain/comic/index.ts | 4 ++ .../comment/create/{feature.ts => create.ts} | 2 +- src/domain/comment/create/index.ts | 4 ++ .../feature.ts => comment/erase/erase.ts} | 2 +- src/domain/comment/erase/index.ts | 2 + .../feature.ts => comment/getById/getById.ts} | 2 +- src/domain/comment/getById/index.ts | 2 + src/domain/comment/index.ts | 4 ++ src/domain/common/validateRange/index.ts | 6 ++ .../common/{ => validateRange}/types.ts | 0 .../{feature.ts => validateRange.ts} | 4 +- .../aggregate/{feature.ts => aggregate.ts} | 4 +- src/domain/creator/aggregate/index.ts | 4 ++ src/domain/creator/aggregate/types.ts | 2 +- .../{feature.ts => cleanNickname.ts} | 4 +- .../creator/cleanNickname/definitions.ts | 2 + src/domain/creator/cleanNickname/index.ts | 2 + .../creator/create/{feature.ts => create.ts} | 2 +- src/domain/creator/create/index.ts | 2 + .../{feature.ts => generateNickname.ts} | 4 +- src/domain/creator/generateNickname/index.ts | 4 ++ .../getByEmail/{feature.ts => getByEmail.ts} | 2 +- src/domain/creator/getByEmail/index.ts | 2 + .../feature.ts => creator/getById/getById.ts} | 2 +- src/domain/creator/getById/index.ts | 2 + .../creator/getByIdAggregated/feature.ts | 11 ---- .../getByIdAggregated/getByIdAggregated.ts | 10 +++ src/domain/creator/getByIdAggregated/index.ts | 2 + .../{feature.ts => getByNickname.ts} | 2 +- src/domain/creator/getByNickname/index.ts | 4 ++ .../getByNicknameAggregated/feature.ts | 11 ---- .../getByNicknameAggregated.ts | 10 +++ .../creator/getByNicknameAggregated/index.ts | 2 + src/domain/creator/getMe/feature.ts | 10 --- src/domain/creator/getMe/getMe.ts | 10 +++ src/domain/creator/getMe/index.ts | 2 + src/domain/creator/getMeAggregated/feature.ts | 13 ---- .../getMeAggregated/getMeAggregated.ts | 12 ++++ src/domain/creator/getMeAggregated/index.ts | 2 + .../getOthers/{feature.ts => getOthers.ts} | 2 +- src/domain/creator/getOthers/index.ts | 2 + src/domain/creator/index.ts | 6 ++ .../creator/register/downloadPortrait.ts | 2 +- src/domain/creator/register/index.ts | 2 + .../register/{feature.ts => register.ts} | 6 +- src/domain/creator/update/index.ts | 2 + .../feature.ts => creator/update/update.ts} | 2 +- .../creator/updateFollowerCount/index.ts | 2 + .../{feature.ts => updateFollowerCount.ts} | 6 +- .../creator/updateFollowingCount/index.ts | 2 + .../{feature.ts => updateFollowingCount.ts} | 6 +- src/domain/creator/updateFullName/feature.ts | 12 ---- src/domain/creator/updateFullName/index.ts | 2 + .../creator/updateFullName/updateFullName.ts | 12 ++++ src/domain/creator/updateNickname/index.ts | 4 ++ .../{feature.ts => updateNickname.ts} | 8 +-- src/domain/creator/updatePostCount/index.ts | 2 + .../{feature.ts => updatePostCount.ts} | 6 +- src/domain/image/create/create.ts | 13 ++++ src/domain/image/create/feature.ts | 13 ---- src/domain/image/create/index.ts | 4 ++ .../download/{feature.ts => download.ts} | 6 +- src/domain/image/download/index.ts | 4 ++ .../erase/feature.ts => image/erase/erase.ts} | 2 +- src/domain/image/erase/index.ts | 2 + .../image/getById/{feature.ts => getById.ts} | 4 +- src/domain/image/getById/index.ts | 2 + src/domain/image/getById/types.ts | 6 -- src/domain/image/index.ts | 4 ++ src/domain/image/save/index.ts | 4 ++ src/domain/image/save/{feature.ts => save.ts} | 2 +- src/domain/image/types.ts | 6 +- src/domain/image/validate/index.ts | 2 + .../validate/{feature.ts => validate.ts} | 2 +- .../aggregate/{feature.ts => aggregate.ts} | 10 +-- src/domain/notification/aggregate/index.ts | 4 ++ src/domain/notification/aggregate/types.ts | 12 ++-- .../create/{feature.ts => create.ts} | 2 +- src/domain/notification/create/index.ts | 2 + .../getById/getById.ts} | 2 +- src/domain/notification/getById/index.ts | 2 + .../notification/getByIdAggregated/feature.ts | 13 ---- .../getByIdAggregated/getByIdAggregated.ts | 12 ++++ .../notification/getByIdAggregated/index.ts | 2 + .../getRecent/{feature.ts => getRecent.ts} | 2 +- src/domain/notification/getRecent/index.ts | 2 + .../{feature.ts => getRecentAggregated.ts} | 12 ++-- .../notification/getRecentAggregated/index.ts | 2 + src/domain/notification/index.ts | 4 ++ src/domain/post/add/{feature.ts => add.ts} | 12 ++-- src/domain/post/add/index.ts | 2 + .../aggregate/{feature.ts => aggregate.ts} | 10 +-- src/domain/post/aggregate/index.ts | 4 ++ src/domain/post/aggregate/types.ts | 8 +-- .../post/create/{feature.ts => create.ts} | 2 +- src/domain/post/create/index.ts | 2 + .../erase/feature.ts => post/erase/erase.ts} | 2 +- src/domain/post/erase/index.ts | 2 + .../post/explore/{feature.ts => explore.ts} | 6 +- src/domain/post/explore/index.ts | 2 + .../{feature.ts => exploreAggregated.ts} | 12 ++-- src/domain/post/exploreAggregated/index.ts | 2 + .../post/getAll/{feature.ts => getAll.ts} | 4 +- src/domain/post/getAll/index.ts | 2 + .../post/getAllAggregated/getAllAggregated.ts | 32 +++++++++ src/domain/post/getAllAggregated/index.ts | 34 +--------- .../{feature.ts => getByCreator.ts} | 2 +- src/domain/post/getByCreator/index.ts | 2 + .../{feature.ts => getByCreatorAggregated.ts} | 12 ++-- .../post/getByCreatorAggregated/index.ts | 2 + .../{feature.ts => getByFollowing.ts} | 6 +- src/domain/post/getByFollowing/index.ts | 2 + ...feature.ts => getByFollowingAggregated.ts} | 12 ++-- .../post/getByFollowingAggregated/index.ts | 2 + .../post/getById/{feature.ts => getById.ts} | 2 +- src/domain/post/getById/index.ts | 2 + src/domain/post/getByIdAggregated/feature.ts | 15 ----- .../getByIdAggregated/getByIdAggregated.ts | 14 ++++ src/domain/post/getByIdAggregated/index.ts | 2 + src/domain/post/index.ts | 6 ++ src/domain/post/remove/index.ts | 2 + .../post/remove/{feature.ts => remove.ts} | 6 +- src/domain/post/toggleRating/index.ts | 2 + .../{feature.ts => toggleRating.ts} | 14 ++-- src/domain/post/update/index.ts | 2 + .../feature.ts => post/update/update.ts} | 2 +- src/domain/post/updateRatingCount/index.ts | 2 + .../updateRatingCount/updateRatingCount.ts} | 6 +- src/domain/post/updateReactionCount/index.ts | 2 + .../{feature.ts => updateReactionCount.ts} | 6 +- .../rating/exists/{feature.ts => exists.ts} | 2 +- src/domain/rating/exists/index.ts | 2 + src/domain/rating/index.ts | 4 ++ src/domain/rating/update/index.ts | 4 ++ .../rating/update/{feature.ts => update.ts} | 4 +- .../aggregate/{feature.ts => aggregate.ts} | 12 ++-- src/domain/reaction/aggregate/index.ts | 4 ++ src/domain/reaction/aggregate/types.ts | 8 +-- .../reaction/create/{feature.ts => create.ts} | 10 +-- src/domain/reaction/create/index.ts | 4 ++ src/domain/reaction/createComic/feature.ts | 12 ---- src/domain/reaction/createComment/feature.ts | 12 ---- .../createWithComic/createWithComic.ts | 12 ++++ src/domain/reaction/createWithComic/index.ts | 2 + .../createWithComment/createWithComment.ts | 12 ++++ .../reaction/createWithComment/index.ts | 2 + src/domain/reaction/getById/getById.ts | 10 +++ src/domain/reaction/getById/index.ts | 2 + .../reaction/getByIdAggregated/feature.ts | 13 ---- .../getByIdAggregated/getByIdAggregated.ts | 12 ++++ .../reaction/getByIdAggregated/index.ts | 2 + .../getByPost/{feature.ts => getByPost.ts} | 2 +- src/domain/reaction/getByPost/index.ts | 2 + .../{feature.ts => getByPostAggregated.ts} | 11 ++-- .../reaction/getByPostAggregated/index.ts | 2 + src/domain/reaction/index.ts | 4 ++ src/domain/reaction/remove/index.ts | 4 ++ .../reaction/remove/{feature.ts => remove.ts} | 6 +- src/domain/reaction/toggleRating/index.ts | 2 + .../{feature.ts => toggleRating.ts} | 14 ++-- src/domain/reaction/update/index.ts | 2 + .../reaction/update/{feature.ts => update.ts} | 2 +- .../reaction/updateRatingCount/index.ts | 2 + .../updateRatingCount/updateRatingCount.ts} | 6 +- .../aggregate/{feature.ts => aggregate.ts} | 4 +- src/domain/relation/aggregate/index.ts | 4 ++ src/domain/relation/aggregate/types.ts | 4 +- .../establish/{feature.ts => establish.ts} | 12 ++-- src/domain/relation/establish/index.ts | 5 ++ .../explore/{feature.ts => explore.ts} | 8 +-- src/domain/relation/explore/index.ts | 2 + .../exploreAggregated/exploreAggregated.ts | 16 +++++ .../relation/exploreAggregated/feature.ts | 18 ----- .../relation/exploreAggregated/index.ts | 2 + .../relation/get/{feature.ts => get.ts} | 2 +- src/domain/relation/get/index.ts | 2 + src/domain/relation/getAggregated/feature.ts | 11 ---- .../relation/getAggregated/getAggregated.ts | 10 +++ src/domain/relation/getAggregated/index.ts | 2 + src/domain/relation/getFollowers/feature.ts | 14 ---- .../relation/getFollowers/getFollowers.ts | 14 ++++ src/domain/relation/getFollowers/index.ts | 2 + .../getFollowersAggregated/feature.ts | 17 ----- .../getFollowersAggregated.ts | 15 +++++ .../relation/getFollowersAggregated/index.ts | 2 + src/domain/relation/getFollowing/feature.ts | 14 ---- .../relation/getFollowing/getFollowing.ts | 14 ++++ src/domain/relation/getFollowing/index.ts | 2 + .../relation/getFollowing/retrieveData.ts | 2 +- .../getFollowingAggregated/feature.ts | 17 ----- .../getFollowingAggregated.ts | 15 +++++ .../relation/getFollowingAggregated/index.ts | 2 + src/domain/relation/index.ts | 4 ++ .../relation/translateToRequester/index.ts | 2 + .../translateToRequester/translate.ts | 4 +- .../{feature.ts => translateToRequester.ts} | 4 +- .../runtime/authenticationMiddleware.ts | 6 +- src/webui/components/application/Footer.tsx | 4 +- src/webui/components/application/Header.tsx | 4 +- src/webui/components/application/Identity.tsx | 4 +- src/webui/components/application/Sidebar.tsx | 4 +- src/webui/components/comic/Image.tsx | 4 +- .../components/creator/ConciseIdentity.tsx | 4 +- src/webui/components/creator/Counters.tsx | 6 +- src/webui/components/creator/FullIdentity.tsx | 4 +- src/webui/components/creator/Profile.tsx | 4 +- src/webui/components/creator/TimeElapsed.tsx | 6 +- src/webui/components/notification/Panel.tsx | 24 +++---- .../components/notification/PanelList.tsx | 18 ++--- .../notification/elementary/AddedReaction.tsx | 10 +-- .../elementary/RatedComicReaction.tsx | 6 +- .../elementary/RatedCommentReaction.tsx | 6 +- .../notification/elementary/RatedPost.tsx | 6 +- .../notification/elementary/RatedReaction.tsx | 6 +- src/webui/components/post/DetailsPanel.tsx | 14 ++-- src/webui/components/post/LargePanel.tsx | 16 ++--- src/webui/components/post/PanelGrid.tsx | 10 +-- src/webui/components/post/PanelList.tsx | 16 ++--- src/webui/components/post/SmallPanel.tsx | 4 +- src/webui/components/reaction/LargePanel.tsx | 14 ++-- src/webui/components/reaction/PanelList.tsx | 14 ++-- src/webui/components/relation/Counters.tsx | 4 +- src/webui/components/relation/Panel.tsx | 4 +- src/webui/components/relation/PanelList.tsx | 10 +-- src/webui/components/relation/Profile.tsx | 6 +- src/webui/components/relation/TimeElapsed.tsx | 10 +-- src/webui/contexts/AppContext.tsx | 8 +-- .../contexts/hooks/useAppContextValue.ts | 6 +- src/webui/features/CreateReaction.tsx | 8 +-- src/webui/features/CreatorComics.tsx | 4 +- src/webui/features/CreatorFollowers.tsx | 6 +- src/webui/features/CreatorFollowing.tsx | 6 +- src/webui/features/EditProfile.tsx | 8 +-- src/webui/features/ExploreCreators.tsx | 6 +- src/webui/features/Notifications.tsx | 4 +- src/webui/features/PostDetails.tsx | 8 +-- src/webui/features/Profile.tsx | 12 ++-- src/webui/features/ReactionDetails.tsx | 14 ++-- src/webui/features/Reactions.tsx | 18 ++--- src/webui/features/hooks/useAddComicPost.ts | 4 +- .../features/hooks/useCreateComicReaction.ts | 12 ++-- .../hooks/useCreateCommentReaction.ts | 12 ++-- src/webui/features/hooks/useCreator.ts | 8 +-- .../features/hooks/useCreatorFollowers.ts | 8 +-- .../features/hooks/useCreatorFollowing.ts | 8 +-- src/webui/features/hooks/useCreatorPosts.ts | 8 +-- .../features/hooks/useEstablishRelation.ts | 8 +-- .../features/hooks/useExploreCreators.ts | 4 +- src/webui/features/hooks/useExplorePosts.ts | 4 +- src/webui/features/hooks/useIdentify.ts | 8 +-- src/webui/features/hooks/useLogin.ts | 2 +- src/webui/features/hooks/useLogout.ts | 2 +- src/webui/features/hooks/useNotifications.ts | 4 +- src/webui/features/hooks/usePost.ts | 4 +- src/webui/features/hooks/usePostsAll.ts | 2 +- src/webui/features/hooks/usePostsFollowing.ts | 4 +- src/webui/features/hooks/useReaction.ts | 4 +- src/webui/features/hooks/useReactions.ts | 8 +-- src/webui/features/hooks/useRemovePost.ts | 8 +-- src/webui/features/hooks/useRemoveReaction.ts | 8 +-- .../hooks/useRemoveReactionFromList.ts | 10 +-- .../features/hooks/useTogglePostRating.ts | 8 +-- .../features/hooks/useToggleReactionRating.ts | 8 +-- src/webui/features/hooks/useUpdateFullName.ts | 8 +-- src/webui/features/hooks/useUpdateNickname.ts | 9 +-- .../features/hooks/useViewPostDetails.ts | 4 +- src/webui/features/hooks/useViewProfile.ts | 4 +- .../features/hooks/useViewReactionDetails.ts | 4 +- .../fixtures/databases.fixture.ts | 2 +- test/domain/authentication/login.spec.ts | 4 +- test/domain/comic/create.spec.ts | 2 +- test/domain/comment/create.spec.ts | 5 +- test/domain/common/validateRange.spec.ts | 3 +- .../creator/fixtures/databases.fixture.ts | 2 +- .../creator/fixtures/requesters.fixture.ts | 4 +- test/domain/creator/updateFullName.spec.ts | 4 +- test/domain/creator/updateNickname.spec.ts | 5 +- test/domain/image/create.spec.ts | 5 +- test/domain/image/download.spec.ts | 5 +- test/domain/notification/create.spec.ts | 4 +- .../fixtures/databases.fixture.ts | 14 ++-- .../notification/fixtures/records.fixture.ts | 2 +- .../notification/getRecentAggregated.spec.ts | 4 +- test/domain/post/add.spec.ts | 4 +- .../domain/post/fixtures/databases.fixture.ts | 12 ++-- .../post/fixtures/requesters.fixture.ts | 4 +- .../post/getByFollowingAggregated.spec.ts | 2 +- test/domain/post/remove.spec.ts | 5 +- test/domain/post/toggleRating.spec.ts | 6 +- .../rating/fixtures/requesters.fixture.ts | 2 +- test/domain/rating/update.spec.ts | 3 +- test/domain/reaction/create.spec.ts | 7 +- test/domain/reaction/createComic.spec.ts | 6 +- test/domain/reaction/createComment.spec.ts | 6 +- .../reaction/fixtures/databases.fixture.ts | 14 ++-- .../reaction/fixtures/requesters.fixture.ts | 4 +- .../reaction/getByPostAggregated.spec.ts | 2 +- test/domain/reaction/remove.spec.ts | 5 +- test/domain/reaction/toggleRating.spec.ts | 4 +- test/domain/relation/establish.spec.ts | 8 +-- .../domain/relation/exploreAggregated.spec.ts | 2 +- .../relation/fixtures/databases.fixture.ts | 4 +- .../relation/fixtures/requesters.fixture.ts | 4 +- .../relation/getFollowersAggregated.spec.ts | 2 +- .../relation/getFollowingAggregated.spec.ts | 2 +- 330 files changed, 1137 insertions(+), 927 deletions(-) rename src/domain/authentication/getLoginUrl/{feature.ts => getLoginUrl.ts} (65%) create mode 100644 src/domain/authentication/getLoginUrl/index.ts create mode 100644 src/domain/authentication/index.ts create mode 100644 src/domain/authentication/login/index.ts rename src/domain/authentication/login/{feature.ts => login.ts} (70%) create mode 100644 src/domain/authentication/logout/index.ts rename src/domain/authentication/logout/{feature.ts => logout.ts} (64%) rename src/domain/comic/aggregate/{feature.ts => aggregate.ts} (58%) create mode 100644 src/domain/comic/aggregate/index.ts rename src/domain/comic/create/{feature.ts => create.ts} (66%) create mode 100644 src/domain/comic/create/index.ts rename src/domain/comic/erase/{feature.ts => erase.ts} (60%) create mode 100644 src/domain/comic/erase/index.ts rename src/domain/{comment/getById/feature.ts => comic/getById/getById.ts} (78%) delete mode 100644 src/domain/comic/getByIdAggregated/feature.ts create mode 100644 src/domain/comic/getByIdAggregated/getByIdAggregated.ts create mode 100644 src/domain/comic/getByIdAggregated/index.ts create mode 100644 src/domain/comic/index.ts rename src/domain/comment/create/{feature.ts => create.ts} (75%) create mode 100644 src/domain/comment/create/index.ts rename src/domain/{post/erase/feature.ts => comment/erase/erase.ts} (70%) create mode 100644 src/domain/comment/erase/index.ts rename src/domain/{reaction/getById/feature.ts => comment/getById/getById.ts} (78%) create mode 100644 src/domain/comment/getById/index.ts create mode 100644 src/domain/comment/index.ts create mode 100644 src/domain/common/validateRange/index.ts rename src/domain/common/{ => validateRange}/types.ts (100%) rename src/domain/common/validateRange/{feature.ts => validateRange.ts} (86%) rename src/domain/creator/aggregate/{feature.ts => aggregate.ts} (78%) create mode 100644 src/domain/creator/aggregate/index.ts rename src/domain/creator/cleanNickname/{feature.ts => cleanNickname.ts} (61%) create mode 100644 src/domain/creator/cleanNickname/definitions.ts create mode 100644 src/domain/creator/cleanNickname/index.ts rename src/domain/creator/create/{feature.ts => create.ts} (67%) create mode 100644 src/domain/creator/create/index.ts rename src/domain/creator/generateNickname/{feature.ts => generateNickname.ts} (88%) create mode 100644 src/domain/creator/generateNickname/index.ts rename src/domain/creator/getByEmail/{feature.ts => getByEmail.ts} (76%) create mode 100644 src/domain/creator/getByEmail/index.ts rename src/domain/{notification/getById/feature.ts => creator/getById/getById.ts} (78%) create mode 100644 src/domain/creator/getById/index.ts delete mode 100644 src/domain/creator/getByIdAggregated/feature.ts create mode 100644 src/domain/creator/getByIdAggregated/getByIdAggregated.ts create mode 100644 src/domain/creator/getByIdAggregated/index.ts rename src/domain/creator/getByNickname/{feature.ts => getByNickname.ts} (84%) create mode 100644 src/domain/creator/getByNickname/index.ts delete mode 100644 src/domain/creator/getByNicknameAggregated/feature.ts create mode 100644 src/domain/creator/getByNicknameAggregated/getByNicknameAggregated.ts create mode 100644 src/domain/creator/getByNicknameAggregated/index.ts delete mode 100644 src/domain/creator/getMe/feature.ts create mode 100644 src/domain/creator/getMe/getMe.ts create mode 100644 src/domain/creator/getMe/index.ts delete mode 100644 src/domain/creator/getMeAggregated/feature.ts create mode 100644 src/domain/creator/getMeAggregated/getMeAggregated.ts create mode 100644 src/domain/creator/getMeAggregated/index.ts rename src/domain/creator/getOthers/{feature.ts => getOthers.ts} (83%) create mode 100644 src/domain/creator/getOthers/index.ts create mode 100644 src/domain/creator/index.ts create mode 100644 src/domain/creator/register/index.ts rename src/domain/creator/register/{feature.ts => register.ts} (65%) create mode 100644 src/domain/creator/update/index.ts rename src/domain/{post/update/feature.ts => creator/update/update.ts} (76%) create mode 100644 src/domain/creator/updateFollowerCount/index.ts rename src/domain/creator/updateFollowerCount/{feature.ts => updateFollowerCount.ts} (61%) create mode 100644 src/domain/creator/updateFollowingCount/index.ts rename src/domain/creator/updateFollowingCount/{feature.ts => updateFollowingCount.ts} (61%) delete mode 100644 src/domain/creator/updateFullName/feature.ts create mode 100644 src/domain/creator/updateFullName/index.ts create mode 100644 src/domain/creator/updateFullName/updateFullName.ts create mode 100644 src/domain/creator/updateNickname/index.ts rename src/domain/creator/updateNickname/{feature.ts => updateNickname.ts} (60%) create mode 100644 src/domain/creator/updatePostCount/index.ts rename src/domain/creator/updatePostCount/{feature.ts => updatePostCount.ts} (59%) create mode 100644 src/domain/image/create/create.ts delete mode 100644 src/domain/image/create/feature.ts create mode 100644 src/domain/image/create/index.ts rename src/domain/image/download/{feature.ts => download.ts} (63%) create mode 100644 src/domain/image/download/index.ts rename src/domain/{comment/erase/feature.ts => image/erase/erase.ts} (70%) create mode 100644 src/domain/image/erase/index.ts rename src/domain/image/getById/{feature.ts => getById.ts} (74%) create mode 100644 src/domain/image/getById/index.ts delete mode 100644 src/domain/image/getById/types.ts create mode 100644 src/domain/image/index.ts create mode 100644 src/domain/image/save/index.ts rename src/domain/image/save/{feature.ts => save.ts} (88%) create mode 100644 src/domain/image/validate/index.ts rename src/domain/image/validate/{feature.ts => validate.ts} (92%) rename src/domain/notification/aggregate/{feature.ts => aggregate.ts} (67%) create mode 100644 src/domain/notification/aggregate/index.ts rename src/domain/notification/create/{feature.ts => create.ts} (74%) create mode 100644 src/domain/notification/create/index.ts rename src/domain/{creator/getById/feature.ts => notification/getById/getById.ts} (78%) create mode 100644 src/domain/notification/getById/index.ts delete mode 100644 src/domain/notification/getByIdAggregated/feature.ts create mode 100644 src/domain/notification/getByIdAggregated/getByIdAggregated.ts create mode 100644 src/domain/notification/getByIdAggregated/index.ts rename src/domain/notification/getRecent/{feature.ts => getRecent.ts} (80%) create mode 100644 src/domain/notification/getRecent/index.ts rename src/domain/notification/getRecentAggregated/{feature.ts => getRecentAggregated.ts} (58%) create mode 100644 src/domain/notification/getRecentAggregated/index.ts create mode 100644 src/domain/notification/index.ts rename src/domain/post/add/{feature.ts => add.ts} (63%) create mode 100644 src/domain/post/add/index.ts rename src/domain/post/aggregate/{feature.ts => aggregate.ts} (60%) create mode 100644 src/domain/post/aggregate/index.ts rename src/domain/post/create/{feature.ts => create.ts} (64%) create mode 100644 src/domain/post/create/index.ts rename src/domain/{image/erase/feature.ts => post/erase/erase.ts} (70%) create mode 100644 src/domain/post/erase/index.ts rename src/domain/post/explore/{feature.ts => explore.ts} (76%) create mode 100644 src/domain/post/explore/index.ts rename src/domain/post/exploreAggregated/{feature.ts => exploreAggregated.ts} (56%) create mode 100644 src/domain/post/exploreAggregated/index.ts rename src/domain/post/getAll/{feature.ts => getAll.ts} (74%) create mode 100644 src/domain/post/getAll/index.ts create mode 100644 src/domain/post/getAllAggregated/getAllAggregated.ts rename src/domain/post/getByCreator/{feature.ts => getByCreator.ts} (81%) create mode 100644 src/domain/post/getByCreator/index.ts rename src/domain/post/getByCreatorAggregated/{feature.ts => getByCreatorAggregated.ts} (56%) create mode 100644 src/domain/post/getByCreatorAggregated/index.ts rename src/domain/post/getByFollowing/{feature.ts => getByFollowing.ts} (65%) create mode 100644 src/domain/post/getByFollowing/index.ts rename src/domain/post/getByFollowingAggregated/{feature.ts => getByFollowingAggregated.ts} (55%) create mode 100644 src/domain/post/getByFollowingAggregated/index.ts rename src/domain/post/getById/{feature.ts => getById.ts} (88%) create mode 100644 src/domain/post/getById/index.ts delete mode 100644 src/domain/post/getByIdAggregated/feature.ts create mode 100644 src/domain/post/getByIdAggregated/getByIdAggregated.ts create mode 100644 src/domain/post/getByIdAggregated/index.ts create mode 100644 src/domain/post/index.ts create mode 100644 src/domain/post/remove/index.ts rename src/domain/post/remove/{feature.ts => remove.ts} (84%) create mode 100644 src/domain/post/toggleRating/index.ts rename src/domain/post/toggleRating/{feature.ts => toggleRating.ts} (61%) create mode 100644 src/domain/post/update/index.ts rename src/domain/{creator/update/feature.ts => post/update/update.ts} (76%) create mode 100644 src/domain/post/updateRatingCount/index.ts rename src/domain/{reaction/updateRatingCount/feature.ts => post/updateRatingCount/updateRatingCount.ts} (60%) create mode 100644 src/domain/post/updateReactionCount/index.ts rename src/domain/post/updateReactionCount/{feature.ts => updateReactionCount.ts} (61%) rename src/domain/rating/exists/{feature.ts => exists.ts} (71%) create mode 100644 src/domain/rating/exists/index.ts create mode 100644 src/domain/rating/index.ts create mode 100644 src/domain/rating/update/index.ts rename src/domain/rating/update/{feature.ts => update.ts} (66%) rename src/domain/reaction/aggregate/{feature.ts => aggregate.ts} (62%) create mode 100644 src/domain/reaction/aggregate/index.ts rename src/domain/reaction/create/{feature.ts => create.ts} (70%) create mode 100644 src/domain/reaction/create/index.ts delete mode 100644 src/domain/reaction/createComic/feature.ts delete mode 100644 src/domain/reaction/createComment/feature.ts create mode 100644 src/domain/reaction/createWithComic/createWithComic.ts create mode 100644 src/domain/reaction/createWithComic/index.ts create mode 100644 src/domain/reaction/createWithComment/createWithComment.ts create mode 100644 src/domain/reaction/createWithComment/index.ts create mode 100644 src/domain/reaction/getById/getById.ts create mode 100644 src/domain/reaction/getById/index.ts delete mode 100644 src/domain/reaction/getByIdAggregated/feature.ts create mode 100644 src/domain/reaction/getByIdAggregated/getByIdAggregated.ts create mode 100644 src/domain/reaction/getByIdAggregated/index.ts rename src/domain/reaction/getByPost/{feature.ts => getByPost.ts} (82%) create mode 100644 src/domain/reaction/getByPost/index.ts rename src/domain/reaction/getByPostAggregated/{feature.ts => getByPostAggregated.ts} (58%) create mode 100644 src/domain/reaction/getByPostAggregated/index.ts create mode 100644 src/domain/reaction/index.ts create mode 100644 src/domain/reaction/remove/index.ts rename src/domain/reaction/remove/{feature.ts => remove.ts} (85%) create mode 100644 src/domain/reaction/toggleRating/index.ts rename src/domain/reaction/toggleRating/{feature.ts => toggleRating.ts} (62%) create mode 100644 src/domain/reaction/update/index.ts rename src/domain/reaction/update/{feature.ts => update.ts} (76%) create mode 100644 src/domain/reaction/updateRatingCount/index.ts rename src/domain/{post/updateRatingCount/feature.ts => reaction/updateRatingCount/updateRatingCount.ts} (60%) rename src/domain/relation/aggregate/{feature.ts => aggregate.ts} (68%) create mode 100644 src/domain/relation/aggregate/index.ts rename src/domain/relation/establish/{feature.ts => establish.ts} (81%) create mode 100644 src/domain/relation/establish/index.ts rename src/domain/relation/explore/{feature.ts => explore.ts} (71%) create mode 100644 src/domain/relation/explore/index.ts create mode 100644 src/domain/relation/exploreAggregated/exploreAggregated.ts delete mode 100644 src/domain/relation/exploreAggregated/feature.ts create mode 100644 src/domain/relation/exploreAggregated/index.ts rename src/domain/relation/get/{feature.ts => get.ts} (82%) create mode 100644 src/domain/relation/get/index.ts delete mode 100644 src/domain/relation/getAggregated/feature.ts create mode 100644 src/domain/relation/getAggregated/getAggregated.ts create mode 100644 src/domain/relation/getAggregated/index.ts delete mode 100644 src/domain/relation/getFollowers/feature.ts create mode 100644 src/domain/relation/getFollowers/getFollowers.ts create mode 100644 src/domain/relation/getFollowers/index.ts delete mode 100644 src/domain/relation/getFollowersAggregated/feature.ts create mode 100644 src/domain/relation/getFollowersAggregated/getFollowersAggregated.ts create mode 100644 src/domain/relation/getFollowersAggregated/index.ts delete mode 100644 src/domain/relation/getFollowing/feature.ts create mode 100644 src/domain/relation/getFollowing/getFollowing.ts create mode 100644 src/domain/relation/getFollowing/index.ts delete mode 100644 src/domain/relation/getFollowingAggregated/feature.ts create mode 100644 src/domain/relation/getFollowingAggregated/getFollowingAggregated.ts create mode 100644 src/domain/relation/getFollowingAggregated/index.ts create mode 100644 src/domain/relation/index.ts create mode 100644 src/domain/relation/translateToRequester/index.ts rename src/domain/relation/translateToRequester/{feature.ts => translateToRequester.ts} (51%) diff --git a/example.env b/example.env index c41bef90..172a0a47 100644 --- a/example.env +++ b/example.env @@ -25,7 +25,7 @@ AUTHENTICATION_IMPLEMENTATION="openid" OPENID_ISSUER="http://localhost:8080/realms/comify" OPENID_CLIENT_ID="openid" OPENID_CLIENT_SECRET="" -OPENID_REDIRECT_URI="http://localhost:3000/rpc/domain/authentication/login/feature" +OPENID_REDIRECT_URI="http://localhost:3000/rpc/domain/authentication/login" # HTTP (fetch) HTTP_IMPLEMENTATION="fetch" diff --git a/package.json b/package.json index b00ec23f..dfe5d852 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "changelog-debug": "auto-changelog --template changelog.hbs -p --template json --output changelog-data.json", "review": "npm run compile && npm run lint && npm run test", "rebuild": "npm run clean && npm run build && npm run standalone", + "standalone": "jitar start --env-file=development.env --service=services/standalone.json --http-body-limit=512000", "repository": "jitar start --env-file=development.env --service=services/repository.json", "proxy": "jitar start --env-file=development.env --service=services/proxy.json --http-body-limit=512000", diff --git a/segments/bff.json b/segments/bff.json index f02f3c0f..b15ab48a 100644 --- a/segments/bff.json +++ b/segments/bff.json @@ -1,47 +1,35 @@ { - "./domain/authentication/getLoginUrl/feature": { "default": { "access": "public" } }, - "./domain/authentication/login/feature": { "default": { "access": "public" } }, - "./domain/authentication/logout/feature": { "default": { "access": "public" } }, + "./domain/authentication/getLoginUrl": { "default": { "access": "public" } }, + "./domain/authentication/login": { "default": { "access": "public" } }, + "./domain/authentication/logout": { "default": { "access": "public" } }, - "./domain/comic/create/feature": { "default": { "access": "private" } }, + "./domain/creator/getByNicknameAggregated": { "default": { "access": "public" } }, + "./domain/creator/getMeAggregated": { "default": { "access": "public" } }, + "./domain/creator/updateFullName": { "default": { "access": "public" }}, + "./domain/creator/updateNickname": { "default": { "access": "public" }}, - "./domain/creator/aggregate/feature": { "default": { "access": "private" } }, - "./domain/creator/getByNicknameAggregated/feature": { "default": { "access": "public" } }, - "./domain/creator/getByIdAggregated/feature": { "default": { "access": "private" } }, - "./domain/creator/getMeAggregated/feature": { "default": { "access": "public" } }, - "./domain/creator/register/feature": { "default": { "access": "private" }}, - "./domain/creator/updateFullName/feature": { "default": { "access": "public" }}, - "./domain/creator/updateNickname/feature": { "default": { "access": "public" }}, - - "./domain/image/create/feature": { "default": { "access": "private" } }, - "./domain/image/download/feature": { "default": { "access": "private" } }, - - "./domain/notification/aggregate/feature": { "default": { "access": "private" } }, - "./domain/notification/getRecentAggregated/feature": { "default": { "access": "public" } }, - "./domain/notification/getByIdAggregated/feature": { "default": { "access": "public" } }, + "./domain/notification/getRecentAggregated": { "default": { "access": "public" } }, + "./domain/notification/getByIdAggregated": { "default": { "access": "public" } }, - "./domain/post/add/feature": { "default": { "access": "public" } }, - "./domain/post/aggregate/feature": { "default": { "access": "private" } }, - "./domain/post/exploreAggregated/feature": { "default": { "access": "public" } }, - "./domain/post/getByIdAggregated/feature": { "default": { "access": "public" } }, - "./domain/post/getByCreatorAggregated/feature": { "default": { "access": "public" } }, + "./domain/post/add": { "default": { "access": "public" } }, + "./domain/post/exploreAggregated": { "default": { "access": "public" } }, + "./domain/post/getByIdAggregated": { "default": { "access": "public" } }, + "./domain/post/getByCreatorAggregated": { "default": { "access": "public" } }, "./domain/post/getAllAggregated": { "default": { "access": "public"}}, - "./domain/post/getByFollowingAggregated/feature": { "default": { "access": "public" } }, - "./domain/post/remove/feature": { "default": { "access": "public" } }, - "./domain/post/toggleRating/feature": { "default": { "access": "public" } }, + "./domain/post/getByFollowingAggregated": { "default": { "access": "public" } }, + "./domain/post/remove": { "default": { "access": "public" } }, + "./domain/post/toggleRating": { "default": { "access": "public" } }, - "./domain/reaction/aggregate/feature": { "default": { "access": "private" } }, - "./domain/reaction/createComic/feature": { "default": { "access": "public" } }, - "./domain/reaction/createComment/feature": { "default": { "access": "public" } }, - "./domain/reaction/getByIdAggregated/feature": { "default": { "access": "public" } }, - "./domain/reaction/getByPostAggregated/feature": { "default": { "access": "public" } }, - "./domain/reaction/remove/feature": { "default": { "access": "public" } }, - "./domain/reaction/toggleRating/feature": { "default": { "access": "public" } }, + "./domain/reaction/createWithComic": { "default": { "access": "public" } }, + "./domain/reaction/createWithComment": { "default": { "access": "public" } }, + "./domain/reaction/getByIdAggregated": { "default": { "access": "public" } }, + "./domain/reaction/getByPostAggregated": { "default": { "access": "public" } }, + "./domain/reaction/remove": { "default": { "access": "public" } }, + "./domain/reaction/toggleRating": { "default": { "access": "public" } }, - "./domain/relation/aggregate/feature": { "default": { "access": "private" } }, - "./domain/relation/exploreAggregated/feature": { "default": { "access": "public" } }, - "./domain/relation/establish/feature": { "default": { "access": "public" }}, - "./domain/relation/getAggregated/feature": { "default": { "access": "public" } }, - "./domain/relation/getFollowersAggregated/feature": { "default": { "access": "public" } }, - "./domain/relation/getFollowingAggregated/feature": { "default": { "access": "public" } } + "./domain/relation/exploreAggregated": { "default": { "access": "public" } }, + "./domain/relation/establish": { "default": { "access": "public" }}, + "./domain/relation/getAggregated": { "default": { "access": "public" } }, + "./domain/relation/getFollowersAggregated": { "default": { "access": "public" } }, + "./domain/relation/getFollowingAggregated": { "default": { "access": "public" } } } \ No newline at end of file diff --git a/segments/notification.json b/segments/notification.json index 613cefb7..79854f4f 100644 --- a/segments/notification.json +++ b/segments/notification.json @@ -1,5 +1,5 @@ { - "./domain/notification/create/feature": { "default": { "access": "protected" } }, - "./domain/notification/getById/feature": { "default": { "access": "protected" } }, - "./domain/notification/getRecent/feature": { "default": { "access": "protected" } } + "./domain/notification/create": { "default": { "access": "protected" } }, + "./domain/notification/getById": { "default": { "access": "protected" } }, + "./domain/notification/getRecent": { "default": { "access": "protected" } } } \ No newline at end of file diff --git a/segments/reads.json b/segments/reads.json index 43ed3d51..078b1ff5 100644 --- a/segments/reads.json +++ b/segments/reads.json @@ -1,31 +1,29 @@ { "./domain/comic/getById": { "default": { "access": "protected" } }, - "./domain/comment/getById/feature": { "default": { "access": "protected" } }, + "./domain/comment/getById": { "default": { "access": "protected" } }, - "./domain/creator/getById/feature": { "default": { "access": "protected" } }, - "./domain/creator/getByEmail/feature": { "default": { "access": "protected" } }, - "./domain/creator/getByNickname/feature": { "default": { "access": "protected" } }, - "./domain/creator/getMe/feature": { "default": { "access": "protected" } }, - "./domain/creator/getOthers/feature": { "default": { "access": "private" } }, + "./domain/creator/getById": { "default": { "access": "protected" } }, + "./domain/creator/getByEmail": { "default": { "access": "protected" } }, + "./domain/creator/getByNickname": { "default": { "access": "protected" } }, + "./domain/creator/getMe": { "default": { "access": "protected" } }, - "./domain/image/getById/feature": { "default": { "access": "protected" } }, + "./domain/image/getById": { "default": { "access": "protected" } }, - "./domain/post/explore/feature": { "default": { "access": "protected" } }, - "./domain/post/getAll/feature": { "default": { "access": "protected" } }, - "./domain/post/getByCreator/feature": { "default": { "access": "protected" } }, - "./domain/post/getByFollowing/feature": { "default": { "access": "protected" } }, - "./domain/post/getById/feature": { "default": { "access": "protected" } }, + "./domain/post/explore": { "default": { "access": "protected" } }, + "./domain/post/getAll": { "default": { "access": "protected" } }, + "./domain/post/getByCreator": { "default": { "access": "protected" } }, + "./domain/post/getByFollowing": { "default": { "access": "protected" } }, + "./domain/post/getById": { "default": { "access": "protected" } }, - "./domain/rating/exists/feature": { "default": { "access": "protected" } }, + "./domain/rating/exists": { "default": { "access": "protected" } }, - "./domain/reaction/getById/feature": { "default": { "access": "protected" } }, - "./domain/reaction/getByPost/feature": { "default": { "access": "protected" } }, + "./domain/reaction/getById": { "default": { "access": "protected" } }, + "./domain/reaction/getByPost": { "default": { "access": "protected" } }, - "./domain/relation/establish/dataExists": { "default": { "access": "protected" } }, - "./domain/relation/explore/feature": { "default": { "access": "protected" } }, - "./domain/relation/get/feature": { "default": { "access": "protected" } }, - "./domain/relation/getFollowers/feature": { "default": { "access": "protected" } }, - "./domain/relation/getFollowing/feature": { "default": { "access": "protected" } }, - "./domain/relation/translateToRequester/feature": { "default": { "access": "private" } } + "./domain/relation/establish": { "default": { "access": "protected" } }, + "./domain/relation/explore": { "default": { "access": "protected" } }, + "./domain/relation/get": { "default": { "access": "protected" } }, + "./domain/relation/getFollowers": { "default": { "access": "protected" } }, + "./domain/relation/getFollowing": { "default": { "access": "protected" } } } \ No newline at end of file diff --git a/segments/writes.json b/segments/writes.json index 56b3dd5c..7cefbd69 100644 --- a/segments/writes.json +++ b/segments/writes.json @@ -1,26 +1,26 @@ { - "./domain/comic/create/feature": { "default": { "access": "protected" } }, - "./domain/comic/erase/feature": { "default": { "access": "protected" } }, + "./domain/comic/create/insertData": { "default": { "access": "protected" } }, + "./domain/comic/erase": { "default": { "access": "protected" } }, - "./domain/comment/create/feature": { "default": { "access": "protected" } }, - "./domain/comment/erase/feature": { "default": { "access": "protected" } }, + "./domain/comment/create": { "default": { "access": "protected" } }, + "./domain/comment/erase": { "default": { "access": "protected" } }, - "./domain/creator/create/feature": { "default": { "access": "protected" } }, - "./domain/creator/update/feature": { "default": { "access": "protected" } }, + "./domain/creator/create": { "default": { "access": "protected" } }, + "./domain/creator/update": { "default": { "access": "protected" } }, - "./domain/image/save/feature": { "default": { "access": "protected" } }, - "./domain/image/erase/feature": { "default": { "access": "protected" } }, + "./domain/image/save": { "default": { "access": "protected" } }, + "./domain/image/erase": { "default": { "access": "protected" } }, - "./domain/post/create/feature": { "default": { "access": "protected" } }, - "./domain/post/erase/feature": { "default": { "access": "protected" } }, + "./domain/post/create": { "default": { "access": "protected" } }, + "./domain/post/erase": { "default": { "access": "protected" } }, "./domain/post/remove/deleteData": { "default": { "access": "protected" }}, - "./domain/post/update/feature": { "default": { "access": "protected" } }, + "./domain/post/update": { "default": { "access": "protected" } }, - "./domain/rating/update/feature": { "default": { "access": "protected" } }, + "./domain/rating/update": { "default": { "access": "protected" } }, - "./domain/reaction/create/feature": { "default": { "access": "protected" } }, + "./domain/reaction/create": { "default": { "access": "protected" } }, "./domain/reaction/remove/deleteData": { "default": { "access": "protected" } }, - "./domain/reaction/update/feature": { "default": { "access": "protected" } }, + "./domain/reaction/update": { "default": { "access": "protected" } }, "./domain/relation/establish/insertData": { "default": { "access": "protected" } }, "./domain/relation/establish/eraseData": { "default": { "access": "protected" } } diff --git a/src/domain/authentication/getLoginUrl/feature.ts b/src/domain/authentication/getLoginUrl/getLoginUrl.ts similarity index 65% rename from src/domain/authentication/getLoginUrl/feature.ts rename to src/domain/authentication/getLoginUrl/getLoginUrl.ts index 02b4dfd4..544e04ab 100644 --- a/src/domain/authentication/getLoginUrl/feature.ts +++ b/src/domain/authentication/getLoginUrl/getLoginUrl.ts @@ -1,5 +1,5 @@ -export default async function feature(): Promise +export default async function getLoginUrl(): Promise { // This is a dummy function. // The authentication middleware will provide the login url. diff --git a/src/domain/authentication/getLoginUrl/index.ts b/src/domain/authentication/getLoginUrl/index.ts new file mode 100644 index 00000000..48bbb51c --- /dev/null +++ b/src/domain/authentication/getLoginUrl/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getLoginUrl'; diff --git a/src/domain/authentication/index.ts b/src/domain/authentication/index.ts new file mode 100644 index 00000000..3146a77f --- /dev/null +++ b/src/domain/authentication/index.ts @@ -0,0 +1,3 @@ + +export { default as requester } from './requester'; +export type { Requester } from './types'; diff --git a/src/domain/authentication/login/index.ts b/src/domain/authentication/login/index.ts new file mode 100644 index 00000000..e0285033 --- /dev/null +++ b/src/domain/authentication/login/index.ts @@ -0,0 +1,2 @@ + +export { default } from './login'; diff --git a/src/domain/authentication/login/feature.ts b/src/domain/authentication/login/login.ts similarity index 70% rename from src/domain/authentication/login/feature.ts rename to src/domain/authentication/login/login.ts index 2eaf70d6..3f710f03 100644 --- a/src/domain/authentication/login/feature.ts +++ b/src/domain/authentication/login/login.ts @@ -1,12 +1,12 @@ import { Identity } from '^/integrations/authentication'; -import getCreatorByEmail from '^/domain/creator/getByEmail/feature'; -import registerCreator from '^/domain/creator/register/feature'; +import getCreatorByEmail from '^/domain/creator/getByEmail'; +import registerCreator from '^/domain/creator/register'; import type { Requester } from '../types'; -export default async function feature(identity: Identity): Promise +export default async function login(identity: Identity): Promise { const existingCreator = await getCreatorByEmail(identity.email); diff --git a/src/domain/authentication/logout/index.ts b/src/domain/authentication/logout/index.ts new file mode 100644 index 00000000..50ccf3d5 --- /dev/null +++ b/src/domain/authentication/logout/index.ts @@ -0,0 +1,2 @@ + +export { default } from './logout'; diff --git a/src/domain/authentication/logout/feature.ts b/src/domain/authentication/logout/logout.ts similarity index 64% rename from src/domain/authentication/logout/feature.ts rename to src/domain/authentication/logout/logout.ts index 6fa67e29..ec7f715d 100644 --- a/src/domain/authentication/logout/feature.ts +++ b/src/domain/authentication/logout/logout.ts @@ -1,5 +1,5 @@ -export default async function feature(): Promise +export default async function logout(): Promise { // This is a dummy function. // The authentication middleware will handle the logout. diff --git a/src/domain/comic/aggregate/feature.ts b/src/domain/comic/aggregate/aggregate.ts similarity index 58% rename from src/domain/comic/aggregate/feature.ts rename to src/domain/comic/aggregate/aggregate.ts index 7a6e56d9..63b65c8f 100644 --- a/src/domain/comic/aggregate/feature.ts +++ b/src/domain/comic/aggregate/aggregate.ts @@ -1,10 +1,10 @@ -import getImageData from '^/domain/image/getById/feature'; +import getImageData from '^/domain/image/getById/getById'; import type { DataModel } from '../types'; import type { AggregatedData } from './types'; -export default async function feature(data: DataModel): Promise +export default async function aggregate(data: DataModel): Promise { const imageData = await getImageData(data.imageId); diff --git a/src/domain/comic/aggregate/index.ts b/src/domain/comic/aggregate/index.ts new file mode 100644 index 00000000..19b59674 --- /dev/null +++ b/src/domain/comic/aggregate/index.ts @@ -0,0 +1,4 @@ + +export { default } from './aggregate'; + +export type { AggregatedData } from './types'; diff --git a/src/domain/comic/aggregate/types.ts b/src/domain/comic/aggregate/types.ts index d82c3f8a..dcaff9cb 100644 --- a/src/domain/comic/aggregate/types.ts +++ b/src/domain/comic/aggregate/types.ts @@ -1,5 +1,5 @@ -import type { ImageData } from '^/domain/image/getById/types'; +import type { ImageData } from '^/domain/image'; import type { DataModel } from '../types'; diff --git a/src/domain/comic/create/feature.ts b/src/domain/comic/create/create.ts similarity index 66% rename from src/domain/comic/create/feature.ts rename to src/domain/comic/create/create.ts index b2d12e63..4fd6005f 100644 --- a/src/domain/comic/create/feature.ts +++ b/src/domain/comic/create/create.ts @@ -1,5 +1,5 @@ -import createImage from '^/domain/image/create/feature'; +import createImage from '^/domain/image/create/create'; import { IMAGE_TYPE } from '../definitions'; @@ -7,7 +7,7 @@ import createData from './createData'; import insertData from './insertData'; import validateData from './validateData'; -export default async function feature(imageDataUrl: string, structure: string | undefined = undefined): Promise +export default async function create(imageDataUrl: string, structure: string | undefined = undefined): Promise { const imageId = await createImage(IMAGE_TYPE, imageDataUrl); diff --git a/src/domain/comic/create/index.ts b/src/domain/comic/create/index.ts new file mode 100644 index 00000000..7293ebed --- /dev/null +++ b/src/domain/comic/create/index.ts @@ -0,0 +1,4 @@ + +export { default } from './create'; + +export { default as InvalidComic } from './InvalidComic'; diff --git a/src/domain/comic/erase/feature.ts b/src/domain/comic/erase/erase.ts similarity index 60% rename from src/domain/comic/erase/feature.ts rename to src/domain/comic/erase/erase.ts index 1b15c6ea..c1c7b6aa 100644 --- a/src/domain/comic/erase/feature.ts +++ b/src/domain/comic/erase/erase.ts @@ -1,11 +1,11 @@ -import eraseImage from '^/domain/image/erase/feature'; +import eraseImage from '^/domain/image/erase'; import getById from '../getById'; import eraseData from './eraseData'; -export default async function feature(id: string): Promise +export default async function erase(id: string): Promise { const data = await getById(id); diff --git a/src/domain/comic/erase/index.ts b/src/domain/comic/erase/index.ts new file mode 100644 index 00000000..e74c873f --- /dev/null +++ b/src/domain/comic/erase/index.ts @@ -0,0 +1,2 @@ + +export { default } from './erase'; diff --git a/src/domain/comment/getById/feature.ts b/src/domain/comic/getById/getById.ts similarity index 78% rename from src/domain/comment/getById/feature.ts rename to src/domain/comic/getById/getById.ts index cfcea8f4..73bf5931 100644 --- a/src/domain/comment/getById/feature.ts +++ b/src/domain/comic/getById/getById.ts @@ -4,7 +4,7 @@ import database from '^/integrations/database/module'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; -export default async function feature(id: string): Promise +export default async function getById(id: string): Promise { return database.readRecord(RECORD_TYPE, id) as Promise; } diff --git a/src/domain/comic/getById/index.ts b/src/domain/comic/getById/index.ts index cfcea8f4..da399eb0 100644 --- a/src/domain/comic/getById/index.ts +++ b/src/domain/comic/getById/index.ts @@ -1,10 +1,2 @@ -import database from '^/integrations/database/module'; - -import { RECORD_TYPE } from '../definitions'; -import type { DataModel } from '../types'; - -export default async function feature(id: string): Promise -{ - return database.readRecord(RECORD_TYPE, id) as Promise; -} +export { default } from './getById'; diff --git a/src/domain/comic/getByIdAggregated/feature.ts b/src/domain/comic/getByIdAggregated/feature.ts deleted file mode 100644 index 641c9380..00000000 --- a/src/domain/comic/getByIdAggregated/feature.ts +++ /dev/null @@ -1,11 +0,0 @@ - -import aggregate from '../aggregate/feature'; -import type { AggregatedData } from '../aggregate/types'; -import getById from '../getById'; - -export default async function feature(id: string): Promise -{ - const data = await getById(id); - - return aggregate(data); -} diff --git a/src/domain/comic/getByIdAggregated/getByIdAggregated.ts b/src/domain/comic/getByIdAggregated/getByIdAggregated.ts new file mode 100644 index 00000000..c224b082 --- /dev/null +++ b/src/domain/comic/getByIdAggregated/getByIdAggregated.ts @@ -0,0 +1,10 @@ + +import aggregate, { AggregatedData } from '../aggregate'; +import getById from '../getById'; + +export default async function getByIdAggregated(id: string): Promise +{ + const data = await getById(id); + + return aggregate(data); +} diff --git a/src/domain/comic/getByIdAggregated/index.ts b/src/domain/comic/getByIdAggregated/index.ts new file mode 100644 index 00000000..8f7f2b94 --- /dev/null +++ b/src/domain/comic/getByIdAggregated/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getByIdAggregated'; diff --git a/src/domain/comic/index.ts b/src/domain/comic/index.ts new file mode 100644 index 00000000..e30b2168 --- /dev/null +++ b/src/domain/comic/index.ts @@ -0,0 +1,4 @@ + +export { IMAGE_TYPE, RECORD_TYPE } from './definitions'; + +export type { DataModel } from './types'; diff --git a/src/domain/comment/create/feature.ts b/src/domain/comment/create/create.ts similarity index 75% rename from src/domain/comment/create/feature.ts rename to src/domain/comment/create/create.ts index 9bba0936..13936804 100644 --- a/src/domain/comment/create/feature.ts +++ b/src/domain/comment/create/create.ts @@ -3,7 +3,7 @@ import createData from './createData'; import insertData from './insertData'; import validateData from './validateData'; -export default async function feature(message: string): Promise +export default async function create(message: string): Promise { const data = createData(message); diff --git a/src/domain/comment/create/index.ts b/src/domain/comment/create/index.ts new file mode 100644 index 00000000..1f3f14de --- /dev/null +++ b/src/domain/comment/create/index.ts @@ -0,0 +1,4 @@ + +export { default } from './create'; + +export { default as InvalidComment } from './InvalidComment'; diff --git a/src/domain/post/erase/feature.ts b/src/domain/comment/erase/erase.ts similarity index 70% rename from src/domain/post/erase/feature.ts rename to src/domain/comment/erase/erase.ts index 6e894d2e..ea8d43b6 100644 --- a/src/domain/post/erase/feature.ts +++ b/src/domain/comment/erase/erase.ts @@ -3,7 +3,7 @@ import database from '^/integrations/database/module'; import { RECORD_TYPE } from '../definitions'; -export default async function feature(id: string): Promise +export default async function erase(id: string): Promise { return database.deleteRecord(RECORD_TYPE, id); } diff --git a/src/domain/comment/erase/index.ts b/src/domain/comment/erase/index.ts new file mode 100644 index 00000000..e74c873f --- /dev/null +++ b/src/domain/comment/erase/index.ts @@ -0,0 +1,2 @@ + +export { default } from './erase'; diff --git a/src/domain/reaction/getById/feature.ts b/src/domain/comment/getById/getById.ts similarity index 78% rename from src/domain/reaction/getById/feature.ts rename to src/domain/comment/getById/getById.ts index cfcea8f4..73bf5931 100644 --- a/src/domain/reaction/getById/feature.ts +++ b/src/domain/comment/getById/getById.ts @@ -4,7 +4,7 @@ import database from '^/integrations/database/module'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; -export default async function feature(id: string): Promise +export default async function getById(id: string): Promise { return database.readRecord(RECORD_TYPE, id) as Promise; } diff --git a/src/domain/comment/getById/index.ts b/src/domain/comment/getById/index.ts new file mode 100644 index 00000000..da399eb0 --- /dev/null +++ b/src/domain/comment/getById/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getById'; diff --git a/src/domain/comment/index.ts b/src/domain/comment/index.ts new file mode 100644 index 00000000..273c9eea --- /dev/null +++ b/src/domain/comment/index.ts @@ -0,0 +1,4 @@ + +export { RECORD_TYPE } from './definitions'; + +export type { DataModel } from './types'; diff --git a/src/domain/common/validateRange/index.ts b/src/domain/common/validateRange/index.ts new file mode 100644 index 00000000..264515d3 --- /dev/null +++ b/src/domain/common/validateRange/index.ts @@ -0,0 +1,6 @@ + +export { default } from './validateRange'; + +export { default as InvalidRange } from './InvalidRange'; + +export type { Range } from './types'; diff --git a/src/domain/common/types.ts b/src/domain/common/validateRange/types.ts similarity index 100% rename from src/domain/common/types.ts rename to src/domain/common/validateRange/types.ts diff --git a/src/domain/common/validateRange/feature.ts b/src/domain/common/validateRange/validateRange.ts similarity index 86% rename from src/domain/common/validateRange/feature.ts rename to src/domain/common/validateRange/validateRange.ts index 9ce62fab..ef25a062 100644 --- a/src/domain/common/validateRange/feature.ts +++ b/src/domain/common/validateRange/validateRange.ts @@ -1,7 +1,7 @@ import validator, { ValidationSchema } from '^/integrations/validation/module'; -import { Range } from '../types'; +import { Range } from './types'; import InvalidRange from './InvalidRange'; @@ -28,7 +28,7 @@ const schema: ValidationSchema = } }; -export default function feature({ offset, limit }: Range): void +export default function validateRange({ offset, limit }: Range): void { const result = validator.validate({ offset, limit }, schema); diff --git a/src/domain/creator/aggregate/feature.ts b/src/domain/creator/aggregate/aggregate.ts similarity index 78% rename from src/domain/creator/aggregate/feature.ts rename to src/domain/creator/aggregate/aggregate.ts index 993914f4..f2bd9168 100644 --- a/src/domain/creator/aggregate/feature.ts +++ b/src/domain/creator/aggregate/aggregate.ts @@ -1,10 +1,10 @@ -import getImageData from '^/domain/image/getById/feature'; +import getImageData from '^/domain/image/getById/getById'; import { DataModel } from '../types'; import { AggregatedData } from './types'; -export default async function feature(data: DataModel): Promise +export default async function aggregate(data: DataModel): Promise { const portraitData = data.portraitId !== undefined ? await getImageData(data.portraitId) diff --git a/src/domain/creator/aggregate/index.ts b/src/domain/creator/aggregate/index.ts new file mode 100644 index 00000000..19b59674 --- /dev/null +++ b/src/domain/creator/aggregate/index.ts @@ -0,0 +1,4 @@ + +export { default } from './aggregate'; + +export type { AggregatedData } from './types'; diff --git a/src/domain/creator/aggregate/types.ts b/src/domain/creator/aggregate/types.ts index f2022a95..ff83ab63 100644 --- a/src/domain/creator/aggregate/types.ts +++ b/src/domain/creator/aggregate/types.ts @@ -1,5 +1,5 @@ -import type { ImageData } from '^/domain/image/getById/types'; +import type { ImageData } from '^/domain/image'; import type { DataModel } from '../types'; diff --git a/src/domain/creator/cleanNickname/feature.ts b/src/domain/creator/cleanNickname/cleanNickname.ts similarity index 61% rename from src/domain/creator/cleanNickname/feature.ts rename to src/domain/creator/cleanNickname/cleanNickname.ts index 43bd8db6..6f97707f 100644 --- a/src/domain/creator/cleanNickname/feature.ts +++ b/src/domain/creator/cleanNickname/cleanNickname.ts @@ -1,9 +1,9 @@ import { NICKNAME_MAX_LENGTH } from '../definitions'; -const REPLACE_EXPRESSION = /[^a-z0-9]/g; +import { REPLACE_EXPRESSION } from './definitions'; -export default function feature(nickname: string): string +export default function cleanNickname(nickname: string): string { return nickname .toLowerCase() diff --git a/src/domain/creator/cleanNickname/definitions.ts b/src/domain/creator/cleanNickname/definitions.ts new file mode 100644 index 00000000..c6d056e0 --- /dev/null +++ b/src/domain/creator/cleanNickname/definitions.ts @@ -0,0 +1,2 @@ + +export const REPLACE_EXPRESSION = /[^a-z0-9]/g; diff --git a/src/domain/creator/cleanNickname/index.ts b/src/domain/creator/cleanNickname/index.ts new file mode 100644 index 00000000..9bf1c195 --- /dev/null +++ b/src/domain/creator/cleanNickname/index.ts @@ -0,0 +1,2 @@ + +export { default } from './cleanNickname'; diff --git a/src/domain/creator/create/feature.ts b/src/domain/creator/create/create.ts similarity index 67% rename from src/domain/creator/create/feature.ts rename to src/domain/creator/create/create.ts index 52e96d73..b09c8a29 100644 --- a/src/domain/creator/create/feature.ts +++ b/src/domain/creator/create/create.ts @@ -5,7 +5,7 @@ import createData from './createData'; import insertData from './insertData'; import validateData from './validateData'; -export default async function feature(fullName: string, nickname: string, email: string, portraitId: string | undefined = undefined): Promise +export default async function create(fullName: string, nickname: string, email: string, portraitId: string | undefined = undefined): Promise { const data = await createData(fullName, nickname, email, portraitId); diff --git a/src/domain/creator/create/index.ts b/src/domain/creator/create/index.ts new file mode 100644 index 00000000..01487567 --- /dev/null +++ b/src/domain/creator/create/index.ts @@ -0,0 +1,2 @@ + +export { default } from './create'; diff --git a/src/domain/creator/generateNickname/feature.ts b/src/domain/creator/generateNickname/generateNickname.ts similarity index 88% rename from src/domain/creator/generateNickname/feature.ts rename to src/domain/creator/generateNickname/generateNickname.ts index 4b93d3bc..3a6b315d 100644 --- a/src/domain/creator/generateNickname/feature.ts +++ b/src/domain/creator/generateNickname/generateNickname.ts @@ -1,12 +1,12 @@ -import cleanNickname from '../cleanNickname/feature'; +import cleanNickname from '../cleanNickname'; import TooManySimilarNicknames from './TooManySimilarNicknames'; import retrieveByNickname from './retrieveByNickname'; import retrieveByStartNickname from './retrieveByStartNickname'; const MAX_NICKNAME_NUMBER = 1000; -export default async function feature(nickname: string): Promise +export default async function generateNickname(nickname: string): Promise { const cleanedNickname = cleanNickname(nickname); diff --git a/src/domain/creator/generateNickname/index.ts b/src/domain/creator/generateNickname/index.ts new file mode 100644 index 00000000..9e50aaee --- /dev/null +++ b/src/domain/creator/generateNickname/index.ts @@ -0,0 +1,4 @@ + +export { default } from './generateNickname'; + +export { default as TooManySimilarNicknames } from './TooManySimilarNicknames'; diff --git a/src/domain/creator/getByEmail/feature.ts b/src/domain/creator/getByEmail/getByEmail.ts similarity index 76% rename from src/domain/creator/getByEmail/feature.ts rename to src/domain/creator/getByEmail/getByEmail.ts index 8e5dfa11..b906ceba 100644 --- a/src/domain/creator/getByEmail/feature.ts +++ b/src/domain/creator/getByEmail/getByEmail.ts @@ -4,7 +4,7 @@ import database from '^/integrations/database/module'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; -export default async function feature(email: string): Promise +export default async function getByEmail(email: string): Promise { const query = { email: { EQUALS: email } }; diff --git a/src/domain/creator/getByEmail/index.ts b/src/domain/creator/getByEmail/index.ts new file mode 100644 index 00000000..6fc38dcc --- /dev/null +++ b/src/domain/creator/getByEmail/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getByEmail'; diff --git a/src/domain/notification/getById/feature.ts b/src/domain/creator/getById/getById.ts similarity index 78% rename from src/domain/notification/getById/feature.ts rename to src/domain/creator/getById/getById.ts index cfcea8f4..73bf5931 100644 --- a/src/domain/notification/getById/feature.ts +++ b/src/domain/creator/getById/getById.ts @@ -4,7 +4,7 @@ import database from '^/integrations/database/module'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; -export default async function feature(id: string): Promise +export default async function getById(id: string): Promise { return database.readRecord(RECORD_TYPE, id) as Promise; } diff --git a/src/domain/creator/getById/index.ts b/src/domain/creator/getById/index.ts new file mode 100644 index 00000000..da399eb0 --- /dev/null +++ b/src/domain/creator/getById/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getById'; diff --git a/src/domain/creator/getByIdAggregated/feature.ts b/src/domain/creator/getByIdAggregated/feature.ts deleted file mode 100644 index 4e851dfd..00000000 --- a/src/domain/creator/getByIdAggregated/feature.ts +++ /dev/null @@ -1,11 +0,0 @@ - -import aggregate from '../aggregate/feature'; -import type { AggregatedData } from '../aggregate/types'; -import getById from '../getById/feature'; - -export default async function feature(id: string): Promise -{ - const data = await getById(id); - - return aggregate(data); -} diff --git a/src/domain/creator/getByIdAggregated/getByIdAggregated.ts b/src/domain/creator/getByIdAggregated/getByIdAggregated.ts new file mode 100644 index 00000000..c224b082 --- /dev/null +++ b/src/domain/creator/getByIdAggregated/getByIdAggregated.ts @@ -0,0 +1,10 @@ + +import aggregate, { AggregatedData } from '../aggregate'; +import getById from '../getById'; + +export default async function getByIdAggregated(id: string): Promise +{ + const data = await getById(id); + + return aggregate(data); +} diff --git a/src/domain/creator/getByIdAggregated/index.ts b/src/domain/creator/getByIdAggregated/index.ts new file mode 100644 index 00000000..8f7f2b94 --- /dev/null +++ b/src/domain/creator/getByIdAggregated/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getByIdAggregated'; diff --git a/src/domain/creator/getByNickname/feature.ts b/src/domain/creator/getByNickname/getByNickname.ts similarity index 84% rename from src/domain/creator/getByNickname/feature.ts rename to src/domain/creator/getByNickname/getByNickname.ts index 5f193602..65262a0d 100644 --- a/src/domain/creator/getByNickname/feature.ts +++ b/src/domain/creator/getByNickname/getByNickname.ts @@ -5,7 +5,7 @@ import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; import NicknameNotFound from './NicknameNotFound'; -export default async function feature(nickname: string): Promise +export default async function getByNickname(nickname: string): Promise { const query = { nickname: { EQUALS: nickname } }; diff --git a/src/domain/creator/getByNickname/index.ts b/src/domain/creator/getByNickname/index.ts new file mode 100644 index 00000000..c7f367a3 --- /dev/null +++ b/src/domain/creator/getByNickname/index.ts @@ -0,0 +1,4 @@ + +export { default } from './getByNickname'; + +export { default as NicknameNotFound } from './NicknameNotFound'; diff --git a/src/domain/creator/getByNicknameAggregated/feature.ts b/src/domain/creator/getByNicknameAggregated/feature.ts deleted file mode 100644 index a4ca42ca..00000000 --- a/src/domain/creator/getByNicknameAggregated/feature.ts +++ /dev/null @@ -1,11 +0,0 @@ - -import aggregate from '../aggregate/feature'; -import type { AggregatedData } from '../aggregate/types'; -import getByNickname from '../getByNickname/feature'; - -export default async function feature(nickname: string): Promise -{ - const data = await getByNickname(nickname); - - return aggregate(data); -} diff --git a/src/domain/creator/getByNicknameAggregated/getByNicknameAggregated.ts b/src/domain/creator/getByNicknameAggregated/getByNicknameAggregated.ts new file mode 100644 index 00000000..35f69043 --- /dev/null +++ b/src/domain/creator/getByNicknameAggregated/getByNicknameAggregated.ts @@ -0,0 +1,10 @@ + +import aggregate, { AggregatedData } from '../aggregate'; +import getByNickname from '../getByNickname'; + +export default async function getByNicknameAggregated(nickname: string): Promise +{ + const data = await getByNickname(nickname); + + return aggregate(data); +} diff --git a/src/domain/creator/getByNicknameAggregated/index.ts b/src/domain/creator/getByNicknameAggregated/index.ts new file mode 100644 index 00000000..738a959a --- /dev/null +++ b/src/domain/creator/getByNicknameAggregated/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getByNicknameAggregated'; diff --git a/src/domain/creator/getMe/feature.ts b/src/domain/creator/getMe/feature.ts deleted file mode 100644 index 26ad9a51..00000000 --- a/src/domain/creator/getMe/feature.ts +++ /dev/null @@ -1,10 +0,0 @@ - -import { Requester } from '^/domain/authentication/types'; - -import getById from '../getById/feature'; -import type { DataModel } from '../types'; - -export default async function feature(requester: Requester): Promise -{ - return getById(requester.id); -} diff --git a/src/domain/creator/getMe/getMe.ts b/src/domain/creator/getMe/getMe.ts new file mode 100644 index 00000000..491f5480 --- /dev/null +++ b/src/domain/creator/getMe/getMe.ts @@ -0,0 +1,10 @@ + +import { Requester } from '^/domain/authentication'; + +import getById from '../getById'; +import type { DataModel } from '../types'; + +export default async function getMe(requester: Requester): Promise +{ + return getById(requester.id); +} diff --git a/src/domain/creator/getMe/index.ts b/src/domain/creator/getMe/index.ts new file mode 100644 index 00000000..f7193fef --- /dev/null +++ b/src/domain/creator/getMe/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getMe'; diff --git a/src/domain/creator/getMeAggregated/feature.ts b/src/domain/creator/getMeAggregated/feature.ts deleted file mode 100644 index 30bd6e8e..00000000 --- a/src/domain/creator/getMeAggregated/feature.ts +++ /dev/null @@ -1,13 +0,0 @@ - -import { Requester } from '^/domain/authentication/types'; - -import aggregate from '../aggregate/feature'; -import type { AggregatedData } from '../aggregate/types'; -import getMe from '../getMe/feature'; - -export default async function feature(requester: Requester): Promise -{ - const data = await getMe(requester); - - return aggregate(data); -} diff --git a/src/domain/creator/getMeAggregated/getMeAggregated.ts b/src/domain/creator/getMeAggregated/getMeAggregated.ts new file mode 100644 index 00000000..690d10d0 --- /dev/null +++ b/src/domain/creator/getMeAggregated/getMeAggregated.ts @@ -0,0 +1,12 @@ + +import { Requester } from '^/domain/authentication'; + +import aggregate, { AggregatedData } from '../aggregate'; +import getMe from '../getMe'; + +export default async function getMeAggregated(requester: Requester): Promise +{ + const data = await getMe(requester); + + return aggregate(data); +} diff --git a/src/domain/creator/getMeAggregated/index.ts b/src/domain/creator/getMeAggregated/index.ts new file mode 100644 index 00000000..2ba339ba --- /dev/null +++ b/src/domain/creator/getMeAggregated/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getMeAggregated'; diff --git a/src/domain/creator/getOthers/feature.ts b/src/domain/creator/getOthers/getOthers.ts similarity index 83% rename from src/domain/creator/getOthers/feature.ts rename to src/domain/creator/getOthers/getOthers.ts index f0637c5a..a7e64cf3 100644 --- a/src/domain/creator/getOthers/feature.ts +++ b/src/domain/creator/getOthers/getOthers.ts @@ -4,7 +4,7 @@ import database, { QueryStatement, RecordQuery, RecordSort, SortDirections } fro import { RECORD_TYPE, SortOrder } from '../definitions'; import type { DataModel } from '../types'; -export default async function feature(ids: string[], order: SortOrder, search: string | undefined = undefined, limit: number, offset: number): Promise +export default async function getOthers(ids: string[], order: SortOrder, search: string | undefined = undefined, limit: number, offset: number): Promise { const defaultQuery: RecordQuery = { id: { NOT_IN: ids } }; const searchQuery: RecordQuery = { diff --git a/src/domain/creator/getOthers/index.ts b/src/domain/creator/getOthers/index.ts new file mode 100644 index 00000000..cc39a4c1 --- /dev/null +++ b/src/domain/creator/getOthers/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getOthers'; diff --git a/src/domain/creator/index.ts b/src/domain/creator/index.ts new file mode 100644 index 00000000..7c4921bd --- /dev/null +++ b/src/domain/creator/index.ts @@ -0,0 +1,6 @@ + +export { IMAGE_TYPE, RECORD_TYPE, SortOrder } from './definitions'; + +export type { DataModel } from './types'; + +export { default as InvalidCreator } from './InvalidCreator'; diff --git a/src/domain/creator/register/downloadPortrait.ts b/src/domain/creator/register/downloadPortrait.ts index 35cbee02..3aba6ae5 100644 --- a/src/domain/creator/register/downloadPortrait.ts +++ b/src/domain/creator/register/downloadPortrait.ts @@ -1,5 +1,5 @@ -import downloadImage from '^/domain/image/download/feature'; +import downloadImage from '^/domain/image/download'; import { IMAGE_TYPE } from '../definitions'; diff --git a/src/domain/creator/register/index.ts b/src/domain/creator/register/index.ts new file mode 100644 index 00000000..f492c232 --- /dev/null +++ b/src/domain/creator/register/index.ts @@ -0,0 +1,2 @@ + +export { default } from './register'; diff --git a/src/domain/creator/register/feature.ts b/src/domain/creator/register/register.ts similarity index 65% rename from src/domain/creator/register/feature.ts rename to src/domain/creator/register/register.ts index fb3c21bb..0d1c82db 100644 --- a/src/domain/creator/register/feature.ts +++ b/src/domain/creator/register/register.ts @@ -1,12 +1,12 @@ -import create from '../create/feature'; +import create from '../create'; import { FULL_NAME_MAX_LENGTH } from '../definitions'; -import generateNickname from '../generateNickname/feature'; +import generateNickname from '../generateNickname'; import type { DataModel } from '../types'; import downloadPortrait from './downloadPortrait'; -export default async function feature(fullName: string, nickname: string, email: string, portraitUrl: string | undefined = undefined): Promise +export default async function register(fullName: string, nickname: string, email: string, portraitUrl: string | undefined = undefined): Promise { const truncatedFullName = fullName.substring(0, FULL_NAME_MAX_LENGTH); const generatedNickname = await generateNickname(nickname); diff --git a/src/domain/creator/update/index.ts b/src/domain/creator/update/index.ts new file mode 100644 index 00000000..94a3b692 --- /dev/null +++ b/src/domain/creator/update/index.ts @@ -0,0 +1,2 @@ + +export { default } from './update'; diff --git a/src/domain/post/update/feature.ts b/src/domain/creator/update/update.ts similarity index 76% rename from src/domain/post/update/feature.ts rename to src/domain/creator/update/update.ts index f8eb6973..b5585ab0 100644 --- a/src/domain/post/update/feature.ts +++ b/src/domain/creator/update/update.ts @@ -6,7 +6,7 @@ import type { DataModel } from '../types'; type Data = Partial>; -export default async function feature(id: string, data: Data): Promise +export default async function update(id: string, data: Data): Promise { return database.updateRecord(RECORD_TYPE, id, data); } diff --git a/src/domain/creator/updateFollowerCount/index.ts b/src/domain/creator/updateFollowerCount/index.ts new file mode 100644 index 00000000..072818d8 --- /dev/null +++ b/src/domain/creator/updateFollowerCount/index.ts @@ -0,0 +1,2 @@ + +export { default } from './updateFollowerCount'; diff --git a/src/domain/creator/updateFollowerCount/feature.ts b/src/domain/creator/updateFollowerCount/updateFollowerCount.ts similarity index 61% rename from src/domain/creator/updateFollowerCount/feature.ts rename to src/domain/creator/updateFollowerCount/updateFollowerCount.ts index 166d24a0..4d908cf4 100644 --- a/src/domain/creator/updateFollowerCount/feature.ts +++ b/src/domain/creator/updateFollowerCount/updateFollowerCount.ts @@ -1,10 +1,10 @@ -import getById from '../getById/feature'; -import update from '../update/feature'; +import getById from '../getById'; +import update from '../update'; import type { CountOperation } from '../types'; -export default async function feature(id: string, operation: CountOperation): Promise +export default async function updateFollowerCount(id: string, operation: CountOperation): Promise { const data = await getById(id); diff --git a/src/domain/creator/updateFollowingCount/index.ts b/src/domain/creator/updateFollowingCount/index.ts new file mode 100644 index 00000000..6a8217d7 --- /dev/null +++ b/src/domain/creator/updateFollowingCount/index.ts @@ -0,0 +1,2 @@ + +export { default } from './updateFollowingCount'; diff --git a/src/domain/creator/updateFollowingCount/feature.ts b/src/domain/creator/updateFollowingCount/updateFollowingCount.ts similarity index 61% rename from src/domain/creator/updateFollowingCount/feature.ts rename to src/domain/creator/updateFollowingCount/updateFollowingCount.ts index 48651660..0d37d9f0 100644 --- a/src/domain/creator/updateFollowingCount/feature.ts +++ b/src/domain/creator/updateFollowingCount/updateFollowingCount.ts @@ -1,10 +1,10 @@ -import getById from '../getById/feature'; -import update from '../update/feature'; +import getById from '../getById'; +import update from '../update'; import type { CountOperation } from '../types'; -export default async function feature(id: string, operation: CountOperation): Promise +export default async function updateFollowingCount(id: string, operation: CountOperation): Promise { const data = await getById(id); diff --git a/src/domain/creator/updateFullName/feature.ts b/src/domain/creator/updateFullName/feature.ts deleted file mode 100644 index 6e851c11..00000000 --- a/src/domain/creator/updateFullName/feature.ts +++ /dev/null @@ -1,12 +0,0 @@ - -import type { Requester } from '^/domain/authentication/types'; - -import update from '../update/feature'; -import validateData from './validateData'; - -export default async function feature(requester: Requester, fullName: string): Promise -{ - validateData({ fullName }); - - return update(requester.id, { fullName }); -} diff --git a/src/domain/creator/updateFullName/index.ts b/src/domain/creator/updateFullName/index.ts new file mode 100644 index 00000000..99f17d06 --- /dev/null +++ b/src/domain/creator/updateFullName/index.ts @@ -0,0 +1,2 @@ + +export { default } from './updateFullName'; diff --git a/src/domain/creator/updateFullName/updateFullName.ts b/src/domain/creator/updateFullName/updateFullName.ts new file mode 100644 index 00000000..f026267b --- /dev/null +++ b/src/domain/creator/updateFullName/updateFullName.ts @@ -0,0 +1,12 @@ + +import { Requester } from '^/domain/authentication'; + +import update from '../update'; +import validateData from './validateData'; + +export default async function updateFullName(requester: Requester, fullName: string): Promise +{ + validateData({ fullName }); + + return update(requester.id, { fullName }); +} diff --git a/src/domain/creator/updateNickname/index.ts b/src/domain/creator/updateNickname/index.ts new file mode 100644 index 00000000..7da7e50f --- /dev/null +++ b/src/domain/creator/updateNickname/index.ts @@ -0,0 +1,4 @@ + +export { default } from './updateNickname'; + +export { default as NicknameAlreadyExists } from './NicknameAlreadyExists'; diff --git a/src/domain/creator/updateNickname/feature.ts b/src/domain/creator/updateNickname/updateNickname.ts similarity index 60% rename from src/domain/creator/updateNickname/feature.ts rename to src/domain/creator/updateNickname/updateNickname.ts index bbe1eb22..7ba97e0f 100644 --- a/src/domain/creator/updateNickname/feature.ts +++ b/src/domain/creator/updateNickname/updateNickname.ts @@ -1,12 +1,12 @@ -import type { Requester } from '^/domain/authentication/types'; +import { Requester } from '^/domain/authentication'; -import cleanNickname from '../cleanNickname/feature'; -import update from '../update/feature'; +import cleanNickname from '../cleanNickname'; +import update from '../update'; import NicknameAlreadyExists from './NicknameAlreadyExists'; import retrieveByNickname from './retrieveByNickname'; -export default async function feature(requester: Requester, nickname: string): Promise +export default async function updateNickname(requester: Requester, nickname: string): Promise { const cleanedNickname = cleanNickname(nickname); diff --git a/src/domain/creator/updatePostCount/index.ts b/src/domain/creator/updatePostCount/index.ts new file mode 100644 index 00000000..69e44d6d --- /dev/null +++ b/src/domain/creator/updatePostCount/index.ts @@ -0,0 +1,2 @@ + +export { default } from './updatePostCount'; diff --git a/src/domain/creator/updatePostCount/feature.ts b/src/domain/creator/updatePostCount/updatePostCount.ts similarity index 59% rename from src/domain/creator/updatePostCount/feature.ts rename to src/domain/creator/updatePostCount/updatePostCount.ts index f262c28b..0a31f358 100644 --- a/src/domain/creator/updatePostCount/feature.ts +++ b/src/domain/creator/updatePostCount/updatePostCount.ts @@ -1,10 +1,10 @@ -import getById from '../getById/feature'; -import update from '../update/feature'; +import getById from '../getById'; +import update from '../update'; import type { CountOperation } from '../types'; -export default async function feature(id: string, operation: CountOperation): Promise +export default async function updatePostCount(id: string, operation: CountOperation): Promise { const data = await getById(id); diff --git a/src/domain/image/create/create.ts b/src/domain/image/create/create.ts new file mode 100644 index 00000000..82b25932 --- /dev/null +++ b/src/domain/image/create/create.ts @@ -0,0 +1,13 @@ + +import save from '../save/save'; +import validate from '../validate/validate'; +import convertDataUrl from './convertDataUrl'; + +export default async function create(type: string, dataUrl: string): Promise +{ + const image = await convertDataUrl(dataUrl); + + validate(image); + + return save(type, image); +} diff --git a/src/domain/image/create/feature.ts b/src/domain/image/create/feature.ts deleted file mode 100644 index 9e91a0f9..00000000 --- a/src/domain/image/create/feature.ts +++ /dev/null @@ -1,13 +0,0 @@ - -import save from '../save/feature'; -import validate from '../validate/feature'; -import convertDataUrl from './convertDataUrl'; - -export default async function feature(type: string, dataUrl: string): Promise -{ - const image = await convertDataUrl(dataUrl); - - validate(image); - - return save(type, image); -} diff --git a/src/domain/image/create/index.ts b/src/domain/image/create/index.ts new file mode 100644 index 00000000..e4138510 --- /dev/null +++ b/src/domain/image/create/index.ts @@ -0,0 +1,4 @@ + +export { default } from './create'; + +export { default as InvalidDataURL } from './InvalidDataURL'; diff --git a/src/domain/image/download/feature.ts b/src/domain/image/download/download.ts similarity index 63% rename from src/domain/image/download/feature.ts rename to src/domain/image/download/download.ts index 4d37674c..48bd50e5 100644 --- a/src/domain/image/download/feature.ts +++ b/src/domain/image/download/download.ts @@ -1,10 +1,10 @@ -import save from '../save/feature'; -import validate from '../validate/feature'; +import save from '../save/save'; +import validate from '../validate/validate'; import downloadImage from './downloadImage'; import getMetaData from './getMetaData'; -export default async function feature(type: string, imageUrl: string): Promise +export default async function download(type: string, imageUrl: string): Promise { const metaData = await getMetaData(imageUrl); diff --git a/src/domain/image/download/index.ts b/src/domain/image/download/index.ts new file mode 100644 index 00000000..d02cc660 --- /dev/null +++ b/src/domain/image/download/index.ts @@ -0,0 +1,4 @@ + +export { default } from './download'; + +export { default as ImageNotDownloaded } from './ImageNotDownloaded'; diff --git a/src/domain/comment/erase/feature.ts b/src/domain/image/erase/erase.ts similarity index 70% rename from src/domain/comment/erase/feature.ts rename to src/domain/image/erase/erase.ts index 6e894d2e..ea8d43b6 100644 --- a/src/domain/comment/erase/feature.ts +++ b/src/domain/image/erase/erase.ts @@ -3,7 +3,7 @@ import database from '^/integrations/database/module'; import { RECORD_TYPE } from '../definitions'; -export default async function feature(id: string): Promise +export default async function erase(id: string): Promise { return database.deleteRecord(RECORD_TYPE, id); } diff --git a/src/domain/image/erase/index.ts b/src/domain/image/erase/index.ts new file mode 100644 index 00000000..e74c873f --- /dev/null +++ b/src/domain/image/erase/index.ts @@ -0,0 +1,2 @@ + +export { default } from './erase'; diff --git a/src/domain/image/getById/feature.ts b/src/domain/image/getById/getById.ts similarity index 74% rename from src/domain/image/getById/feature.ts rename to src/domain/image/getById/getById.ts index 4caaf6fd..31c28a45 100644 --- a/src/domain/image/getById/feature.ts +++ b/src/domain/image/getById/getById.ts @@ -1,10 +1,10 @@ +import type { ImageData } from '../types'; import createDataUrl from './createDataUrl'; import retrieveData from './retrieveData'; import retrieveFile from './retrieveFile'; -import type { ImageData } from './types'; -export default async function feature(id: string): Promise +export default async function getById(id: string): Promise { const data = await retrieveData(id); const file = await retrieveFile(data.storageKey); diff --git a/src/domain/image/getById/index.ts b/src/domain/image/getById/index.ts new file mode 100644 index 00000000..da399eb0 --- /dev/null +++ b/src/domain/image/getById/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getById'; diff --git a/src/domain/image/getById/types.ts b/src/domain/image/getById/types.ts deleted file mode 100644 index 5f2deb91..00000000 --- a/src/domain/image/getById/types.ts +++ /dev/null @@ -1,6 +0,0 @@ - -type ImageData = { - readonly dataUrl: string; -}; - -export type { ImageData }; diff --git a/src/domain/image/index.ts b/src/domain/image/index.ts new file mode 100644 index 00000000..34b9c083 --- /dev/null +++ b/src/domain/image/index.ts @@ -0,0 +1,4 @@ + +export { RECORD_TYPE } from './definitions'; + +export type { DataModel, ImageData } from './types'; diff --git a/src/domain/image/save/index.ts b/src/domain/image/save/index.ts new file mode 100644 index 00000000..c96a294a --- /dev/null +++ b/src/domain/image/save/index.ts @@ -0,0 +1,4 @@ + +export { default } from './save'; + +export { default as InvalidImage } from './InvalidImage'; diff --git a/src/domain/image/save/feature.ts b/src/domain/image/save/save.ts similarity index 88% rename from src/domain/image/save/feature.ts rename to src/domain/image/save/save.ts index ba6066c5..7e717d60 100644 --- a/src/domain/image/save/feature.ts +++ b/src/domain/image/save/save.ts @@ -7,7 +7,7 @@ import insertData from './insertData'; import insertFile from './insertFile'; import validateData from './validateData'; -export default async function feature(type: string, image: Image): Promise +export default async function save(type: string, image: Image): Promise { const storageKey = generateStorageKey(type, image.buffer); const existingFile = await fileExists(storageKey); diff --git a/src/domain/image/types.ts b/src/domain/image/types.ts index 34769d16..ba6ba5b9 100644 --- a/src/domain/image/types.ts +++ b/src/domain/image/types.ts @@ -1,6 +1,10 @@ import { BaseDataModel } from '../types'; +type ImageData = { + readonly dataUrl: string; +}; + type MetaData = { readonly filename: string; readonly mimeType: string; @@ -17,4 +21,4 @@ type Image = MetaData & readonly buffer: Buffer; }; -export type { DataModel, Image, MetaData }; +export type { DataModel, Image, ImageData, MetaData }; diff --git a/src/domain/image/validate/index.ts b/src/domain/image/validate/index.ts new file mode 100644 index 00000000..8592d185 --- /dev/null +++ b/src/domain/image/validate/index.ts @@ -0,0 +1,2 @@ + +export { default } from './validate'; diff --git a/src/domain/image/validate/feature.ts b/src/domain/image/validate/validate.ts similarity index 92% rename from src/domain/image/validate/feature.ts rename to src/domain/image/validate/validate.ts index 9925f972..b5ef0bfe 100644 --- a/src/domain/image/validate/feature.ts +++ b/src/domain/image/validate/validate.ts @@ -31,7 +31,7 @@ const schema: ValidationSchema = } }; -export default function feature({ mimeType, size }: MetaData): void +export default function validate({ mimeType, size }: MetaData): void { const result = validator.validate({ mimeType, size }, schema); diff --git a/src/domain/notification/aggregate/feature.ts b/src/domain/notification/aggregate/aggregate.ts similarity index 67% rename from src/domain/notification/aggregate/feature.ts rename to src/domain/notification/aggregate/aggregate.ts index 09b87be7..21c01170 100644 --- a/src/domain/notification/aggregate/feature.ts +++ b/src/domain/notification/aggregate/aggregate.ts @@ -1,13 +1,13 @@ -import type { Requester } from '^/domain/authentication/types'; -import getPostData from '^/domain/post/getByIdAggregated/feature'; -import getReactionData from '^/domain/reaction/getByIdAggregated/feature'; -import getRelationData from '^/domain/relation/getAggregated/feature'; +import { Requester } from '^/domain/authentication'; +import getPostData from '^/domain/post/getByIdAggregated'; +import getReactionData from '^/domain/reaction/getByIdAggregated'; +import getRelationData from '^/domain/relation/getAggregated'; import type { DataModel } from '../types'; import type { AggregatedData } from './types'; -export default async function feature(requester: Requester, data: DataModel): Promise +export default async function aggregate(requester: Requester, data: DataModel): Promise { const [relationData, postData, reactionData] = await Promise.all([ getRelationData(data.receiverId, data.senderId), diff --git a/src/domain/notification/aggregate/index.ts b/src/domain/notification/aggregate/index.ts new file mode 100644 index 00000000..19b59674 --- /dev/null +++ b/src/domain/notification/aggregate/index.ts @@ -0,0 +1,4 @@ + +export { default } from './aggregate'; + +export type { AggregatedData } from './types'; diff --git a/src/domain/notification/aggregate/types.ts b/src/domain/notification/aggregate/types.ts index 453d8979..7b1434f5 100644 --- a/src/domain/notification/aggregate/types.ts +++ b/src/domain/notification/aggregate/types.ts @@ -1,15 +1,15 @@ -import type { AggregatedData as PostData } from '^/domain/post/aggregate/types'; -import type { AggregatedData as ReactionData } from '^/domain/reaction/aggregate/types'; -import type { AggregatedData as RelationData } from '^/domain/relation/aggregate/types'; +import type { AggregatedData as AggregatedPostData } from '^/domain/post/aggregate'; +import type { AggregatedData as AggregatedReactionData } from '^/domain/reaction/aggregate'; +import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate'; import { DataModel } from '../types'; type AggregatedData = Pick & { - readonly relation: RelationData; - readonly post?: PostData; - readonly reaction?: ReactionData; + readonly relation: AggregatedRelationData; + readonly post?: AggregatedPostData; + readonly reaction?: AggregatedReactionData; }; export type { AggregatedData }; diff --git a/src/domain/notification/create/feature.ts b/src/domain/notification/create/create.ts similarity index 74% rename from src/domain/notification/create/feature.ts rename to src/domain/notification/create/create.ts index 86dbf733..4710b093 100644 --- a/src/domain/notification/create/feature.ts +++ b/src/domain/notification/create/create.ts @@ -5,7 +5,7 @@ import type { Types } from '../definitions'; import createData from './createData'; import insertData from './insertData'; -export default async function feature(type: Types, senderId: string, receiverId: string, postId: string | undefined = undefined, reactionId: string | undefined = undefined): Promise +export default async function create(type: Types, senderId: string, receiverId: string, postId: string | undefined = undefined, reactionId: string | undefined = undefined): Promise { if (senderId === receiverId) { diff --git a/src/domain/notification/create/index.ts b/src/domain/notification/create/index.ts new file mode 100644 index 00000000..01487567 --- /dev/null +++ b/src/domain/notification/create/index.ts @@ -0,0 +1,2 @@ + +export { default } from './create'; diff --git a/src/domain/creator/getById/feature.ts b/src/domain/notification/getById/getById.ts similarity index 78% rename from src/domain/creator/getById/feature.ts rename to src/domain/notification/getById/getById.ts index cfcea8f4..73bf5931 100644 --- a/src/domain/creator/getById/feature.ts +++ b/src/domain/notification/getById/getById.ts @@ -4,7 +4,7 @@ import database from '^/integrations/database/module'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; -export default async function feature(id: string): Promise +export default async function getById(id: string): Promise { return database.readRecord(RECORD_TYPE, id) as Promise; } diff --git a/src/domain/notification/getById/index.ts b/src/domain/notification/getById/index.ts new file mode 100644 index 00000000..da399eb0 --- /dev/null +++ b/src/domain/notification/getById/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getById'; diff --git a/src/domain/notification/getByIdAggregated/feature.ts b/src/domain/notification/getByIdAggregated/feature.ts deleted file mode 100644 index 99e47ade..00000000 --- a/src/domain/notification/getByIdAggregated/feature.ts +++ /dev/null @@ -1,13 +0,0 @@ - -import type { Requester } from '^/domain/authentication/types'; - -import aggregate from '../aggregate/feature'; -import type { AggregatedData } from '../aggregate/types'; -import getById from '../getById/feature'; - -export default async function feature(requester: Requester, id: string): Promise -{ - const data = await getById(id); - - return aggregate(requester, data); -} diff --git a/src/domain/notification/getByIdAggregated/getByIdAggregated.ts b/src/domain/notification/getByIdAggregated/getByIdAggregated.ts new file mode 100644 index 00000000..6a54332d --- /dev/null +++ b/src/domain/notification/getByIdAggregated/getByIdAggregated.ts @@ -0,0 +1,12 @@ + +import { Requester } from '^/domain/authentication'; + +import aggregate, { AggregatedData } from '../aggregate'; +import getById from '../getById'; + +export default async function getByIdAggregated(requester: Requester, id: string): Promise +{ + const data = await getById(id); + + return aggregate(requester, data); +} diff --git a/src/domain/notification/getByIdAggregated/index.ts b/src/domain/notification/getByIdAggregated/index.ts new file mode 100644 index 00000000..8f7f2b94 --- /dev/null +++ b/src/domain/notification/getByIdAggregated/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getByIdAggregated'; diff --git a/src/domain/notification/getRecent/feature.ts b/src/domain/notification/getRecent/getRecent.ts similarity index 80% rename from src/domain/notification/getRecent/feature.ts rename to src/domain/notification/getRecent/getRecent.ts index ea730211..b10ba77f 100644 --- a/src/domain/notification/getRecent/feature.ts +++ b/src/domain/notification/getRecent/getRecent.ts @@ -4,7 +4,7 @@ import database, { RecordQuery, RecordSort, SortDirections } from '^/integration import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; -export default async function feature(recipientId: string, limit: number, offset: number): Promise +export default async function getRecent(recipientId: string, limit: number, offset: number): Promise { const query: RecordQuery = { diff --git a/src/domain/notification/getRecent/index.ts b/src/domain/notification/getRecent/index.ts new file mode 100644 index 00000000..a57343f7 --- /dev/null +++ b/src/domain/notification/getRecent/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getRecent'; diff --git a/src/domain/notification/getRecentAggregated/feature.ts b/src/domain/notification/getRecentAggregated/getRecentAggregated.ts similarity index 58% rename from src/domain/notification/getRecentAggregated/feature.ts rename to src/domain/notification/getRecentAggregated/getRecentAggregated.ts index 21770f73..644b450a 100644 --- a/src/domain/notification/getRecentAggregated/feature.ts +++ b/src/domain/notification/getRecentAggregated/getRecentAggregated.ts @@ -1,14 +1,12 @@ -import type { Requester } from '^/domain/authentication/types'; -import { Range } from '^/domain/common/types'; -import validateRange from '^/domain/common/validateRange/feature'; +import { Requester } from '^/domain/authentication'; +import validateRange, { Range } from '^/domain/common/validateRange'; import logger from '^/integrations/logging/module'; -import aggregate from '../aggregate/feature'; -import type { AggregatedData } from '../aggregate/types'; -import getRecent from '../getRecent/feature'; +import aggregate, { AggregatedData } from '../aggregate'; +import getRecent from '../getRecent'; -export default async function feature(requester: Requester, range: Range): Promise +export default async function getRecentAggregated(requester: Requester, range: Range): Promise { validateRange(range); diff --git a/src/domain/notification/getRecentAggregated/index.ts b/src/domain/notification/getRecentAggregated/index.ts new file mode 100644 index 00000000..236336a7 --- /dev/null +++ b/src/domain/notification/getRecentAggregated/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getRecentAggregated'; diff --git a/src/domain/notification/index.ts b/src/domain/notification/index.ts new file mode 100644 index 00000000..4b7e0423 --- /dev/null +++ b/src/domain/notification/index.ts @@ -0,0 +1,4 @@ + +export { RECORD_TYPE, Types } from './definitions'; + +export type { DataModel } from './types'; diff --git a/src/domain/post/add/feature.ts b/src/domain/post/add/add.ts similarity index 63% rename from src/domain/post/add/feature.ts rename to src/domain/post/add/add.ts index 02da262d..39272310 100644 --- a/src/domain/post/add/feature.ts +++ b/src/domain/post/add/add.ts @@ -1,14 +1,14 @@ import logger from '^/integrations/logging/module'; -import type { Requester } from '^/domain/authentication/types'; -import createComic from '^/domain/comic/create/feature'; -import updateCreatorPostCount from '^/domain/creator/updatePostCount/feature'; +import { Requester } from '^/domain/authentication'; +import createComic from '^/domain/comic/create'; +import updateCreatorPostCount from '^/domain/creator/updatePostCount'; -import createPost from '../create/feature'; -import erasePost from '../erase/feature'; +import createPost from '../create'; +import erasePost from '../erase'; -export default async function feature(requester: Requester, comicImageDataUrl: string): Promise +export default async function add(requester: Requester, comicImageDataUrl: string): Promise { let postId; diff --git a/src/domain/post/add/index.ts b/src/domain/post/add/index.ts new file mode 100644 index 00000000..ec150aaf --- /dev/null +++ b/src/domain/post/add/index.ts @@ -0,0 +1,2 @@ + +export { default } from './add'; diff --git a/src/domain/post/aggregate/feature.ts b/src/domain/post/aggregate/aggregate.ts similarity index 60% rename from src/domain/post/aggregate/feature.ts rename to src/domain/post/aggregate/aggregate.ts index e45de3bc..eaf4941d 100644 --- a/src/domain/post/aggregate/feature.ts +++ b/src/domain/post/aggregate/aggregate.ts @@ -1,13 +1,13 @@ -import type { Requester } from '^/domain/authentication/types'; -import getComicData from '^/domain/comic/getByIdAggregated/feature'; -import ratingExists from '^/domain/rating/exists/feature'; -import getRelationData from '^/domain/relation/getAggregated/feature'; +import { Requester } from '^/domain/authentication'; +import getComicData from '^/domain/comic/getByIdAggregated'; +import ratingExists from '^/domain/rating/exists'; +import getRelationData from '^/domain/relation/getAggregated'; import type { DataModel } from '../types'; import type { AggregatedData } from './types'; -export default async function feature(requester: Requester, data: DataModel): Promise +export default async function aggregate(requester: Requester, data: DataModel): Promise { const [creatorData, comicData, hasRated] = await Promise.all([ getRelationData(requester.id, data.creatorId), diff --git a/src/domain/post/aggregate/index.ts b/src/domain/post/aggregate/index.ts new file mode 100644 index 00000000..19b59674 --- /dev/null +++ b/src/domain/post/aggregate/index.ts @@ -0,0 +1,4 @@ + +export { default } from './aggregate'; + +export type { AggregatedData } from './types'; diff --git a/src/domain/post/aggregate/types.ts b/src/domain/post/aggregate/types.ts index 417ea397..27b61e73 100644 --- a/src/domain/post/aggregate/types.ts +++ b/src/domain/post/aggregate/types.ts @@ -1,12 +1,12 @@ -import type { AggregatedData as ComicData } from '^/domain/comic/aggregate/types'; -import type { AggregatedData as RelationData } from '^/domain/relation/aggregate/types'; +import type { AggregatedData as AggregatedComicData } from '^/domain/comic/aggregate'; +import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate'; type AggregatedData = { readonly id: string; readonly createdAt: string; - readonly creator: RelationData; - readonly comic: ComicData; + readonly creator: AggregatedRelationData; + readonly comic: AggregatedComicData; readonly ratingCount: number; readonly reactionCount: number; readonly hasRated: boolean; diff --git a/src/domain/post/create/feature.ts b/src/domain/post/create/create.ts similarity index 64% rename from src/domain/post/create/feature.ts rename to src/domain/post/create/create.ts index 017130ca..87b43fa7 100644 --- a/src/domain/post/create/feature.ts +++ b/src/domain/post/create/create.ts @@ -2,7 +2,7 @@ import createData from './createData'; import insertData from './insertData'; -export default async function feature(creatorId: string, comicId: string): Promise +export default async function create(creatorId: string, comicId: string): Promise { const data = createData(creatorId, comicId); diff --git a/src/domain/post/create/index.ts b/src/domain/post/create/index.ts new file mode 100644 index 00000000..01487567 --- /dev/null +++ b/src/domain/post/create/index.ts @@ -0,0 +1,2 @@ + +export { default } from './create'; diff --git a/src/domain/image/erase/feature.ts b/src/domain/post/erase/erase.ts similarity index 70% rename from src/domain/image/erase/feature.ts rename to src/domain/post/erase/erase.ts index 6e894d2e..ea8d43b6 100644 --- a/src/domain/image/erase/feature.ts +++ b/src/domain/post/erase/erase.ts @@ -3,7 +3,7 @@ import database from '^/integrations/database/module'; import { RECORD_TYPE } from '../definitions'; -export default async function feature(id: string): Promise +export default async function erase(id: string): Promise { return database.deleteRecord(RECORD_TYPE, id); } diff --git a/src/domain/post/erase/index.ts b/src/domain/post/erase/index.ts new file mode 100644 index 00000000..e74c873f --- /dev/null +++ b/src/domain/post/erase/index.ts @@ -0,0 +1,2 @@ + +export { default } from './erase'; diff --git a/src/domain/post/explore/feature.ts b/src/domain/post/explore/explore.ts similarity index 76% rename from src/domain/post/explore/feature.ts rename to src/domain/post/explore/explore.ts index 80cb0471..1bea4e24 100644 --- a/src/domain/post/explore/feature.ts +++ b/src/domain/post/explore/explore.ts @@ -1,11 +1,11 @@ -import type { Requester } from '^/domain/authentication/types'; -import retrieveRelationsByFollower from '^/domain/relation/getFollowing/feature'; +import { Requester } from '^/domain/authentication'; +import retrieveRelationsByFollower from '^/domain/relation/getFollowing'; import type { DataModel } from '../types'; import retrieveData from './retrieveData'; -export default async function feature(requester: Requester, limit: number, offset: number): Promise +export default async function explore(requester: Requester, limit: number, offset: number): Promise { const relationsData = await retrieveRelationsByFollower(requester, requester.id); diff --git a/src/domain/post/explore/index.ts b/src/domain/post/explore/index.ts new file mode 100644 index 00000000..173957d6 --- /dev/null +++ b/src/domain/post/explore/index.ts @@ -0,0 +1,2 @@ + +export { default } from './explore'; diff --git a/src/domain/post/exploreAggregated/feature.ts b/src/domain/post/exploreAggregated/exploreAggregated.ts similarity index 56% rename from src/domain/post/exploreAggregated/feature.ts rename to src/domain/post/exploreAggregated/exploreAggregated.ts index dc886507..d7d3411e 100644 --- a/src/domain/post/exploreAggregated/feature.ts +++ b/src/domain/post/exploreAggregated/exploreAggregated.ts @@ -1,14 +1,12 @@ -import type { Requester } from '^/domain/authentication/types'; -import type { Range } from '^/domain/common/types'; -import validateRange from '^/domain/common/validateRange/feature'; +import { Requester } from '^/domain/authentication'; +import validateRange, { Range } from '^/domain/common/validateRange'; import logger from '^/integrations/logging/module'; -import aggregate from '../aggregate/feature'; -import type { AggregatedData } from '../aggregate/types'; -import explore from '../explore/feature'; +import aggregate, { AggregatedData } from '../aggregate'; +import explore from '../explore'; -export default async function feature(requester: Requester, range: Range): Promise +export default async function exploreAggregated(requester: Requester, range: Range): Promise { validateRange(range); diff --git a/src/domain/post/exploreAggregated/index.ts b/src/domain/post/exploreAggregated/index.ts new file mode 100644 index 00000000..75ec37db --- /dev/null +++ b/src/domain/post/exploreAggregated/index.ts @@ -0,0 +1,2 @@ + +export { default } from './exploreAggregated'; diff --git a/src/domain/post/getAll/feature.ts b/src/domain/post/getAll/getAll.ts similarity index 74% rename from src/domain/post/getAll/feature.ts rename to src/domain/post/getAll/getAll.ts index 6172ace4..0313742b 100644 --- a/src/domain/post/getAll/feature.ts +++ b/src/domain/post/getAll/getAll.ts @@ -1,13 +1,13 @@ import database, { RecordQuery, RecordSort, SortDirections } from '^/integrations/database/module'; -import { Requester } from '^/domain/authentication/types'; +import { Requester } from '^/domain/authentication'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; -export default async function feature(requester: Requester, limit: number, offset: number): Promise +export async function getAll(requester: Requester, limit: number, offset: number): Promise { const query: RecordQuery = { diff --git a/src/domain/post/getAll/index.ts b/src/domain/post/getAll/index.ts new file mode 100644 index 00000000..d43cbf44 --- /dev/null +++ b/src/domain/post/getAll/index.ts @@ -0,0 +1,2 @@ + +export { getAll as default } from './getAll'; diff --git a/src/domain/post/getAllAggregated/getAllAggregated.ts b/src/domain/post/getAllAggregated/getAllAggregated.ts new file mode 100644 index 00000000..b1ad53e9 --- /dev/null +++ b/src/domain/post/getAllAggregated/getAllAggregated.ts @@ -0,0 +1,32 @@ + +import { Requester } from '^/domain/authentication'; +import validateRange, { Range } from '^/domain/common/validateRange'; +import logger from '^/integrations/logging/module'; + +import aggregate, { AggregatedData } from '../aggregate'; +import getAll from '../getAll'; + +export default async function getAllAggregated(requester: Requester, range: Range): Promise +{ + validateRange(range); + + const data = await getAll(requester, range.limit, range.offset); + + const posts: AggregatedData[] = []; + + const promises = await Promise.allSettled(data.map(item => aggregate(requester, item))); + + promises.forEach((promise) => + { + if (promise.status === 'rejected') + { + logger.logError('Error on aggregating Post', promise.reason); + + return; + } + + posts.push(promise.value); + }); + + return posts; +} diff --git a/src/domain/post/getAllAggregated/index.ts b/src/domain/post/getAllAggregated/index.ts index f0dac420..8d491f0c 100644 --- a/src/domain/post/getAllAggregated/index.ts +++ b/src/domain/post/getAllAggregated/index.ts @@ -1,34 +1,2 @@ -import type { Requester } from '^/domain/authentication/types'; -import type { Range } from '^/domain/common/types'; -import validateRange from '^/domain/common/validateRange/feature'; -import logger from '^/integrations/logging/module'; - -import aggregate from '../aggregate/feature'; -import type { AggregatedData } from '../aggregate/types'; -import getAll from '../getAll/feature'; - -export default async function index(requester: Requester, range: Range): Promise -{ - validateRange(range); - - const data = await getAll(requester, range.limit, range.offset); - - const posts: AggregatedData[] = []; - - const promises = await Promise.allSettled(data.map(item => aggregate(requester, item))); - - promises.forEach((promise) => - { - if (promise.status === 'rejected') - { - logger.logError('Error on aggregating Post', promise.reason); - - return; - } - - posts.push(promise.value); - }); - - return posts; -} +export { default } from './getAllAggregated'; diff --git a/src/domain/post/getByCreator/feature.ts b/src/domain/post/getByCreator/getByCreator.ts similarity index 81% rename from src/domain/post/getByCreator/feature.ts rename to src/domain/post/getByCreator/getByCreator.ts index e0186f73..5c403ace 100644 --- a/src/domain/post/getByCreator/feature.ts +++ b/src/domain/post/getByCreator/getByCreator.ts @@ -4,7 +4,7 @@ import database, { RecordQuery, RecordSort, SortDirections } from '^/integration import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; -export default async function feature(creatorId: string, limit: number, offset: number): Promise +export default async function getByCreator(creatorId: string, limit: number, offset: number): Promise { const query: RecordQuery = { diff --git a/src/domain/post/getByCreator/index.ts b/src/domain/post/getByCreator/index.ts new file mode 100644 index 00000000..867fafdc --- /dev/null +++ b/src/domain/post/getByCreator/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getByCreator'; diff --git a/src/domain/post/getByCreatorAggregated/feature.ts b/src/domain/post/getByCreatorAggregated/getByCreatorAggregated.ts similarity index 56% rename from src/domain/post/getByCreatorAggregated/feature.ts rename to src/domain/post/getByCreatorAggregated/getByCreatorAggregated.ts index 852567f9..1d2e0b7f 100644 --- a/src/domain/post/getByCreatorAggregated/feature.ts +++ b/src/domain/post/getByCreatorAggregated/getByCreatorAggregated.ts @@ -1,16 +1,14 @@ -import type { Requester } from '^/domain/authentication/types'; -import { Range } from '^/domain/common/types'; -import validateRange from '^/domain/common/validateRange/feature'; +import { Requester } from '^/domain/authentication'; +import validateRange, { Range } from '^/domain/common/validateRange'; import logger from '^/integrations/logging/module'; -import aggregate from '../aggregate/feature'; -import type { AggregatedData } from '../aggregate/types'; -import getByCreator from '../getByCreator/feature'; +import aggregate, { AggregatedData } from '../aggregate'; +import getByCreator from '../getByCreator'; export { type AggregatedData }; -export default async function feature(requester: Requester, creatorId: string, range: Range): Promise +export default async function getByCreatorAggregated(requester: Requester, creatorId: string, range: Range): Promise { validateRange(range); diff --git a/src/domain/post/getByCreatorAggregated/index.ts b/src/domain/post/getByCreatorAggregated/index.ts new file mode 100644 index 00000000..3efc9853 --- /dev/null +++ b/src/domain/post/getByCreatorAggregated/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getByCreatorAggregated'; diff --git a/src/domain/post/getByFollowing/feature.ts b/src/domain/post/getByFollowing/getByFollowing.ts similarity index 65% rename from src/domain/post/getByFollowing/feature.ts rename to src/domain/post/getByFollowing/getByFollowing.ts index 09446667..b982a4e1 100644 --- a/src/domain/post/getByFollowing/feature.ts +++ b/src/domain/post/getByFollowing/getByFollowing.ts @@ -1,11 +1,11 @@ -import type { Requester } from '^/domain/authentication/types'; -import retrieveFollowerData from '^/domain/relation/getFollowing/feature'; +import { Requester } from '^/domain/authentication'; +import retrieveFollowerData from '^/domain/relation/getFollowing'; import type { DataModel } from '../types'; import retrieveData from './retrieveData'; -export default async function feature(requester: Requester, limit: number, offset: number): Promise +export default async function getByFollowing(requester: Requester, limit: number, offset: number): Promise { const followerData = await retrieveFollowerData(requester, requester.id); diff --git a/src/domain/post/getByFollowing/index.ts b/src/domain/post/getByFollowing/index.ts new file mode 100644 index 00000000..d63e88f7 --- /dev/null +++ b/src/domain/post/getByFollowing/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getByFollowing'; diff --git a/src/domain/post/getByFollowingAggregated/feature.ts b/src/domain/post/getByFollowingAggregated/getByFollowingAggregated.ts similarity index 55% rename from src/domain/post/getByFollowingAggregated/feature.ts rename to src/domain/post/getByFollowingAggregated/getByFollowingAggregated.ts index 64d3aef9..195a384d 100644 --- a/src/domain/post/getByFollowingAggregated/feature.ts +++ b/src/domain/post/getByFollowingAggregated/getByFollowingAggregated.ts @@ -1,14 +1,12 @@ -import type { Requester } from '^/domain/authentication/types'; -import type { Range } from '^/domain/common/types'; -import validateRange from '^/domain/common/validateRange/feature'; +import { Requester } from '^/domain/authentication'; +import validateRange, { Range } from '^/domain/common/validateRange'; import logger from '^/integrations/logging/module'; -import aggregate from '../aggregate/feature'; -import type { AggregatedData } from '../aggregate/types'; -import getByFollowing from '../getByFollowing/feature'; +import aggregate, { AggregatedData } from '../aggregate'; +import getByFollowing from '../getByFollowing'; -export default async function feature(requester: Requester, range: Range): Promise +export default async function getByFollowingAggregated(requester: Requester, range: Range): Promise { validateRange(range); diff --git a/src/domain/post/getByFollowingAggregated/index.ts b/src/domain/post/getByFollowingAggregated/index.ts new file mode 100644 index 00000000..3286c543 --- /dev/null +++ b/src/domain/post/getByFollowingAggregated/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getByFollowingAggregated'; diff --git a/src/domain/post/getById/feature.ts b/src/domain/post/getById/getById.ts similarity index 88% rename from src/domain/post/getById/feature.ts rename to src/domain/post/getById/getById.ts index 1c45399f..a9411e58 100644 --- a/src/domain/post/getById/feature.ts +++ b/src/domain/post/getById/getById.ts @@ -5,7 +5,7 @@ import { RECORD_TYPE } from '../definitions'; import PostNotFound from '../PostNotFound'; import type { DataModel } from '../types'; -export default async function feature(id: string): Promise +export default async function getById(id: string): Promise { const query: RecordQuery = { diff --git a/src/domain/post/getById/index.ts b/src/domain/post/getById/index.ts new file mode 100644 index 00000000..da399eb0 --- /dev/null +++ b/src/domain/post/getById/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getById'; diff --git a/src/domain/post/getByIdAggregated/feature.ts b/src/domain/post/getByIdAggregated/feature.ts deleted file mode 100644 index b8853ebe..00000000 --- a/src/domain/post/getByIdAggregated/feature.ts +++ /dev/null @@ -1,15 +0,0 @@ - -import type { Requester } from '^/domain/authentication/types'; - -import aggregate from '../aggregate/feature'; -import type { AggregatedData } from '../aggregate/types'; -import getById from '../getById/feature'; - -export { type AggregatedData }; - -export default async function feature(requester: Requester, id: string): Promise -{ - const data = await getById(id); - - return aggregate(requester, data); -} diff --git a/src/domain/post/getByIdAggregated/getByIdAggregated.ts b/src/domain/post/getByIdAggregated/getByIdAggregated.ts new file mode 100644 index 00000000..58c1a0b5 --- /dev/null +++ b/src/domain/post/getByIdAggregated/getByIdAggregated.ts @@ -0,0 +1,14 @@ + +import { Requester } from '^/domain/authentication'; + +import aggregate, { AggregatedData } from '../aggregate'; +import getById from '../getById'; + +export { type AggregatedData }; + +export default async function getByIdAggregated(requester: Requester, id: string): Promise +{ + const data = await getById(id); + + return aggregate(requester, data); +} diff --git a/src/domain/post/getByIdAggregated/index.ts b/src/domain/post/getByIdAggregated/index.ts new file mode 100644 index 00000000..8f7f2b94 --- /dev/null +++ b/src/domain/post/getByIdAggregated/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getByIdAggregated'; diff --git a/src/domain/post/index.ts b/src/domain/post/index.ts new file mode 100644 index 00000000..8ea5ef76 --- /dev/null +++ b/src/domain/post/index.ts @@ -0,0 +1,6 @@ + +export { RECORD_TYPE } from './definitions'; + +export type { DataModel } from './types'; + +export { default as PostNotFound } from './PostNotFound'; diff --git a/src/domain/post/remove/index.ts b/src/domain/post/remove/index.ts new file mode 100644 index 00000000..16bee921 --- /dev/null +++ b/src/domain/post/remove/index.ts @@ -0,0 +1,2 @@ + +export { default } from './remove'; diff --git a/src/domain/post/remove/feature.ts b/src/domain/post/remove/remove.ts similarity index 84% rename from src/domain/post/remove/feature.ts rename to src/domain/post/remove/remove.ts index 67b5058b..fd769fab 100644 --- a/src/domain/post/remove/feature.ts +++ b/src/domain/post/remove/remove.ts @@ -1,14 +1,14 @@ import logger from '^/integrations/logging/module'; -import type { Requester } from '^/domain/authentication/types'; -import updateCreatorPostCount from '^/domain/creator/updatePostCount/feature'; +import { Requester } from '^/domain/authentication'; +import updateCreatorPostCount from '^/domain/creator/updatePostCount'; import PostNotFound from '../PostNotFound'; import removeData from './deleteData'; import ownsData from './ownsData'; -export default async function feature(requester: Requester, id: string): Promise +export default async function remove(requester: Requester, id: string): Promise { // We only delete the post itself and do not cascade it towards the reactions as it doesn't add // any value, and it would make the code more complex. diff --git a/src/domain/post/toggleRating/index.ts b/src/domain/post/toggleRating/index.ts new file mode 100644 index 00000000..503af68d --- /dev/null +++ b/src/domain/post/toggleRating/index.ts @@ -0,0 +1,2 @@ + +export { default } from './toggleRating'; diff --git a/src/domain/post/toggleRating/feature.ts b/src/domain/post/toggleRating/toggleRating.ts similarity index 61% rename from src/domain/post/toggleRating/feature.ts rename to src/domain/post/toggleRating/toggleRating.ts index 58e4d289..e77d496c 100644 --- a/src/domain/post/toggleRating/feature.ts +++ b/src/domain/post/toggleRating/toggleRating.ts @@ -1,15 +1,15 @@ import logger from '^/integrations/logging/module'; -import type { Requester } from '^/domain/authentication/types'; -import createNotification from '^/domain/notification/create/feature'; -import { Types } from '^/domain/notification/definitions'; -import getPost from '^/domain/post/getById/feature'; -import updateRating from '^/domain/rating/update/feature'; +import { Requester } from '^/domain/authentication'; +import { Types } from '^/domain/notification'; +import createNotification from '^/domain/notification/create'; +import getPost from '^/domain/post/getById'; +import updateRating from '^/domain/rating/update'; -import updateRatingCount from '../updateRatingCount/feature'; +import updateRatingCount from '../updateRatingCount'; -export default async function feature(requester: Requester, postId: string): Promise +export default async function toggleRating(requester: Requester, postId: string): Promise { let ratingId; diff --git a/src/domain/post/update/index.ts b/src/domain/post/update/index.ts new file mode 100644 index 00000000..94a3b692 --- /dev/null +++ b/src/domain/post/update/index.ts @@ -0,0 +1,2 @@ + +export { default } from './update'; diff --git a/src/domain/creator/update/feature.ts b/src/domain/post/update/update.ts similarity index 76% rename from src/domain/creator/update/feature.ts rename to src/domain/post/update/update.ts index f8eb6973..b5585ab0 100644 --- a/src/domain/creator/update/feature.ts +++ b/src/domain/post/update/update.ts @@ -6,7 +6,7 @@ import type { DataModel } from '../types'; type Data = Partial>; -export default async function feature(id: string, data: Data): Promise +export default async function update(id: string, data: Data): Promise { return database.updateRecord(RECORD_TYPE, id, data); } diff --git a/src/domain/post/updateRatingCount/index.ts b/src/domain/post/updateRatingCount/index.ts new file mode 100644 index 00000000..5c8ac8a6 --- /dev/null +++ b/src/domain/post/updateRatingCount/index.ts @@ -0,0 +1,2 @@ + +export { default } from './updateRatingCount'; diff --git a/src/domain/reaction/updateRatingCount/feature.ts b/src/domain/post/updateRatingCount/updateRatingCount.ts similarity index 60% rename from src/domain/reaction/updateRatingCount/feature.ts rename to src/domain/post/updateRatingCount/updateRatingCount.ts index 41e6c242..21fdb745 100644 --- a/src/domain/reaction/updateRatingCount/feature.ts +++ b/src/domain/post/updateRatingCount/updateRatingCount.ts @@ -1,10 +1,10 @@ -import getById from '../getById/feature'; -import update from '../update/feature'; +import getById from '../getById'; +import update from '../update'; import type { CountOperation } from '../types'; -export default async function feature(id: string, operation: CountOperation): Promise +export default async function updateRatingCount(id: string, operation: CountOperation): Promise { const data = await getById(id); diff --git a/src/domain/post/updateReactionCount/index.ts b/src/domain/post/updateReactionCount/index.ts new file mode 100644 index 00000000..dbb4f583 --- /dev/null +++ b/src/domain/post/updateReactionCount/index.ts @@ -0,0 +1,2 @@ + +export { default } from './updateReactionCount'; diff --git a/src/domain/post/updateReactionCount/feature.ts b/src/domain/post/updateReactionCount/updateReactionCount.ts similarity index 61% rename from src/domain/post/updateReactionCount/feature.ts rename to src/domain/post/updateReactionCount/updateReactionCount.ts index 1b9afb64..5b3664fd 100644 --- a/src/domain/post/updateReactionCount/feature.ts +++ b/src/domain/post/updateReactionCount/updateReactionCount.ts @@ -1,10 +1,10 @@ -import getById from '../getById/feature'; -import update from '../update/feature'; +import getById from '../getById'; +import update from '../update'; import type { CountOperation } from '../types'; -export default async function feature(id: string, operation: CountOperation): Promise +export default async function updateReactionCount(id: string, operation: CountOperation): Promise { const data = await getById(id); diff --git a/src/domain/rating/exists/feature.ts b/src/domain/rating/exists/exists.ts similarity index 71% rename from src/domain/rating/exists/feature.ts rename to src/domain/rating/exists/exists.ts index 1b2835a1..4a5b45d6 100644 --- a/src/domain/rating/exists/feature.ts +++ b/src/domain/rating/exists/exists.ts @@ -3,7 +3,7 @@ import database, { RecordQuery } from '^/integrations/database/module'; import { RECORD_TYPE } from '../definitions'; -export default async function feature(creatorId: string, postId: string | undefined = undefined, reactionId: string | undefined = undefined): Promise +export default async function exists(creatorId: string, postId: string | undefined = undefined, reactionId: string | undefined = undefined): Promise { const query: RecordQuery = { diff --git a/src/domain/rating/exists/index.ts b/src/domain/rating/exists/index.ts new file mode 100644 index 00000000..b8e57641 --- /dev/null +++ b/src/domain/rating/exists/index.ts @@ -0,0 +1,2 @@ + +export { default } from './exists'; diff --git a/src/domain/rating/index.ts b/src/domain/rating/index.ts new file mode 100644 index 00000000..273c9eea --- /dev/null +++ b/src/domain/rating/index.ts @@ -0,0 +1,4 @@ + +export { RECORD_TYPE } from './definitions'; + +export type { DataModel } from './types'; diff --git a/src/domain/rating/update/index.ts b/src/domain/rating/update/index.ts new file mode 100644 index 00000000..e58fa2a9 --- /dev/null +++ b/src/domain/rating/update/index.ts @@ -0,0 +1,4 @@ + +export { default } from './update'; + +export { default as InvalidRating } from './InvalidRating'; diff --git a/src/domain/rating/update/feature.ts b/src/domain/rating/update/update.ts similarity index 66% rename from src/domain/rating/update/feature.ts rename to src/domain/rating/update/update.ts index 19dd3dd2..89e7cedc 100644 --- a/src/domain/rating/update/feature.ts +++ b/src/domain/rating/update/update.ts @@ -1,5 +1,5 @@ -import type { Requester } from '^/domain/authentication/types'; +import { Requester } from '^/domain/authentication'; import createData from './createData'; import eraseData from './eraseData'; @@ -7,7 +7,7 @@ import getData from './getData'; import insertData from './insertData'; import validateData from './validateData'; -export default async function feature(requester: Requester, postId: string | undefined = undefined, reactionId: string | undefined = undefined): Promise +export default async function update(requester: Requester, postId: string | undefined = undefined, reactionId: string | undefined = undefined): Promise { const data = await getData(requester.id, postId, reactionId); diff --git a/src/domain/reaction/aggregate/feature.ts b/src/domain/reaction/aggregate/aggregate.ts similarity index 62% rename from src/domain/reaction/aggregate/feature.ts rename to src/domain/reaction/aggregate/aggregate.ts index 12040771..57ca25e1 100644 --- a/src/domain/reaction/aggregate/feature.ts +++ b/src/domain/reaction/aggregate/aggregate.ts @@ -1,14 +1,14 @@ -import type { Requester } from '^/domain/authentication/types'; -import getComicData from '^/domain/comic/getByIdAggregated/feature'; -import getCommentData from '^/domain/comment/getById/feature'; -import ratingExists from '^/domain/rating/exists/feature'; -import getRelationData from '^/domain/relation/getAggregated/feature'; +import { Requester } from '^/domain/authentication'; +import getComicData from '^/domain/comic/getByIdAggregated'; +import getCommentData from '^/domain/comment/getById'; +import ratingExists from '^/domain/rating/exists'; +import getRelationData from '^/domain/relation/getAggregated'; import type { DataModel } from '../types'; import type { AggregatedData } from './types'; -export default async function feature(requester: Requester, data: DataModel): Promise +export default async function aggregate(requester: Requester, data: DataModel): Promise { const [relationData, hasRated, comicData, commentData] = await Promise.all([ getRelationData(requester.id, data.creatorId), diff --git a/src/domain/reaction/aggregate/index.ts b/src/domain/reaction/aggregate/index.ts new file mode 100644 index 00000000..19b59674 --- /dev/null +++ b/src/domain/reaction/aggregate/index.ts @@ -0,0 +1,4 @@ + +export { default } from './aggregate'; + +export type { AggregatedData } from './types'; diff --git a/src/domain/reaction/aggregate/types.ts b/src/domain/reaction/aggregate/types.ts index a1c7af84..cb126353 100644 --- a/src/domain/reaction/aggregate/types.ts +++ b/src/domain/reaction/aggregate/types.ts @@ -1,15 +1,15 @@ -import type { AggregatedData as ComicData } from '^/domain/comic/aggregate/types'; +import type { AggregatedData as AggregatedComicData } from '^/domain/comic/aggregate'; import type { DataModel as CommentData } from '^/domain/comment/types'; -import type { AggregatedData as RelationData } from '^/domain/relation/aggregate/types'; +import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate'; import type { DataModel } from '../types'; type AggregatedData = Pick & { - readonly creator: RelationData; + readonly creator: AggregatedRelationData; readonly hasRated: boolean; - readonly comic?: ComicData; + readonly comic?: AggregatedComicData; readonly comment?: CommentData; }; diff --git a/src/domain/reaction/create/feature.ts b/src/domain/reaction/create/create.ts similarity index 70% rename from src/domain/reaction/create/feature.ts rename to src/domain/reaction/create/create.ts index 712af85b..5e5951b0 100644 --- a/src/domain/reaction/create/feature.ts +++ b/src/domain/reaction/create/create.ts @@ -1,17 +1,17 @@ import logger from '^/integrations/logging/module'; -import updateReactionCount from '^/domain/post/updateReactionCount/feature'; +import updateReactionCount from '^/domain/post/updateReactionCount'; -import createNotification from '^/domain/notification/create/feature'; -import { Types } from '^/domain/notification/definitions'; -import retrievePost from '^/domain/post/getById/feature'; +import { Types } from '^/domain/notification'; +import createNotification from '^/domain/notification/create'; +import retrievePost from '^/domain/post/getById'; import createData from './createData'; import eraseData from './eraseData'; import insertData from './insertData'; import validateData from './validateData'; -export default async function feature(creatorId: string, postId: string, comicId: string | undefined = undefined, commentId: string | undefined = undefined): Promise +export default async function create(creatorId: string, postId: string, comicId: string | undefined = undefined, commentId: string | undefined = undefined): Promise { let id; diff --git a/src/domain/reaction/create/index.ts b/src/domain/reaction/create/index.ts new file mode 100644 index 00000000..528aaa7a --- /dev/null +++ b/src/domain/reaction/create/index.ts @@ -0,0 +1,4 @@ + +export { default } from './create'; + +export { default as InvalidReaction } from './InvalidReaction'; diff --git a/src/domain/reaction/createComic/feature.ts b/src/domain/reaction/createComic/feature.ts deleted file mode 100644 index 01b334e6..00000000 --- a/src/domain/reaction/createComic/feature.ts +++ /dev/null @@ -1,12 +0,0 @@ - -import type { Requester } from '^/domain/authentication/types'; -import createComic from '^/domain/comic/create/feature'; - -import createReaction from '../create/feature'; - -export default async function feature(requester: Requester, postId: string, imageData: string): Promise -{ - const comicId = await createComic(imageData); - - return createReaction(requester.id, postId, comicId); -} diff --git a/src/domain/reaction/createComment/feature.ts b/src/domain/reaction/createComment/feature.ts deleted file mode 100644 index 8607997b..00000000 --- a/src/domain/reaction/createComment/feature.ts +++ /dev/null @@ -1,12 +0,0 @@ - -import type { Requester } from '^/domain/authentication/types'; -import createComment from '^/domain/comment/create/feature'; - -import createReaction from '../create/feature'; - -export default async function feature(requester: Requester, postId: string, message: string): Promise -{ - const commentId = await createComment(message); - - return createReaction(requester.id, postId, undefined, commentId); -} diff --git a/src/domain/reaction/createWithComic/createWithComic.ts b/src/domain/reaction/createWithComic/createWithComic.ts new file mode 100644 index 00000000..af448c8c --- /dev/null +++ b/src/domain/reaction/createWithComic/createWithComic.ts @@ -0,0 +1,12 @@ + +import { Requester } from '^/domain/authentication'; +import createComic from '^/domain/comic/create/create'; + +import createReaction from '../create'; + +export default async function createWithComic(requester: Requester, postId: string, imageData: string): Promise +{ + const comicId = await createComic(imageData); + + return createReaction(requester.id, postId, comicId); +} diff --git a/src/domain/reaction/createWithComic/index.ts b/src/domain/reaction/createWithComic/index.ts new file mode 100644 index 00000000..6cc06a20 --- /dev/null +++ b/src/domain/reaction/createWithComic/index.ts @@ -0,0 +1,2 @@ + +export { default } from './createWithComic'; diff --git a/src/domain/reaction/createWithComment/createWithComment.ts b/src/domain/reaction/createWithComment/createWithComment.ts new file mode 100644 index 00000000..8fcba79b --- /dev/null +++ b/src/domain/reaction/createWithComment/createWithComment.ts @@ -0,0 +1,12 @@ + +import { Requester } from '^/domain/authentication'; +import createComment from '^/domain/comment/create'; + +import createReaction from '../create'; + +export default async function createWithComment(requester: Requester, postId: string, message: string): Promise +{ + const commentId = await createComment(message); + + return createReaction(requester.id, postId, undefined, commentId); +} diff --git a/src/domain/reaction/createWithComment/index.ts b/src/domain/reaction/createWithComment/index.ts new file mode 100644 index 00000000..ab799e05 --- /dev/null +++ b/src/domain/reaction/createWithComment/index.ts @@ -0,0 +1,2 @@ + +export { default } from './createWithComment'; diff --git a/src/domain/reaction/getById/getById.ts b/src/domain/reaction/getById/getById.ts new file mode 100644 index 00000000..73bf5931 --- /dev/null +++ b/src/domain/reaction/getById/getById.ts @@ -0,0 +1,10 @@ + +import database from '^/integrations/database/module'; + +import { RECORD_TYPE } from '../definitions'; +import type { DataModel } from '../types'; + +export default async function getById(id: string): Promise +{ + return database.readRecord(RECORD_TYPE, id) as Promise; +} diff --git a/src/domain/reaction/getById/index.ts b/src/domain/reaction/getById/index.ts new file mode 100644 index 00000000..da399eb0 --- /dev/null +++ b/src/domain/reaction/getById/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getById'; diff --git a/src/domain/reaction/getByIdAggregated/feature.ts b/src/domain/reaction/getByIdAggregated/feature.ts deleted file mode 100644 index 99e47ade..00000000 --- a/src/domain/reaction/getByIdAggregated/feature.ts +++ /dev/null @@ -1,13 +0,0 @@ - -import type { Requester } from '^/domain/authentication/types'; - -import aggregate from '../aggregate/feature'; -import type { AggregatedData } from '../aggregate/types'; -import getById from '../getById/feature'; - -export default async function feature(requester: Requester, id: string): Promise -{ - const data = await getById(id); - - return aggregate(requester, data); -} diff --git a/src/domain/reaction/getByIdAggregated/getByIdAggregated.ts b/src/domain/reaction/getByIdAggregated/getByIdAggregated.ts new file mode 100644 index 00000000..6a54332d --- /dev/null +++ b/src/domain/reaction/getByIdAggregated/getByIdAggregated.ts @@ -0,0 +1,12 @@ + +import { Requester } from '^/domain/authentication'; + +import aggregate, { AggregatedData } from '../aggregate'; +import getById from '../getById'; + +export default async function getByIdAggregated(requester: Requester, id: string): Promise +{ + const data = await getById(id); + + return aggregate(requester, data); +} diff --git a/src/domain/reaction/getByIdAggregated/index.ts b/src/domain/reaction/getByIdAggregated/index.ts new file mode 100644 index 00000000..8f7f2b94 --- /dev/null +++ b/src/domain/reaction/getByIdAggregated/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getByIdAggregated'; diff --git a/src/domain/reaction/getByPost/feature.ts b/src/domain/reaction/getByPost/getByPost.ts similarity index 82% rename from src/domain/reaction/getByPost/feature.ts rename to src/domain/reaction/getByPost/getByPost.ts index 4c84a02f..11c3e532 100644 --- a/src/domain/reaction/getByPost/feature.ts +++ b/src/domain/reaction/getByPost/getByPost.ts @@ -4,7 +4,7 @@ import database, { RecordQuery, RecordSort, SortDirections } from '^/integration import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; -export default async function feature(postId: string, limit: number, offset: number): Promise +export default async function getByPost(postId: string, limit: number, offset: number): Promise { const query: RecordQuery = { diff --git a/src/domain/reaction/getByPost/index.ts b/src/domain/reaction/getByPost/index.ts new file mode 100644 index 00000000..adc01cbb --- /dev/null +++ b/src/domain/reaction/getByPost/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getByPost'; diff --git a/src/domain/reaction/getByPostAggregated/feature.ts b/src/domain/reaction/getByPostAggregated/getByPostAggregated.ts similarity index 58% rename from src/domain/reaction/getByPostAggregated/feature.ts rename to src/domain/reaction/getByPostAggregated/getByPostAggregated.ts index 5223e64a..3bbdcbb0 100644 --- a/src/domain/reaction/getByPostAggregated/feature.ts +++ b/src/domain/reaction/getByPostAggregated/getByPostAggregated.ts @@ -1,13 +1,12 @@ -import type { Requester } from '^/domain/authentication/types'; -import { Range } from '^/domain/common/types'; +import { Requester } from '^/domain/authentication'; +import { Range } from '^/domain/common/validateRange'; import logger from '^/integrations/logging/module'; -import aggregate from '../aggregate/feature'; -import type { AggregatedData } from '../aggregate/types'; -import getByPost from '../getByPost/feature'; +import aggregate, { AggregatedData } from '../aggregate'; +import getByPost from '../getByPost'; -export default async function feature(requester: Requester, postId: string, range: Range): Promise +export default async function getByPostAggregated(requester: Requester, postId: string, range: Range): Promise { const data = await getByPost(postId, range.limit, range.offset); diff --git a/src/domain/reaction/getByPostAggregated/index.ts b/src/domain/reaction/getByPostAggregated/index.ts new file mode 100644 index 00000000..c0214220 --- /dev/null +++ b/src/domain/reaction/getByPostAggregated/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getByPostAggregated'; diff --git a/src/domain/reaction/index.ts b/src/domain/reaction/index.ts new file mode 100644 index 00000000..273c9eea --- /dev/null +++ b/src/domain/reaction/index.ts @@ -0,0 +1,4 @@ + +export { RECORD_TYPE } from './definitions'; + +export type { DataModel } from './types'; diff --git a/src/domain/reaction/remove/index.ts b/src/domain/reaction/remove/index.ts new file mode 100644 index 00000000..e9da62e9 --- /dev/null +++ b/src/domain/reaction/remove/index.ts @@ -0,0 +1,4 @@ + +export { default } from './remove'; + +export { default as ReactionNotFound } from './ReactionNotFound'; diff --git a/src/domain/reaction/remove/feature.ts b/src/domain/reaction/remove/remove.ts similarity index 85% rename from src/domain/reaction/remove/feature.ts rename to src/domain/reaction/remove/remove.ts index 86f60a45..4cc0c167 100644 --- a/src/domain/reaction/remove/feature.ts +++ b/src/domain/reaction/remove/remove.ts @@ -1,14 +1,14 @@ import logger from '^/integrations/logging/module'; -import type { Requester } from '^/domain/authentication/types'; -import updateReactionCount from '^/domain/post/updateReactionCount/feature'; +import { Requester } from '^/domain/authentication'; +import updateReactionCount from '^/domain/post/updateReactionCount'; import ReactionNotFound from './ReactionNotFound'; import deleteData from './deleteData'; import retrieveOwnedData from './retrieveOwnedData'; -export default async function feature(requester: Requester, id: string): Promise +export default async function remove(requester: Requester, id: string): Promise { // We only delete the reaction itself and do not cascade it towards the comment or comic as it doesn't add // any value, and it would make the code more complex. diff --git a/src/domain/reaction/toggleRating/index.ts b/src/domain/reaction/toggleRating/index.ts new file mode 100644 index 00000000..503af68d --- /dev/null +++ b/src/domain/reaction/toggleRating/index.ts @@ -0,0 +1,2 @@ + +export { default } from './toggleRating'; diff --git a/src/domain/reaction/toggleRating/feature.ts b/src/domain/reaction/toggleRating/toggleRating.ts similarity index 62% rename from src/domain/reaction/toggleRating/feature.ts rename to src/domain/reaction/toggleRating/toggleRating.ts index 794e900b..0ef9173f 100644 --- a/src/domain/reaction/toggleRating/feature.ts +++ b/src/domain/reaction/toggleRating/toggleRating.ts @@ -1,15 +1,15 @@ import logger from '^/integrations/logging/module'; -import type { Requester } from '^/domain/authentication/types'; -import createNotification from '^/domain/notification/create/feature'; -import { Types } from '^/domain/notification/definitions'; -import updateRating from '^/domain/rating/update/feature'; -import getReaction from '^/domain/reaction/getById/feature'; +import { Requester } from '^/domain/authentication'; +import { Types } from '^/domain/notification'; +import createNotification from '^/domain/notification/create'; +import updateRating from '^/domain/rating/update'; +import getReaction from '^/domain/reaction/getById'; -import updateRatingCount from '../updateRatingCount/feature'; +import updateRatingCount from '../updateRatingCount'; -export default async function feature(requester: Requester, reactionId: string): Promise +export default async function toggleRating(requester: Requester, reactionId: string): Promise { let ratingId; diff --git a/src/domain/reaction/update/index.ts b/src/domain/reaction/update/index.ts new file mode 100644 index 00000000..94a3b692 --- /dev/null +++ b/src/domain/reaction/update/index.ts @@ -0,0 +1,2 @@ + +export { default } from './update'; diff --git a/src/domain/reaction/update/feature.ts b/src/domain/reaction/update/update.ts similarity index 76% rename from src/domain/reaction/update/feature.ts rename to src/domain/reaction/update/update.ts index f8eb6973..b5585ab0 100644 --- a/src/domain/reaction/update/feature.ts +++ b/src/domain/reaction/update/update.ts @@ -6,7 +6,7 @@ import type { DataModel } from '../types'; type Data = Partial>; -export default async function feature(id: string, data: Data): Promise +export default async function update(id: string, data: Data): Promise { return database.updateRecord(RECORD_TYPE, id, data); } diff --git a/src/domain/reaction/updateRatingCount/index.ts b/src/domain/reaction/updateRatingCount/index.ts new file mode 100644 index 00000000..5c8ac8a6 --- /dev/null +++ b/src/domain/reaction/updateRatingCount/index.ts @@ -0,0 +1,2 @@ + +export { default } from './updateRatingCount'; diff --git a/src/domain/post/updateRatingCount/feature.ts b/src/domain/reaction/updateRatingCount/updateRatingCount.ts similarity index 60% rename from src/domain/post/updateRatingCount/feature.ts rename to src/domain/reaction/updateRatingCount/updateRatingCount.ts index 41e6c242..21fdb745 100644 --- a/src/domain/post/updateRatingCount/feature.ts +++ b/src/domain/reaction/updateRatingCount/updateRatingCount.ts @@ -1,10 +1,10 @@ -import getById from '../getById/feature'; -import update from '../update/feature'; +import getById from '../getById'; +import update from '../update'; import type { CountOperation } from '../types'; -export default async function feature(id: string, operation: CountOperation): Promise +export default async function updateRatingCount(id: string, operation: CountOperation): Promise { const data = await getById(id); diff --git a/src/domain/relation/aggregate/feature.ts b/src/domain/relation/aggregate/aggregate.ts similarity index 68% rename from src/domain/relation/aggregate/feature.ts rename to src/domain/relation/aggregate/aggregate.ts index 648166e4..a9db8a23 100644 --- a/src/domain/relation/aggregate/feature.ts +++ b/src/domain/relation/aggregate/aggregate.ts @@ -1,10 +1,10 @@ -import getCreatorData from '^/domain/creator/getByIdAggregated/feature'; +import getCreatorData from '^/domain/creator/getByIdAggregated'; import type { DataModel } from '../types'; import type { AggregatedData } from './types'; -export default async function feature(data: DataModel): Promise +export default async function aggregate(data: DataModel): Promise { const followingData = await getCreatorData(data.followingId); diff --git a/src/domain/relation/aggregate/index.ts b/src/domain/relation/aggregate/index.ts new file mode 100644 index 00000000..19b59674 --- /dev/null +++ b/src/domain/relation/aggregate/index.ts @@ -0,0 +1,4 @@ + +export { default } from './aggregate'; + +export type { AggregatedData } from './types'; diff --git a/src/domain/relation/aggregate/types.ts b/src/domain/relation/aggregate/types.ts index 760b3c2e..e34fa957 100644 --- a/src/domain/relation/aggregate/types.ts +++ b/src/domain/relation/aggregate/types.ts @@ -1,11 +1,11 @@ -import type { AggregatedData as CreatorData } from '^/domain/creator/aggregate/types'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; import type { DataModel } from '../types'; type AggregatedData = Pick & { - readonly following: CreatorData; + readonly following: AggregatedCreatorData; readonly established: boolean; readonly self: boolean; }; diff --git a/src/domain/relation/establish/feature.ts b/src/domain/relation/establish/establish.ts similarity index 81% rename from src/domain/relation/establish/feature.ts rename to src/domain/relation/establish/establish.ts index 9547cd10..ecaae908 100644 --- a/src/domain/relation/establish/feature.ts +++ b/src/domain/relation/establish/establish.ts @@ -1,12 +1,12 @@ import logger from '^/integrations/logging/module'; -import type { Requester } from '^/domain/authentication/types'; -import updateFollowerCount from '^/domain/creator/updateFollowerCount/feature'; -import updateFollowingCount from '^/domain/creator/updateFollowingCount/feature'; +import { Requester } from '^/domain/authentication'; +import updateFollowerCount from '^/domain/creator/updateFollowerCount'; +import updateFollowingCount from '^/domain/creator/updateFollowingCount'; -import createNotification from '^/domain/notification/create/feature'; -import { Types } from '^/domain/notification/definitions'; +import { Types } from '^/domain/notification'; +import createNotification from '^/domain/notification/create'; import createData from './createData'; import dataExists from './dataExists'; import eraseData from './eraseData'; @@ -14,7 +14,7 @@ import insertData from './insertData'; import RelationAlreadyExists from './RelationAlreadyExists'; import validateData from './validateData'; -export default async function feature(requester: Requester, followingId: string): Promise +export default async function establish(requester: Requester, followingId: string): Promise { const relationExists = await dataExists(requester.id, followingId); diff --git a/src/domain/relation/establish/index.ts b/src/domain/relation/establish/index.ts new file mode 100644 index 00000000..8c8d17b9 --- /dev/null +++ b/src/domain/relation/establish/index.ts @@ -0,0 +1,5 @@ + +export { default } from './establish'; + +export { default as InvalidRelation } from './InvalidRelation'; +export { default as RelationAlreadyExists } from './RelationAlreadyExists'; diff --git a/src/domain/relation/explore/feature.ts b/src/domain/relation/explore/explore.ts similarity index 71% rename from src/domain/relation/explore/feature.ts rename to src/domain/relation/explore/explore.ts index f8615447..8b82af7a 100644 --- a/src/domain/relation/explore/feature.ts +++ b/src/domain/relation/explore/explore.ts @@ -1,12 +1,12 @@ -import type { Requester } from '^/domain/authentication/types'; -import getOtherCreators from '^/domain/creator/getOthers/feature'; +import { Requester } from '^/domain/authentication'; +import getOtherCreators from '^/domain/creator/getOthers'; import type { SortOrder } from '../definitions'; -import getFollowing from '../getFollowing/feature'; +import getFollowing from '../getFollowing'; import type { DataModel } from '../types'; -export default async function feature(requester: Requester, order: SortOrder, search: string | undefined = undefined, limit: number, offset: number): Promise +export default async function explore(requester: Requester, order: SortOrder, search: string | undefined = undefined, limit: number, offset: number): Promise { const followingData = await getFollowing(requester, requester.id); const followingIds = followingData.map(data => data.followingId); diff --git a/src/domain/relation/explore/index.ts b/src/domain/relation/explore/index.ts new file mode 100644 index 00000000..173957d6 --- /dev/null +++ b/src/domain/relation/explore/index.ts @@ -0,0 +1,2 @@ + +export { default } from './explore'; diff --git a/src/domain/relation/exploreAggregated/exploreAggregated.ts b/src/domain/relation/exploreAggregated/exploreAggregated.ts new file mode 100644 index 00000000..3109116d --- /dev/null +++ b/src/domain/relation/exploreAggregated/exploreAggregated.ts @@ -0,0 +1,16 @@ + +import { Requester } from '^/domain/authentication'; +import validateRange, { Range } from '^/domain/common/validateRange'; + +import aggregate, { AggregatedData } from '../aggregate'; +import type { SortOrder } from '../definitions'; +import explore from '../explore'; + +export default async function exploreAggregated(requester: Requester, order: SortOrder, search: string | undefined = undefined, range: Range): Promise +{ + validateRange(range); + + const data = await explore(requester, order, search, range.limit, range.offset); + + return Promise.all(data.map(item => aggregate(item))); +} diff --git a/src/domain/relation/exploreAggregated/feature.ts b/src/domain/relation/exploreAggregated/feature.ts deleted file mode 100644 index b1a92fd5..00000000 --- a/src/domain/relation/exploreAggregated/feature.ts +++ /dev/null @@ -1,18 +0,0 @@ - -import type { Requester } from '^/domain/authentication/types'; -import { Range } from '^/domain/common/types'; -import validateRange from '^/domain/common/validateRange/feature'; - -import aggregate from '../aggregate/feature'; -import type { AggregatedData } from '../aggregate/types'; -import type { SortOrder } from '../definitions'; -import explore from '../explore/feature'; - -export default async function feature(requester: Requester, order: SortOrder, search: string | undefined = undefined, range: Range): Promise -{ - validateRange(range); - - const data = await explore(requester, order, search, range.limit, range.offset); - - return Promise.all(data.map(item => aggregate(item))); -} diff --git a/src/domain/relation/exploreAggregated/index.ts b/src/domain/relation/exploreAggregated/index.ts new file mode 100644 index 00000000..75ec37db --- /dev/null +++ b/src/domain/relation/exploreAggregated/index.ts @@ -0,0 +1,2 @@ + +export { default } from './exploreAggregated'; diff --git a/src/domain/relation/get/feature.ts b/src/domain/relation/get/get.ts similarity index 82% rename from src/domain/relation/get/feature.ts rename to src/domain/relation/get/get.ts index 0a799c23..24b17bdc 100644 --- a/src/domain/relation/get/feature.ts +++ b/src/domain/relation/get/get.ts @@ -4,7 +4,7 @@ import database, { RecordQuery } from '^/integrations/database/module'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; -export default async function feature(followerId: string, followingId: string): Promise +export default async function get(followerId: string, followingId: string): Promise { const query: RecordQuery = { diff --git a/src/domain/relation/get/index.ts b/src/domain/relation/get/index.ts new file mode 100644 index 00000000..d7a2b2b0 --- /dev/null +++ b/src/domain/relation/get/index.ts @@ -0,0 +1,2 @@ + +export { default } from './get'; diff --git a/src/domain/relation/getAggregated/feature.ts b/src/domain/relation/getAggregated/feature.ts deleted file mode 100644 index 46ea4530..00000000 --- a/src/domain/relation/getAggregated/feature.ts +++ /dev/null @@ -1,11 +0,0 @@ - -import aggregate from '../aggregate/feature'; -import type { AggregatedData } from '../aggregate/types'; -import get from '../get/feature'; - -export default async function feature(followerId: string, followingId: string): Promise -{ - const data = await get(followerId, followingId); - - return aggregate(data); -} diff --git a/src/domain/relation/getAggregated/getAggregated.ts b/src/domain/relation/getAggregated/getAggregated.ts new file mode 100644 index 00000000..296ed5e2 --- /dev/null +++ b/src/domain/relation/getAggregated/getAggregated.ts @@ -0,0 +1,10 @@ + +import aggregate, { AggregatedData } from '../aggregate'; +import get from '../get'; + +export default async function getAggregated(followerId: string, followingId: string): Promise +{ + const data = await get(followerId, followingId); + + return aggregate(data); +} diff --git a/src/domain/relation/getAggregated/index.ts b/src/domain/relation/getAggregated/index.ts new file mode 100644 index 00000000..ab315b3f --- /dev/null +++ b/src/domain/relation/getAggregated/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getAggregated'; diff --git a/src/domain/relation/getFollowers/feature.ts b/src/domain/relation/getFollowers/feature.ts deleted file mode 100644 index f8b8b5c5..00000000 --- a/src/domain/relation/getFollowers/feature.ts +++ /dev/null @@ -1,14 +0,0 @@ - -import type { Requester } from '^/domain/authentication/types'; - -import translateToRequester from '../translateToRequester/feature'; -import type { DataModel } from '../types'; - -import retrieveData from './retrieveData'; - -export default async function feature(requester: Requester, followingId: string, limit: number, offset: number): Promise -{ - const data = await retrieveData(followingId, limit, offset); - - return translateToRequester(requester, 'follower', data); -} diff --git a/src/domain/relation/getFollowers/getFollowers.ts b/src/domain/relation/getFollowers/getFollowers.ts new file mode 100644 index 00000000..f3f2a2d9 --- /dev/null +++ b/src/domain/relation/getFollowers/getFollowers.ts @@ -0,0 +1,14 @@ + +import { Requester } from '^/domain/authentication'; + +import translateToRequester from '../translateToRequester'; +import type { DataModel } from '../types'; + +import retrieveData from './retrieveData'; + +export default async function getFollowers(requester: Requester, followingId: string, limit: number, offset: number): Promise +{ + const data = await retrieveData(followingId, limit, offset); + + return translateToRequester(requester, 'follower', data); +} diff --git a/src/domain/relation/getFollowers/index.ts b/src/domain/relation/getFollowers/index.ts new file mode 100644 index 00000000..0d0b38e7 --- /dev/null +++ b/src/domain/relation/getFollowers/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getFollowers'; diff --git a/src/domain/relation/getFollowersAggregated/feature.ts b/src/domain/relation/getFollowersAggregated/feature.ts deleted file mode 100644 index 245302b8..00000000 --- a/src/domain/relation/getFollowersAggregated/feature.ts +++ /dev/null @@ -1,17 +0,0 @@ - -import type { Requester } from '^/domain/authentication/types'; -import { Range } from '^/domain/common/types'; -import validateRange from '^/domain/common/validateRange/feature'; - -import aggregate from '../aggregate/feature'; -import type { AggregatedData } from '../aggregate/types'; -import getFollowers from '../getFollowers/feature'; - -export default async function feature(requester: Requester, followingId: string, range: Range): Promise -{ - validateRange(range); - - const data = await getFollowers(requester, followingId, range.limit, range.offset); - - return Promise.all(data.map(aggregate)); -} diff --git a/src/domain/relation/getFollowersAggregated/getFollowersAggregated.ts b/src/domain/relation/getFollowersAggregated/getFollowersAggregated.ts new file mode 100644 index 00000000..2e1644ea --- /dev/null +++ b/src/domain/relation/getFollowersAggregated/getFollowersAggregated.ts @@ -0,0 +1,15 @@ + +import { Requester } from '^/domain/authentication'; +import validateRange, { Range } from '^/domain/common/validateRange'; + +import aggregate, { AggregatedData } from '../aggregate'; +import getFollowers from '../getFollowers'; + +export default async function getFollowersAggregated(requester: Requester, followingId: string, range: Range): Promise +{ + validateRange(range); + + const data = await getFollowers(requester, followingId, range.limit, range.offset); + + return Promise.all(data.map(aggregate)); +} diff --git a/src/domain/relation/getFollowersAggregated/index.ts b/src/domain/relation/getFollowersAggregated/index.ts new file mode 100644 index 00000000..bd593d61 --- /dev/null +++ b/src/domain/relation/getFollowersAggregated/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getFollowersAggregated'; diff --git a/src/domain/relation/getFollowing/feature.ts b/src/domain/relation/getFollowing/feature.ts deleted file mode 100644 index 6d0a765f..00000000 --- a/src/domain/relation/getFollowing/feature.ts +++ /dev/null @@ -1,14 +0,0 @@ - -import type { Requester } from '^/domain/authentication/types'; - -import translateToRequester from '../translateToRequester/feature'; -import type { DataModel } from '../types'; - -import retrieveData from './retrieveData'; - -export default async function feature(requester: Requester, followerId: string, limit: number | undefined = undefined, offset: number | undefined = undefined): Promise -{ - const data = await retrieveData(followerId, limit, offset); - - return translateToRequester(requester, 'following', data); -} diff --git a/src/domain/relation/getFollowing/getFollowing.ts b/src/domain/relation/getFollowing/getFollowing.ts new file mode 100644 index 00000000..5c73927d --- /dev/null +++ b/src/domain/relation/getFollowing/getFollowing.ts @@ -0,0 +1,14 @@ + +import { Requester } from '^/domain/authentication'; + +import translateToRequester from '../translateToRequester'; +import type { DataModel } from '../types'; + +import retrieveData from './retrieveData'; + +export default async function getFollowing(requester: Requester, followerId: string, limit: number | undefined = undefined, offset: number | undefined = undefined): Promise +{ + const data = await retrieveData(followerId, limit, offset); + + return translateToRequester(requester, 'following', data); +} diff --git a/src/domain/relation/getFollowing/index.ts b/src/domain/relation/getFollowing/index.ts new file mode 100644 index 00000000..5a85e6a0 --- /dev/null +++ b/src/domain/relation/getFollowing/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getFollowing'; diff --git a/src/domain/relation/getFollowing/retrieveData.ts b/src/domain/relation/getFollowing/retrieveData.ts index 29551750..902e9475 100644 --- a/src/domain/relation/getFollowing/retrieveData.ts +++ b/src/domain/relation/getFollowing/retrieveData.ts @@ -4,7 +4,7 @@ import database, { RecordQuery } from '^/integrations/database/module'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; -export default async function feature(followerId: string, limit: number | undefined = undefined, offset: number | undefined = undefined): Promise +export default async function retrieveData(followerId: string, limit: number | undefined = undefined, offset: number | undefined = undefined): Promise { const query: RecordQuery = { diff --git a/src/domain/relation/getFollowingAggregated/feature.ts b/src/domain/relation/getFollowingAggregated/feature.ts deleted file mode 100644 index 5d375416..00000000 --- a/src/domain/relation/getFollowingAggregated/feature.ts +++ /dev/null @@ -1,17 +0,0 @@ - -import { Requester } from '^/domain/authentication/types'; -import { Range } from '^/domain/common/types'; -import validateRange from '^/domain/common/validateRange/feature'; - -import aggregate from '../aggregate/feature'; -import type { AggregatedData } from '../aggregate/types'; -import retrieveByFollower from '../getFollowing/feature'; - -export default async function feature(requester: Requester, followerId: string, range: Range): Promise -{ - validateRange(range); - - const data = await retrieveByFollower(requester, followerId, range.limit, range.offset); - - return Promise.all(data.map(aggregate)); -} diff --git a/src/domain/relation/getFollowingAggregated/getFollowingAggregated.ts b/src/domain/relation/getFollowingAggregated/getFollowingAggregated.ts new file mode 100644 index 00000000..3fb9681d --- /dev/null +++ b/src/domain/relation/getFollowingAggregated/getFollowingAggregated.ts @@ -0,0 +1,15 @@ + +import { Requester } from '^/domain/authentication'; +import validateRange, { Range } from '^/domain/common/validateRange'; + +import aggregate, { AggregatedData } from '../aggregate'; +import retrieveByFollower from '../getFollowing'; + +export default async function getFollowingAggregated(requester: Requester, followerId: string, range: Range): Promise +{ + validateRange(range); + + const data = await retrieveByFollower(requester, followerId, range.limit, range.offset); + + return Promise.all(data.map(aggregate)); +} diff --git a/src/domain/relation/getFollowingAggregated/index.ts b/src/domain/relation/getFollowingAggregated/index.ts new file mode 100644 index 00000000..872a86c6 --- /dev/null +++ b/src/domain/relation/getFollowingAggregated/index.ts @@ -0,0 +1,2 @@ + +export { default } from './getFollowingAggregated'; diff --git a/src/domain/relation/index.ts b/src/domain/relation/index.ts new file mode 100644 index 00000000..273c9eea --- /dev/null +++ b/src/domain/relation/index.ts @@ -0,0 +1,4 @@ + +export { RECORD_TYPE } from './definitions'; + +export type { DataModel } from './types'; diff --git a/src/domain/relation/translateToRequester/index.ts b/src/domain/relation/translateToRequester/index.ts new file mode 100644 index 00000000..8cbd799b --- /dev/null +++ b/src/domain/relation/translateToRequester/index.ts @@ -0,0 +1,2 @@ + +export { default } from './translateToRequester'; diff --git a/src/domain/relation/translateToRequester/translate.ts b/src/domain/relation/translateToRequester/translate.ts index 1c73a42b..538b2058 100644 --- a/src/domain/relation/translateToRequester/translate.ts +++ b/src/domain/relation/translateToRequester/translate.ts @@ -1,7 +1,7 @@ -import type { Requester } from '^/domain/authentication/types'; +import { Requester } from '^/domain/authentication'; -import get from '../get/feature'; +import get from '../get'; import { DataModel } from '../types'; import { Mapping } from './types'; diff --git a/src/domain/relation/translateToRequester/feature.ts b/src/domain/relation/translateToRequester/translateToRequester.ts similarity index 51% rename from src/domain/relation/translateToRequester/feature.ts rename to src/domain/relation/translateToRequester/translateToRequester.ts index be54d53b..9e439072 100644 --- a/src/domain/relation/translateToRequester/feature.ts +++ b/src/domain/relation/translateToRequester/translateToRequester.ts @@ -1,12 +1,12 @@ -import type { Requester } from '^/domain/authentication/types'; +import { Requester } from '^/domain/authentication'; import { DataModel } from '../types'; import translate from './translate'; import { Mapping } from './types'; -export default async function feature(requester: Requester, mapping: Mapping, data: DataModel[]): Promise +export default async function translateToRequester(requester: Requester, mapping: Mapping, data: DataModel[]): Promise { return Promise.all(data.map(item => translate(requester, mapping, item))); } diff --git a/src/integrations/runtime/authenticationMiddleware.ts b/src/integrations/runtime/authenticationMiddleware.ts index 5f681446..b0bec483 100644 --- a/src/integrations/runtime/authenticationMiddleware.ts +++ b/src/integrations/runtime/authenticationMiddleware.ts @@ -4,9 +4,9 @@ import identityProvider from '^/integrations/authentication'; import AuthenticationMiddleware from './middlewares/AuthenticationMiddleware'; const authProcedures = { - loginUrl: 'domain/authentication/getLoginUrl/feature', - login: 'domain/authentication/login/feature', - logout: 'domain/authentication/logout/feature' + loginUrl: 'domain/authentication/getLoginUrl', + login: 'domain/authentication/login', + logout: 'domain/authentication/logout' }; const redirectUrl = process.env.AUTHENTICATION_CLIENT_URI || 'undefined'; diff --git a/src/webui/components/application/Footer.tsx b/src/webui/components/application/Footer.tsx index 678331d5..e32ba646 100644 --- a/src/webui/components/application/Footer.tsx +++ b/src/webui/components/application/Footer.tsx @@ -1,12 +1,12 @@ -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; import { Column } from '^/webui/designsystem'; import Menu from './Menu'; type Props = { - readonly identity: CreatorView; + readonly identity: AggregatedCreatorData; }; export default function Component({ identity }: Props) diff --git a/src/webui/components/application/Header.tsx b/src/webui/components/application/Header.tsx index 1bebf0dd..21ce2ade 100644 --- a/src/webui/components/application/Header.tsx +++ b/src/webui/components/application/Header.tsx @@ -1,5 +1,5 @@ -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; import { Row } from '^/webui/designsystem'; @@ -10,7 +10,7 @@ import LogoutButton from './LogoutButton'; import Logo from './Logo'; type Props = { - readonly identity: CreatorView; + readonly identity: AggregatedCreatorData; readonly onLogout: () => void; }; diff --git a/src/webui/components/application/Identity.tsx b/src/webui/components/application/Identity.tsx index fcba70a7..252d62f2 100644 --- a/src/webui/components/application/Identity.tsx +++ b/src/webui/components/application/Identity.tsx @@ -1,5 +1,5 @@ -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; import { Row } from '^/webui/designsystem'; @@ -8,7 +8,7 @@ import CreatorIdentity from '../creator/FullIdentity'; import LogoutButton from './LogoutButton'; type Props = { - readonly identity: CreatorView; + readonly identity: AggregatedCreatorData; readonly onLogout: () => void; }; diff --git a/src/webui/components/application/Sidebar.tsx b/src/webui/components/application/Sidebar.tsx index 6d3b4882..1cb4915d 100644 --- a/src/webui/components/application/Sidebar.tsx +++ b/src/webui/components/application/Sidebar.tsx @@ -1,5 +1,5 @@ -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; import { Cell, Column, Row, Ruler } from '^/webui/designsystem'; @@ -8,7 +8,7 @@ import Logo from './Logo'; import Menu from './Menu'; type Props = { - readonly identity: CreatorView; + readonly identity: AggregatedCreatorData; readonly onLogout: () => void; }; diff --git a/src/webui/components/comic/Image.tsx b/src/webui/components/comic/Image.tsx index dbeabf11..06558894 100644 --- a/src/webui/components/comic/Image.tsx +++ b/src/webui/components/comic/Image.tsx @@ -1,10 +1,10 @@ -import type { AggregatedData as ComicView } from '^/domain/comic/aggregate/types'; +import type { AggregatedData as AggregatedComicData } from '^/domain/comic/aggregate'; import { Image } from '^/webui/designsystem'; type Props = { - readonly comic: ComicView; + readonly comic: AggregatedComicData; }; export default function Component({ comic }: Props) diff --git a/src/webui/components/creator/ConciseIdentity.tsx b/src/webui/components/creator/ConciseIdentity.tsx index 53e6a17c..302aad91 100644 --- a/src/webui/components/creator/ConciseIdentity.tsx +++ b/src/webui/components/creator/ConciseIdentity.tsx @@ -1,10 +1,10 @@ -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; import Avatar from './elementary/Avatar'; type Props = { - readonly creator: CreatorView; + readonly creator: AggregatedCreatorData; }; export default function Component({ creator }: Props) diff --git a/src/webui/components/creator/Counters.tsx b/src/webui/components/creator/Counters.tsx index 2980d88d..5972d956 100644 --- a/src/webui/components/creator/Counters.tsx +++ b/src/webui/components/creator/Counters.tsx @@ -1,12 +1,12 @@ -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; import AvatarRow from './elementary/AvatarRow'; import CountersColumn from './elementary/CountersColumn'; type Props = { - readonly creator: CreatorView; - readonly onCreatorClick: (creator: CreatorView) => void; + readonly creator: AggregatedCreatorData; + readonly onCreatorClick: (creator: AggregatedCreatorData) => void; }; export default function Component({ creator, onCreatorClick }: Props) diff --git a/src/webui/components/creator/FullIdentity.tsx b/src/webui/components/creator/FullIdentity.tsx index 723026e3..22e7d3f7 100644 --- a/src/webui/components/creator/FullIdentity.tsx +++ b/src/webui/components/creator/FullIdentity.tsx @@ -1,11 +1,11 @@ -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; import AvatarRow from './elementary/AvatarRow'; import NamesColumn from './elementary/NamesColumn'; type Props = { - readonly creator: CreatorView; + readonly creator: AggregatedCreatorData; }; export default function Component({ creator }: Props) diff --git a/src/webui/components/creator/Profile.tsx b/src/webui/components/creator/Profile.tsx index 2585b544..63fc7f6d 100644 --- a/src/webui/components/creator/Profile.tsx +++ b/src/webui/components/creator/Profile.tsx @@ -1,11 +1,11 @@ -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; import AvatarRow from './elementary/AvatarRow'; import JoinedColumn from './elementary/JoinedColumn'; type Props = { - readonly creator: CreatorView; + readonly creator: AggregatedCreatorData; }; export default function Component({ creator }: Props) diff --git a/src/webui/components/creator/TimeElapsed.tsx b/src/webui/components/creator/TimeElapsed.tsx index 797a47d5..27808139 100644 --- a/src/webui/components/creator/TimeElapsed.tsx +++ b/src/webui/components/creator/TimeElapsed.tsx @@ -1,13 +1,13 @@ -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; import AvatarRow from './elementary/AvatarRow'; import TimeElapsedColumn from './elementary/TimeElapsedColumn'; type Props = { - readonly creator: CreatorView; + readonly creator: AggregatedCreatorData; readonly date: string; - readonly onCreatorClick: (creator: CreatorView) => void; + readonly onCreatorClick: (creator: AggregatedCreatorData) => void; }; export default function Component({ creator, date, onCreatorClick }: Props) diff --git a/src/webui/components/notification/Panel.tsx b/src/webui/components/notification/Panel.tsx index c5a076cd..31dcf553 100644 --- a/src/webui/components/notification/Panel.tsx +++ b/src/webui/components/notification/Panel.tsx @@ -1,8 +1,8 @@ -import type { AggregatedData as NotificationView } from '^/domain/notification/aggregate/types'; -import type { AggregatedData as PostView } from '^/domain/post/aggregate/types'; -import type { AggregatedData as ReactionView } from '^/domain/reaction/aggregate/types'; -import type { AggregatedData as RelationView } from '^/domain/relation/aggregate/types'; +import type { AggregatedData as AggregatedNotificationData } from '^/domain/notification/aggregate'; +import type { AggregatedData as AggregatedPostData } from '^/domain/post/aggregate'; +import type { AggregatedData as AggregatedReactionData } from '^/domain/reaction/aggregate'; +import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate'; import { Column, Panel } from '^/webui/designsystem'; @@ -13,20 +13,20 @@ import RatedReaction from './elementary/RatedReaction'; import StartedFollowing from './elementary/StartedFollowing'; type Props = { - readonly notification: NotificationView; - readonly onFollowClick: (relation: RelationView) => Promise; - readonly onCreatorClick: (relation: RelationView) => void; - readonly onReactionClick: (reaction: ReactionView) => void; - readonly onPostClick: (post: PostView) => void; + readonly notification: AggregatedNotificationData; + readonly onFollowClick: (relation: AggregatedRelationData) => Promise; + readonly onCreatorClick: (relation: AggregatedRelationData) => void; + readonly onReactionClick: (reaction: AggregatedReactionData) => void; + readonly onPostClick: (post: AggregatedPostData) => void; }; -function getContent(notification: NotificationView, onReactionClick: (reaction: ReactionView) => void, onPostClick: (post: PostView) => void) +function getContent(notification: AggregatedNotificationData, onReactionClick: (reaction: AggregatedReactionData) => void, onPostClick: (post: AggregatedPostData) => void) { switch (notification.type) { case 'started-following': return ; - case 'rated-post': return ; - case 'rated-reaction': return ; + case 'rated-post': return ; + case 'rated-reaction': return ; case 'added-reaction': return ; } } diff --git a/src/webui/components/notification/PanelList.tsx b/src/webui/components/notification/PanelList.tsx index d58214b8..7ecfe7d2 100644 --- a/src/webui/components/notification/PanelList.tsx +++ b/src/webui/components/notification/PanelList.tsx @@ -1,19 +1,19 @@ -import type { AggregatedData as NotificationView } from '^/domain/notification/aggregate/types'; -import type { AggregatedData as PostView } from '^/domain/post/aggregate/types'; -import type { AggregatedData as ReactionView } from '^/domain/reaction/aggregate/types'; -import type { AggregatedData as RelationView } from '^/domain/relation/aggregate/types'; +import type { AggregatedData as AggregatedNotificationData } from '^/domain/notification/aggregate'; +import type { AggregatedData as AggregatedPostData } from '^/domain/post/aggregate'; +import type { AggregatedData as AggregatedReactionData } from '^/domain/reaction/aggregate'; +import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate'; import { Column } from '^/webui/designsystem'; import Panel from './Panel'; type Props = { - readonly notifications: NotificationView[]; - readonly onFollowClick: (relation: RelationView) => Promise; - readonly onCreatorClick: (relation: RelationView) => void; - readonly onReactionClick: (reaction: ReactionView) => void; - readonly onPostClick: (post: PostView) => void; + readonly notifications: AggregatedNotificationData[]; + readonly onFollowClick: (relation: AggregatedRelationData) => Promise; + readonly onCreatorClick: (relation: AggregatedRelationData) => void; + readonly onReactionClick: (reaction: AggregatedReactionData) => void; + readonly onPostClick: (post: AggregatedPostData) => void; }; export default function Component({ notifications, onFollowClick, onCreatorClick, onReactionClick, onPostClick }: Props) diff --git a/src/webui/components/notification/elementary/AddedReaction.tsx b/src/webui/components/notification/elementary/AddedReaction.tsx index 45c3ad5c..4a1f5138 100644 --- a/src/webui/components/notification/elementary/AddedReaction.tsx +++ b/src/webui/components/notification/elementary/AddedReaction.tsx @@ -1,18 +1,18 @@ -import type { AggregatedData as NotificationView } from '^/domain/notification/aggregate/types'; -import type { AggregatedData as ReactionView } from '^/domain/reaction/aggregate/types'; +import type { AggregatedData as AggregatedNotificationData } from '^/domain/notification/aggregate'; +import type { AggregatedData as AggregatedReactionData } from '^/domain/reaction/aggregate'; import { ClickArea, Image, Row, Text } from '^/webui/designsystem'; type Props = { - readonly notification: NotificationView; - readonly onReactionClick: (reaction: ReactionView) => void; + readonly notification: AggregatedNotificationData; + readonly onReactionClick: (reaction: AggregatedReactionData) => void; }; export default function Component({ notification, onReactionClick }: Props) { return - onReactionClick(notification.reaction as ReactionView)}> + onReactionClick(notification.reaction as AggregatedReactionData)}> ; diff --git a/src/webui/components/notification/elementary/RatedComicReaction.tsx b/src/webui/components/notification/elementary/RatedComicReaction.tsx index d9a0e3b9..acb8acbf 100644 --- a/src/webui/components/notification/elementary/RatedComicReaction.tsx +++ b/src/webui/components/notification/elementary/RatedComicReaction.tsx @@ -1,11 +1,11 @@ import { ClickArea, Image, Row, Text } from '^/webui/designsystem'; -import type { AggregatedData as ReactionView } from '^/domain/reaction/aggregate/types'; +import type { AggregatedData as AggregatedReactionData } from '^/domain/reaction/aggregate'; type Props = { - readonly reaction: ReactionView; - readonly onReactionClick: (reaction: ReactionView) => void; + readonly reaction: AggregatedReactionData; + readonly onReactionClick: (reaction: AggregatedReactionData) => void; }; export default function Component({ reaction, onReactionClick }: Props) diff --git a/src/webui/components/notification/elementary/RatedCommentReaction.tsx b/src/webui/components/notification/elementary/RatedCommentReaction.tsx index 818ad109..f44c9b5f 100644 --- a/src/webui/components/notification/elementary/RatedCommentReaction.tsx +++ b/src/webui/components/notification/elementary/RatedCommentReaction.tsx @@ -1,11 +1,11 @@ import { Border, ClickArea, Column, Text } from '^/webui/designsystem'; -import type { AggregatedData as ReactionView } from '^/domain/reaction/aggregate/types'; +import type { AggregatedData as AggregatedReactionData } from '^/domain/reaction/aggregate'; type Props = { - readonly reaction: ReactionView; - readonly onReactionClick: (reaction: ReactionView) => void; + readonly reaction: AggregatedReactionData; + readonly onReactionClick: (reaction: AggregatedReactionData) => void; }; export default function Component({ reaction, onReactionClick }: Props) diff --git a/src/webui/components/notification/elementary/RatedPost.tsx b/src/webui/components/notification/elementary/RatedPost.tsx index 77f14b3e..a292ee31 100644 --- a/src/webui/components/notification/elementary/RatedPost.tsx +++ b/src/webui/components/notification/elementary/RatedPost.tsx @@ -1,11 +1,11 @@ import { ClickArea, Image, Row, Text } from '^/webui/designsystem'; -import type { AggregatedData as PostView } from '^/domain/post/aggregate/types'; +import type { AggregatedData as AggregatedPostData } from '^/domain/post/aggregate'; type Props = { - readonly post: PostView; - readonly onPostClick: (post: PostView) => void; + readonly post: AggregatedPostData; + readonly onPostClick: (post: AggregatedPostData) => void; }; export default function Component({ post, onPostClick }: Props) diff --git a/src/webui/components/notification/elementary/RatedReaction.tsx b/src/webui/components/notification/elementary/RatedReaction.tsx index 9dfb4d9d..cf1c7d15 100644 --- a/src/webui/components/notification/elementary/RatedReaction.tsx +++ b/src/webui/components/notification/elementary/RatedReaction.tsx @@ -1,11 +1,11 @@ -import { AggregatedData as ReactionView } from '^/domain/reaction/aggregate/types'; +import { AggregatedData as AggregatedReactionData } from '^/domain/reaction/aggregate'; import RatedComicReaction from '../elementary/RatedComicReaction'; import RatedCommentReaction from '../elementary/RatedCommentReaction'; type Props = { - readonly reaction: ReactionView; - readonly onReactionClick: (reaction: ReactionView) => void; + readonly reaction: AggregatedReactionData; + readonly onReactionClick: (reaction: AggregatedReactionData) => void; }; export default function Component({ reaction, onReactionClick }: Props) diff --git a/src/webui/components/post/DetailsPanel.tsx b/src/webui/components/post/DetailsPanel.tsx index 253985c4..8af588f8 100644 --- a/src/webui/components/post/DetailsPanel.tsx +++ b/src/webui/components/post/DetailsPanel.tsx @@ -1,6 +1,6 @@ -import type { AggregatedData as PostView } from '^/domain/post/aggregate/types'; -import type { AggregatedData as RelationView } from '^/domain/relation/aggregate/types'; +import type { AggregatedData as AggregatedPostData } from '^/domain/post/aggregate'; +import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate'; import { Column, Panel, Row } from '^/webui/designsystem'; @@ -10,11 +10,11 @@ import TimeElapsed from '../relation/TimeElapsed'; import DeleteButton from './DeleteButton'; type Props = { - readonly post: PostView; - readonly onFollowClick: (relation: RelationView) => Promise; - readonly onCreatorClick: (relation: RelationView) => void; - readonly onRatingClick: (post: PostView) => Promise; - readonly onDeleteClick: (post: PostView) => Promise; + readonly post: AggregatedPostData; + readonly onFollowClick: (relation: AggregatedRelationData) => Promise; + readonly onCreatorClick: (relation: AggregatedRelationData) => void; + readonly onRatingClick: (post: AggregatedPostData) => Promise; + readonly onDeleteClick: (post: AggregatedPostData) => Promise; }; export default function Component({ post, onFollowClick, onCreatorClick, onRatingClick, onDeleteClick }: Props) diff --git a/src/webui/components/post/LargePanel.tsx b/src/webui/components/post/LargePanel.tsx index 064b05c5..689b521c 100644 --- a/src/webui/components/post/LargePanel.tsx +++ b/src/webui/components/post/LargePanel.tsx @@ -1,6 +1,6 @@ -import type { AggregatedData as PostView } from '^/domain/post/aggregate/types'; -import type { AggregatedData as RelationView } from '^/domain/relation/aggregate/types'; +import type { AggregatedData as AggregatedPostData } from '^/domain/post/aggregate'; +import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate'; import { ClickArea, Column, Panel } from '^/webui/designsystem'; @@ -9,12 +9,12 @@ import TimeElapsed from '../relation/TimeElapsed'; import EngagementsRow from './elementary/EngagementRow'; type Props = { - readonly post: PostView; - readonly onFollowClick: (relation: RelationView) => Promise; - readonly onCreatorClick: (relation: RelationView) => void; - readonly onComicClick: (post: PostView) => void; - readonly onRatingClick: (post: PostView) => Promise; - readonly onReactionClick: (post: PostView) => void; + readonly post: AggregatedPostData; + readonly onFollowClick: (relation: AggregatedRelationData) => Promise; + readonly onCreatorClick: (relation: AggregatedRelationData) => void; + readonly onComicClick: (post: AggregatedPostData) => void; + readonly onRatingClick: (post: AggregatedPostData) => Promise; + readonly onReactionClick: (post: AggregatedPostData) => void; }; export default function Component({ post, onFollowClick, onCreatorClick, onComicClick, onRatingClick, onReactionClick }: Props) diff --git a/src/webui/components/post/PanelGrid.tsx b/src/webui/components/post/PanelGrid.tsx index f80d6340..2954e7d4 100644 --- a/src/webui/components/post/PanelGrid.tsx +++ b/src/webui/components/post/PanelGrid.tsx @@ -1,15 +1,15 @@ -import type { AggregatedData as PostView } from '^/domain/post/aggregate/types'; +import type { AggregatedData as AggregatedPostData } from '^/domain/post/aggregate'; import { Grid } from '^/webui/designsystem'; import SmallPanel from './SmallPanel'; type Props = { - readonly posts: PostView[]; - readonly onComicClick: (post: PostView) => void; - readonly onRatingClick: (post: PostView) => Promise; - readonly onReactionClick: (post: PostView) => void; + readonly posts: AggregatedPostData[]; + readonly onComicClick: (post: AggregatedPostData) => void; + readonly onRatingClick: (post: AggregatedPostData) => Promise; + readonly onReactionClick: (post: AggregatedPostData) => void; }; export default function Component({ posts, onComicClick, onRatingClick, onReactionClick }: Props) diff --git a/src/webui/components/post/PanelList.tsx b/src/webui/components/post/PanelList.tsx index 758f90b3..12e215ea 100644 --- a/src/webui/components/post/PanelList.tsx +++ b/src/webui/components/post/PanelList.tsx @@ -1,18 +1,18 @@ -import type { AggregatedData as PostView } from '^/domain/post/aggregate/types'; -import type { AggregatedData as RelationView } from '^/domain/relation/aggregate/types'; +import type { AggregatedData as AggregatedPostData } from '^/domain/post/aggregate'; +import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate'; import { Column } from '^/webui/designsystem'; import LargePanel from './LargePanel'; type Props = { - readonly posts: PostView[]; - readonly onFollowClick: (relation: RelationView) => Promise; - readonly onCreatorClick: (relation: RelationView) => void; - readonly onComicClick: (post: PostView) => void; - readonly onRatingClick: (post: PostView) => Promise; - readonly onReactionClick: (post: PostView) => void; + readonly posts: AggregatedPostData[]; + readonly onFollowClick: (relation: AggregatedRelationData) => Promise; + readonly onCreatorClick: (relation: AggregatedRelationData) => void; + readonly onComicClick: (post: AggregatedPostData) => void; + readonly onRatingClick: (post: AggregatedPostData) => Promise; + readonly onReactionClick: (post: AggregatedPostData) => void; }; export default function Component({ posts, onFollowClick, onCreatorClick, onComicClick, onRatingClick, onReactionClick }: Props) diff --git a/src/webui/components/post/SmallPanel.tsx b/src/webui/components/post/SmallPanel.tsx index 57c78081..5f3a0c48 100644 --- a/src/webui/components/post/SmallPanel.tsx +++ b/src/webui/components/post/SmallPanel.tsx @@ -1,5 +1,5 @@ -import type { AggregatedData as PostView } from '^/domain/post/aggregate/types'; +import type { AggregatedData as AggregatedPostData } from '^/domain/post/aggregate'; import { ClickArea, Column, Panel, Row } from '^/webui/designsystem'; @@ -8,7 +8,7 @@ import TimeElapsed from '../common/TimeElapsed'; import EngagementsRow from './elementary/EngagementRow'; type Props = { - readonly post: PostView; + readonly post: AggregatedPostData; readonly onComicClick: () => void; readonly onRatingClick: () => Promise; readonly onReactionClick: () => void; diff --git a/src/webui/components/reaction/LargePanel.tsx b/src/webui/components/reaction/LargePanel.tsx index 1ca6c107..bff7e6bf 100644 --- a/src/webui/components/reaction/LargePanel.tsx +++ b/src/webui/components/reaction/LargePanel.tsx @@ -1,6 +1,6 @@ -import type { AggregatedData as ReactionView } from '^/domain/reaction/aggregate/types'; -import type { AggregatedData as RelationView } from '^/domain/relation/aggregate/types'; +import type { AggregatedData as AggregatedReactionData } from '^/domain/reaction/aggregate'; +import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate'; import Image from '^/webui/components/comic/Image'; import { Column, Panel, Row } from '^/webui/designsystem'; @@ -11,11 +11,11 @@ import TimeElapsed from '../relation/TimeElapsed'; import DeleteButton from './DeleteButton'; type Props = { - readonly reaction: ReactionView; - readonly onFollowClick: (relation: RelationView) => Promise; - readonly onCreatorClick: (relation: RelationView) => void; - readonly onRatingClick: (reaction: ReactionView) => Promise; - readonly onDeleteClick: (relation: ReactionView) => Promise; + readonly reaction: AggregatedReactionData; + readonly onFollowClick: (relation: AggregatedRelationData) => Promise; + readonly onCreatorClick: (relation: AggregatedRelationData) => void; + readonly onRatingClick: (reaction: AggregatedReactionData) => Promise; + readonly onDeleteClick: (relation: AggregatedReactionData) => Promise; }; export default function Component({ reaction, onFollowClick, onCreatorClick, onRatingClick, onDeleteClick }: Props) diff --git a/src/webui/components/reaction/PanelList.tsx b/src/webui/components/reaction/PanelList.tsx index c97701a1..e6bf8c4b 100644 --- a/src/webui/components/reaction/PanelList.tsx +++ b/src/webui/components/reaction/PanelList.tsx @@ -1,17 +1,17 @@ -import type { AggregatedData as ReactionView } from '^/domain/reaction/aggregate/types'; -import type { AggregatedData as RelationView } from '^/domain/relation/aggregate/types'; +import type { AggregatedData as AggregatedReactionData } from '^/domain/reaction/aggregate'; +import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate'; import { Column } from '^/webui/designsystem'; import LargePanel from './LargePanel'; type Props = { - readonly reactions: ReactionView[]; - readonly onFollowClick: (relation: RelationView) => Promise; - readonly onCreatorClick: (relation: RelationView) => void; - readonly onRatingClick: (reaction: ReactionView) => Promise; - readonly onDeleteClick: (reaction: ReactionView) => Promise; + readonly reactions: AggregatedReactionData[]; + readonly onFollowClick: (relation: AggregatedRelationData) => Promise; + readonly onCreatorClick: (relation: AggregatedRelationData) => void; + readonly onRatingClick: (reaction: AggregatedReactionData) => Promise; + readonly onDeleteClick: (reaction: AggregatedReactionData) => Promise; }; export default function Component({ reactions, onFollowClick, onCreatorClick, onRatingClick, onDeleteClick }: Props) diff --git a/src/webui/components/relation/Counters.tsx b/src/webui/components/relation/Counters.tsx index 627ffa88..053e0825 100644 --- a/src/webui/components/relation/Counters.tsx +++ b/src/webui/components/relation/Counters.tsx @@ -1,11 +1,11 @@ -import type { AggregatedData as RelationView } from '^/domain/relation/aggregate/types'; +import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate'; import CreatorCounters from '../creator/Counters'; import FollowRow from './elementary/FollowRow'; type Props = { - readonly relation: RelationView; + readonly relation: AggregatedRelationData; readonly onFollowClick: () => Promise; readonly onEditClick?: () => void; readonly onCreatorClick: () => void; diff --git a/src/webui/components/relation/Panel.tsx b/src/webui/components/relation/Panel.tsx index 2359c0a8..f7a12f05 100644 --- a/src/webui/components/relation/Panel.tsx +++ b/src/webui/components/relation/Panel.tsx @@ -1,12 +1,12 @@ -import type { AggregatedData as RelationView } from '^/domain/relation/aggregate/types'; +import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate'; import { Panel } from '^/webui/designsystem'; import Counters from './Counters'; type Props = { - readonly relation: RelationView; + readonly relation: AggregatedRelationData; readonly onFollowClick: () => Promise; readonly onEditClick?: () => void; readonly onCreatorClick: () => void; diff --git a/src/webui/components/relation/PanelList.tsx b/src/webui/components/relation/PanelList.tsx index 268b8128..b7a3881c 100644 --- a/src/webui/components/relation/PanelList.tsx +++ b/src/webui/components/relation/PanelList.tsx @@ -1,15 +1,15 @@ -import type { AggregatedData as RelationView } from '^/domain/relation/aggregate/types'; +import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate'; import { Column } from '^/webui/designsystem'; import Panel from './Panel'; type Props = { - readonly relations: RelationView[]; - readonly onFollowClick: (relation: RelationView) => Promise; - readonly onEditClick?: (relation: RelationView) => void; - readonly onCreatorClick: (relation: RelationView) => void; + readonly relations: AggregatedRelationData[]; + readonly onFollowClick: (relation: AggregatedRelationData) => Promise; + readonly onEditClick?: (relation: AggregatedRelationData) => void; + readonly onCreatorClick: (relation: AggregatedRelationData) => void; }; export default function Component({ relations, onFollowClick, onEditClick, onCreatorClick }: Props) diff --git a/src/webui/components/relation/Profile.tsx b/src/webui/components/relation/Profile.tsx index 67e87666..86533398 100644 --- a/src/webui/components/relation/Profile.tsx +++ b/src/webui/components/relation/Profile.tsx @@ -1,12 +1,12 @@ -import type { AggregatedData as RelationView } from '^/domain/relation/aggregate/types'; +import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate'; import CreatorProfile from '../creator/Profile'; import FollowRow from './elementary/FollowRow'; type Props = { - readonly relation: RelationView; - readonly onFollowClick: (relation: RelationView) => Promise; + readonly relation: AggregatedRelationData; + readonly onFollowClick: (relation: AggregatedRelationData) => Promise; readonly onEditClick?: () => void; }; diff --git a/src/webui/components/relation/TimeElapsed.tsx b/src/webui/components/relation/TimeElapsed.tsx index 4ede960a..2b8c9f1c 100644 --- a/src/webui/components/relation/TimeElapsed.tsx +++ b/src/webui/components/relation/TimeElapsed.tsx @@ -1,15 +1,15 @@ -import type { AggregatedData as RelationView } from '^/domain/relation/aggregate/types'; +import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate'; import CreatorTimeElapsed from '../creator/TimeElapsed'; import FollowRow from './elementary/FollowRow'; type Props = { - readonly relation: RelationView; + readonly relation: AggregatedRelationData; readonly date: string; - readonly onFollowClick: (relation: RelationView) => Promise; - readonly onEditClick?: (relation: RelationView) => void; - readonly onCreatorClick: (relation: RelationView) => void; + readonly onFollowClick: (relation: AggregatedRelationData) => Promise; + readonly onEditClick?: (relation: AggregatedRelationData) => void; + readonly onCreatorClick: (relation: AggregatedRelationData) => void; }; export default function Component({ relation, date, onFollowClick, onEditClick, onCreatorClick }: Props) diff --git a/src/webui/contexts/AppContext.tsx b/src/webui/contexts/AppContext.tsx index 8c403608..968069fe 100644 --- a/src/webui/contexts/AppContext.tsx +++ b/src/webui/contexts/AppContext.tsx @@ -1,13 +1,13 @@ import { ReactNode, createContext, useContext } from 'react'; -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; import useAppContextValue from './hooks/useAppContextValue'; type Context = { - identity: CreatorView | undefined; - setIdentity: (requester: CreatorView | undefined) => void; + identity: AggregatedCreatorData | undefined; + setIdentity: (requester: AggregatedCreatorData | undefined) => void; modalContent: ReactNode | undefined; modalOpen: boolean; showModal: (content: ReactNode | undefined) => void; @@ -20,7 +20,7 @@ export const useAppContext = () => useContext(AppContext); type Props = { readonly values?: { - identity: CreatorView | undefined; + identity: AggregatedCreatorData | undefined; }; readonly children: ReactNode; }; diff --git a/src/webui/contexts/hooks/useAppContextValue.ts b/src/webui/contexts/hooks/useAppContextValue.ts index fe9f4e1f..ff75ea1f 100644 --- a/src/webui/contexts/hooks/useAppContextValue.ts +++ b/src/webui/contexts/hooks/useAppContextValue.ts @@ -1,13 +1,13 @@ import { useMemo, useState } from 'react'; -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; import { useModal } from '^/webui/hooks/useModal'; -export default function useAppContextValue(initialIdentity: CreatorView | undefined) +export default function useAppContextValue(initialIdentity: AggregatedCreatorData | undefined) { - const [identity, setIdentity] = useState(initialIdentity); + const [identity, setIdentity] = useState(initialIdentity); const [modalContent, modalOpen, showModal, closeModal] = useModal(); return useMemo(() => ( diff --git a/src/webui/features/CreateReaction.tsx b/src/webui/features/CreateReaction.tsx index 57197d16..f62f78ac 100644 --- a/src/webui/features/CreateReaction.tsx +++ b/src/webui/features/CreateReaction.tsx @@ -1,6 +1,6 @@ -import type { AggregatedData as PostView } from '^/domain/post/aggregate/types'; -import type { AggregatedData as ReactionView } from '^/domain/reaction/aggregate/types'; +import type { AggregatedData as AggregatedPostData } from '^/domain/post/aggregate'; +import type { AggregatedData as AggregatedReactionData } from '^/domain/reaction/aggregate'; import { ComicEditor, CommentForm } from '^/webui/components'; import { Ruler, Tab, Tabs } from '^/webui/designsystem'; @@ -9,8 +9,8 @@ import useCreateComicReaction from './hooks/useCreateComicReaction'; import useCreateCommentReaction from './hooks/useCreateCommentReaction'; type Props = { - readonly post: PostView; - readonly handleDone: (reaction?: ReactionView) => void; + readonly post: AggregatedPostData; + readonly handleDone: (reaction?: AggregatedReactionData) => void; }; const MESSAGE_MAX_LENGTH = 1000; diff --git a/src/webui/features/CreatorComics.tsx b/src/webui/features/CreatorComics.tsx index efe9d83a..e27bff24 100644 --- a/src/webui/features/CreatorComics.tsx +++ b/src/webui/features/CreatorComics.tsx @@ -1,5 +1,5 @@ -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; import { PostPanelGrid, PullToRefresh, ResultSet, ScrollLoader } from '^/webui/components'; import { Column } from '^/webui/designsystem'; @@ -9,7 +9,7 @@ import useTogglePostRating from './hooks/useTogglePostRating'; import useViewPostDetails from './hooks/useViewPostDetails'; type Props = { - readonly creator: CreatorView; + readonly creator: AggregatedCreatorData; }; const SCROLL_THRESHOLD = 0.9; diff --git a/src/webui/features/CreatorFollowers.tsx b/src/webui/features/CreatorFollowers.tsx index 5e40189e..4797302e 100644 --- a/src/webui/features/CreatorFollowers.tsx +++ b/src/webui/features/CreatorFollowers.tsx @@ -1,5 +1,5 @@ -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; import { OrderAndSearchRow, PullToRefresh, RelationPanelList, ResultSet, ScrollLoader } from '^/webui/components'; import { Column } from '^/webui/designsystem'; @@ -10,7 +10,7 @@ import useReorderList from './hooks/useReorderList'; import useViewProfile from './hooks/useViewProfile'; type Props = { - readonly creator: CreatorView; + readonly creator: AggregatedCreatorData; }; const SCROLL_THRESHOLD = 0.9; @@ -24,7 +24,7 @@ export default function Feature({ creator }: Props) const [relations, isLoading, isFinished, getMoreRelations, , refresh] = useCreatorFollowers(creator); return - {}} /> + { }} /> diff --git a/src/webui/features/CreatorFollowing.tsx b/src/webui/features/CreatorFollowing.tsx index c8f1421f..bf9ab602 100644 --- a/src/webui/features/CreatorFollowing.tsx +++ b/src/webui/features/CreatorFollowing.tsx @@ -1,5 +1,5 @@ -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; import { OrderAndSearchRow, PullToRefresh, RelationPanelList, ResultSet, ScrollLoader } from '^/webui/components'; import { Column } from '^/webui/designsystem'; @@ -10,7 +10,7 @@ import useReorderList from './hooks/useReorderList'; import useViewProfile from './hooks/useViewProfile'; type Props = { - readonly creator: CreatorView; + readonly creator: AggregatedCreatorData; }; const SCROLL_THRESHOLD = 0.9; @@ -24,7 +24,7 @@ export default function Feature({ creator }: Props) const [relations, isLoading, isFinished, getMoreRelations, , refresh] = useCreatorFollowing(creator); return - {}} /> + { }} /> diff --git a/src/webui/features/EditProfile.tsx b/src/webui/features/EditProfile.tsx index a963b81e..e77f855d 100644 --- a/src/webui/features/EditProfile.tsx +++ b/src/webui/features/EditProfile.tsx @@ -1,5 +1,5 @@ -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; import { CreatorFullNameForm, CreatorNicknameForm, LoadingContainer } from '^/webui/components'; import CreatorProfile from '^/webui/components/creator/Profile'; @@ -17,10 +17,10 @@ export default function Feature() return - + - - + + ; } diff --git a/src/webui/features/ExploreCreators.tsx b/src/webui/features/ExploreCreators.tsx index 11c69652..f502d499 100644 --- a/src/webui/features/ExploreCreators.tsx +++ b/src/webui/features/ExploreCreators.tsx @@ -1,5 +1,5 @@ -import type { AggregatedData as RelationView } from '^/domain/relation/aggregate/types'; +import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate'; import { OrderAndSearchRow, PullToRefresh, RelationPanelList, ResultSet, ScrollLoader } from '^/webui/components'; import { Column } from '^/webui/designsystem'; @@ -20,12 +20,12 @@ export default function Feature() const [relations, isLoading, isFinished, getMoreRelations, , refresh] = useExploreCreators(); return - {}} /> + { }} /> diff --git a/src/webui/features/Notifications.tsx b/src/webui/features/Notifications.tsx index 6e65aa8b..f58e8f4a 100644 --- a/src/webui/features/Notifications.tsx +++ b/src/webui/features/Notifications.tsx @@ -1,5 +1,5 @@ -import type { AggregatedData as NotificationView } from '^/domain/notification/aggregate/types'; +import type { AggregatedData as AggregatedNotificationData } from '^/domain/notification/aggregate'; import { NotificationPanelList, PullToRefresh, ResultSet, ScrollLoader } from '^/webui/components'; import { Column } from '^/webui/designsystem'; @@ -26,7 +26,7 @@ export default function Feature() + const deletePost = useCallback(async (post: AggregatedPostData) => { const panel = - + ; } diff --git a/src/webui/features/Profile.tsx b/src/webui/features/Profile.tsx index 1a61502d..3d9b4ecb 100644 --- a/src/webui/features/Profile.tsx +++ b/src/webui/features/Profile.tsx @@ -1,6 +1,6 @@ -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; -import type { AggregatedData as RelationView } from '^/domain/relation/aggregate/types'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; +import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate'; import { LoadingContainer, RelationProfile } from '^/webui/components'; import { Column, Ruler, Tab, Tabs } from '^/webui/designsystem'; @@ -29,19 +29,19 @@ export default function Feature() return - + - + - + diff --git a/src/webui/features/ReactionDetails.tsx b/src/webui/features/ReactionDetails.tsx index 3efd23df..d6e51a71 100644 --- a/src/webui/features/ReactionDetails.tsx +++ b/src/webui/features/ReactionDetails.tsx @@ -1,8 +1,8 @@ import { useCallback } from 'react'; -import type { AggregatedData as PostView } from '^/domain/post/aggregate/types'; -import type { AggregatedData as ReactionView } from '^/domain/reaction/aggregate/types'; +import type { AggregatedData as AggregatedPostData } from '^/domain/post/aggregate'; +import type { AggregatedData as AggregatedReactionData } from '^/domain/reaction/aggregate'; import { ConfirmationPanel, LoadingContainer, PostDetailsPanel, ReactionLargePanel, SingleReactionRow } from '../components'; import { useAppContext } from '../contexts'; @@ -33,7 +33,7 @@ export default function Feature() const [post] = usePost(); const [reaction] = useReaction(); - const deletePost = useCallback(async (post: PostView) => + const deletePost = useCallback(async (post: AggregatedPostData) => { const panel = + const deleteReaction = useCallback(async (reaction: AggregatedReactionData) => { const panel = - viewPostDetails(post as PostView)} /> + viewPostDetails(post as AggregatedPostData)} /> + const addReaction = useCallback((reaction?: AggregatedReactionData) => { if (reaction === undefined) return; - const result = [reaction, ...reactions as ReactionView[]]; + const result = [reaction, ...reactions as AggregatedReactionData[]]; setReactions(result); @@ -48,14 +48,14 @@ export default function Feature({ post }: Props) { const content = { closeModal(); addReaction(reaction); }} + handleDone={(reaction?: AggregatedReactionData) => { closeModal(); addReaction(reaction); }} />; showModal(content); }, [addReaction, closeModal, post, showModal]); - const deleteReaction = useCallback(async (reaction: ReactionView) => + const deleteReaction = useCallback(async (reaction: AggregatedReactionData) => { const panel = void) +export default function useCreateComicReaction(post: AggregatedPostData, handleDone: (reaction?: AggregatedReactionData) => void) { return useCallback(async (imageData: string) => { diff --git a/src/webui/features/hooks/useCreateCommentReaction.ts b/src/webui/features/hooks/useCreateCommentReaction.ts index a0996709..b7e5a5b3 100644 --- a/src/webui/features/hooks/useCreateCommentReaction.ts +++ b/src/webui/features/hooks/useCreateCommentReaction.ts @@ -1,13 +1,13 @@ import { useCallback } from 'react'; -import requester from '^/domain/authentication/requester'; -import type { AggregatedData as PostView } from '^/domain/post/aggregate/types'; -import type { AggregatedData as ReactionView } from '^/domain/reaction/aggregate/types'; -import createCommentReaction from '^/domain/reaction/createComment/feature'; -import getReaction from '^/domain/reaction/getByIdAggregated/feature'; +import { requester } from '^/domain/authentication'; +import type { AggregatedData as AggregatedPostData } from '^/domain/post/aggregate'; +import type { AggregatedData as AggregatedReactionData } from '^/domain/reaction/aggregate'; +import createCommentReaction from '^/domain/reaction/createWithComment'; +import getReaction from '^/domain/reaction/getByIdAggregated'; -export default function useCreateCommentReaction(post: PostView, handleDone: (reaction?: ReactionView) => void) +export default function useCreateCommentReaction(post: AggregatedPostData, handleDone: (reaction?: AggregatedReactionData) => void) { return useCallback(async (imageData: string) => { diff --git a/src/webui/features/hooks/useCreator.ts b/src/webui/features/hooks/useCreator.ts index 37dd8f39..5d13bb66 100644 --- a/src/webui/features/hooks/useCreator.ts +++ b/src/webui/features/hooks/useCreator.ts @@ -2,9 +2,9 @@ import { useCallback } from 'react'; import { useParams } from 'react-router-dom'; -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; -import getCreator from '^/domain/creator/getByNicknameAggregated/feature'; -import getRelation from '^/domain/relation/getAggregated/feature'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; +import getCreator from '^/domain/creator/getByNicknameAggregated'; +import getRelation from '^/domain/relation/getAggregated'; import { useAppContext } from '^/webui/contexts'; import { useLoadData } from '^/webui/hooks'; @@ -21,7 +21,7 @@ export default function useCreator() return undefined; } - const creator: CreatorView = await getCreator(nickname); + const creator: AggregatedCreatorData = await getCreator(nickname); return getRelation(identity.id, creator.id); diff --git a/src/webui/features/hooks/useCreatorFollowers.ts b/src/webui/features/hooks/useCreatorFollowers.ts index 874b3b42..563c2935 100644 --- a/src/webui/features/hooks/useCreatorFollowers.ts +++ b/src/webui/features/hooks/useCreatorFollowers.ts @@ -1,13 +1,13 @@ import { useCallback } from 'react'; -import requester from '^/domain/authentication/requester'; -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; -import getFollowers from '^/domain/relation/getFollowersAggregated/feature'; +import { requester } from '^/domain/authentication'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; +import getFollowers from '^/domain/relation/getFollowersAggregated'; import { usePagination } from '^/webui/hooks'; -export default function useCreatorFollowers(creator: CreatorView) +export default function useCreatorFollowers(creator: AggregatedCreatorData) { const limit = 12; diff --git a/src/webui/features/hooks/useCreatorFollowing.ts b/src/webui/features/hooks/useCreatorFollowing.ts index eb5d6d7f..0aaf924f 100644 --- a/src/webui/features/hooks/useCreatorFollowing.ts +++ b/src/webui/features/hooks/useCreatorFollowing.ts @@ -1,13 +1,13 @@ import { useCallback } from 'react'; -import requester from '^/domain/authentication/requester'; -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; -import getFollowing from '^/domain/relation/getFollowingAggregated/feature'; +import { requester } from '^/domain/authentication'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; +import getFollowing from '^/domain/relation/getFollowingAggregated'; import { usePagination } from '^/webui/hooks'; -export default function useCreatorFollowing(creator: CreatorView) +export default function useCreatorFollowing(creator: AggregatedCreatorData) { const limit = 12; diff --git a/src/webui/features/hooks/useCreatorPosts.ts b/src/webui/features/hooks/useCreatorPosts.ts index ff696926..4fe60905 100644 --- a/src/webui/features/hooks/useCreatorPosts.ts +++ b/src/webui/features/hooks/useCreatorPosts.ts @@ -1,13 +1,13 @@ import { useCallback } from 'react'; -import requester from '^/domain/authentication/requester'; -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; -import getCreatorPosts from '^/domain/post/getByCreatorAggregated/feature'; +import { requester } from '^/domain/authentication'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; +import getCreatorPosts from '^/domain/post/getByCreatorAggregated'; import { usePagination } from '^/webui/hooks'; -export default function useCreatorPosts(creator: CreatorView) +export default function useCreatorPosts(creator: AggregatedCreatorData) { const limit = 16; diff --git a/src/webui/features/hooks/useEstablishRelation.ts b/src/webui/features/hooks/useEstablishRelation.ts index b3111b15..b72fc8ee 100644 --- a/src/webui/features/hooks/useEstablishRelation.ts +++ b/src/webui/features/hooks/useEstablishRelation.ts @@ -1,13 +1,13 @@ import { useCallback } from 'react'; -import requester from '^/domain/authentication/requester'; -import type { AggregatedData as RelationView } from '^/domain/relation/aggregate/types'; -import establishRelation from '^/domain/relation/establish/feature'; +import { requester } from '^/domain/authentication'; +import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate'; +import establishRelation from '^/domain/relation/establish'; export default function useEstablishRelation() { - return useCallback((relation: RelationView) => + return useCallback((relation: AggregatedRelationData) => { return establishRelation(requester, relation.following.id); diff --git a/src/webui/features/hooks/useExploreCreators.ts b/src/webui/features/hooks/useExploreCreators.ts index 0b14ae6e..b104639b 100644 --- a/src/webui/features/hooks/useExploreCreators.ts +++ b/src/webui/features/hooks/useExploreCreators.ts @@ -1,8 +1,8 @@ import { useCallback } from 'react'; -import requester from '^/domain/authentication/requester'; -import exploreRelations from '^/domain/relation/exploreAggregated/feature'; +import { requester } from '^/domain/authentication'; +import exploreRelations from '^/domain/relation/exploreAggregated'; import { usePagination } from '^/webui/hooks'; diff --git a/src/webui/features/hooks/useExplorePosts.ts b/src/webui/features/hooks/useExplorePosts.ts index 50be0294..3a25f126 100644 --- a/src/webui/features/hooks/useExplorePosts.ts +++ b/src/webui/features/hooks/useExplorePosts.ts @@ -1,8 +1,8 @@ import { useCallback } from 'react'; -import requester from '^/domain/authentication/requester'; -import explorePosts from '^/domain/post/exploreAggregated/feature'; +import { requester } from '^/domain/authentication'; +import explorePosts from '^/domain/post/exploreAggregated'; import { usePagination } from '^/webui/hooks'; diff --git a/src/webui/features/hooks/useIdentify.ts b/src/webui/features/hooks/useIdentify.ts index bdc494cd..42e2956b 100644 --- a/src/webui/features/hooks/useIdentify.ts +++ b/src/webui/features/hooks/useIdentify.ts @@ -2,9 +2,9 @@ import { useEffect } from 'react'; import { useNavigate } from 'react-router-dom'; -import requester from '^/domain/authentication/requester'; -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; -import getMe from '^/domain/creator/getMeAggregated/feature'; +import { requester } from '^/domain/authentication'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; +import getMe from '^/domain/creator/getMeAggregated'; import { useAppContext } from '^/webui/contexts'; @@ -15,7 +15,7 @@ export default function useIdentify() const identify = () => { - const setIdentity = (identity: CreatorView) => + const setIdentity = (identity: AggregatedCreatorData) => { const redirectLocation = window.sessionStorage.getItem('redirect'); diff --git a/src/webui/features/hooks/useLogin.ts b/src/webui/features/hooks/useLogin.ts index 677a439a..bcc5e360 100644 --- a/src/webui/features/hooks/useLogin.ts +++ b/src/webui/features/hooks/useLogin.ts @@ -1,7 +1,7 @@ import { useEffect } from 'react'; -import getLoginUrl from '^/domain/authentication/getLoginUrl/feature'; +import getLoginUrl from '^/domain/authentication/getLoginUrl'; const IGNORE_PATHS = ['/', '/login', '/identify']; diff --git a/src/webui/features/hooks/useLogout.ts b/src/webui/features/hooks/useLogout.ts index d938daa9..e8d54695 100644 --- a/src/webui/features/hooks/useLogout.ts +++ b/src/webui/features/hooks/useLogout.ts @@ -2,7 +2,7 @@ import { useCallback } from 'react'; import { useNavigate } from 'react-router-dom'; -import logout from '^/domain/authentication/logout/feature'; +import logout from '^/domain/authentication/logout'; import { useAppContext } from '^/webui/contexts'; diff --git a/src/webui/features/hooks/useNotifications.ts b/src/webui/features/hooks/useNotifications.ts index 0ad232c6..abc31b9b 100644 --- a/src/webui/features/hooks/useNotifications.ts +++ b/src/webui/features/hooks/useNotifications.ts @@ -1,8 +1,8 @@ import { useCallback } from 'react'; -import requester from '^/domain/authentication/requester'; -import getRecentNotifications from '^/domain/notification/getRecentAggregated/feature'; +import { requester } from '^/domain/authentication'; +import getRecentNotifications from '^/domain/notification/getRecentAggregated'; import { usePagination } from '^/webui/hooks'; diff --git a/src/webui/features/hooks/usePost.ts b/src/webui/features/hooks/usePost.ts index a17fed8d..a9f2cd7b 100644 --- a/src/webui/features/hooks/usePost.ts +++ b/src/webui/features/hooks/usePost.ts @@ -2,8 +2,8 @@ import { useCallback } from 'react'; import { useParams } from 'react-router-dom'; -import requester from '^/domain/authentication/requester'; -import get from '^/domain/post/getByIdAggregated/feature'; +import { requester } from '^/domain/authentication'; +import get from '^/domain/post/getByIdAggregated'; import { useLoadData } from '^/webui/hooks'; diff --git a/src/webui/features/hooks/usePostsAll.ts b/src/webui/features/hooks/usePostsAll.ts index 463f94de..62938060 100644 --- a/src/webui/features/hooks/usePostsAll.ts +++ b/src/webui/features/hooks/usePostsAll.ts @@ -1,7 +1,7 @@ import { useCallback } from 'react'; -import requester from '^/domain/authentication/requester'; +import { requester } from '^/domain/authentication'; import getPostsAll from '^/domain/post/getAllAggregated'; import { usePagination } from '^/webui/hooks'; diff --git a/src/webui/features/hooks/usePostsFollowing.ts b/src/webui/features/hooks/usePostsFollowing.ts index d6e9fbce..0d361b25 100644 --- a/src/webui/features/hooks/usePostsFollowing.ts +++ b/src/webui/features/hooks/usePostsFollowing.ts @@ -1,8 +1,8 @@ import { useCallback } from 'react'; -import requester from '^/domain/authentication/requester'; -import getPostsFollowing from '^/domain/post/getByFollowingAggregated/feature'; +import { requester } from '^/domain/authentication'; +import getPostsFollowing from '^/domain/post/getByFollowingAggregated'; import { usePagination } from '^/webui/hooks'; diff --git a/src/webui/features/hooks/useReaction.ts b/src/webui/features/hooks/useReaction.ts index 0971b222..8591f9f1 100644 --- a/src/webui/features/hooks/useReaction.ts +++ b/src/webui/features/hooks/useReaction.ts @@ -2,8 +2,8 @@ import { useCallback } from 'react'; import { useParams } from 'react-router-dom'; -import requester from '^/domain/authentication/requester'; -import get from '^/domain/reaction/getByIdAggregated/feature'; +import { requester } from '^/domain/authentication'; +import get from '^/domain/reaction/getByIdAggregated'; import { useLoadData } from '^/webui/hooks'; diff --git a/src/webui/features/hooks/useReactions.ts b/src/webui/features/hooks/useReactions.ts index 223f7afc..d6430c56 100644 --- a/src/webui/features/hooks/useReactions.ts +++ b/src/webui/features/hooks/useReactions.ts @@ -1,13 +1,13 @@ import { useCallback } from 'react'; -import requester from '^/domain/authentication/requester'; -import type { AggregatedData as PostView } from '^/domain/post/aggregate/types'; -import getReactionsByPost from '^/domain/reaction/getByPostAggregated/feature'; +import { requester } from '^/domain/authentication'; +import type { AggregatedData as AggregatedPostData } from '^/domain/post/aggregate'; +import getReactionsByPost from '^/domain/reaction/getByPostAggregated'; import { usePagination } from '^/webui/hooks'; -export default function useReactions(post: PostView) +export default function useReactions(post: AggregatedPostData) { const limit = 15; diff --git a/src/webui/features/hooks/useRemovePost.ts b/src/webui/features/hooks/useRemovePost.ts index 849eea76..13398a8e 100644 --- a/src/webui/features/hooks/useRemovePost.ts +++ b/src/webui/features/hooks/useRemovePost.ts @@ -4,16 +4,16 @@ import { useNavigate } from 'react-router-dom'; import { useAppContext } from '^/webui/contexts'; -import requester from '^/domain/authentication/requester'; -import type { AggregatedData as PostView } from '^/domain/post/aggregate/types'; -import remove from '^/domain/post/remove/feature'; +import { requester } from '^/domain/authentication'; +import type { AggregatedData as AggregatedPostData } from '^/domain/post/aggregate'; +import remove from '^/domain/post/remove'; export default function useRemovePost() { const navigate = useNavigate(); const { identity } = useAppContext(); - return useCallback(async (post: PostView) => + return useCallback(async (post: AggregatedPostData) => { await remove(requester, post.id); diff --git a/src/webui/features/hooks/useRemoveReaction.ts b/src/webui/features/hooks/useRemoveReaction.ts index 411dbfde..3be8ea91 100644 --- a/src/webui/features/hooks/useRemoveReaction.ts +++ b/src/webui/features/hooks/useRemoveReaction.ts @@ -2,15 +2,15 @@ import { useCallback } from 'react'; import { useNavigate } from 'react-router-dom'; -import requester from '^/domain/authentication/requester'; -import type { AggregatedData as ReactionView } from '^/domain/reaction/aggregate/types'; -import remove from '^/domain/reaction/remove/feature'; +import { requester } from '^/domain/authentication'; +import type { AggregatedData as AggregatedReactionData } from '^/domain/reaction/aggregate'; +import remove from '^/domain/reaction/remove'; export default function useRemoveReaction() { const navigate = useNavigate(); - return useCallback(async (reaction: ReactionView) => + return useCallback(async (reaction: AggregatedReactionData) => { await remove(requester, reaction.id); navigate(`/post/${reaction.postId}`); diff --git a/src/webui/features/hooks/useRemoveReactionFromList.ts b/src/webui/features/hooks/useRemoveReactionFromList.ts index 9faa7cf3..e190723d 100644 --- a/src/webui/features/hooks/useRemoveReactionFromList.ts +++ b/src/webui/features/hooks/useRemoveReactionFromList.ts @@ -1,13 +1,13 @@ import { useCallback } from 'react'; -import requester from '^/domain/authentication/requester'; -import type { AggregatedData as ReactionView } from '^/domain/reaction/aggregate/types'; -import remove from '^/domain/reaction/remove/feature'; +import { requester } from '^/domain/authentication'; +import type { AggregatedData as AggregatedReactionData } from '^/domain/reaction/aggregate'; +import remove from '^/domain/reaction/remove'; -export default function useRemoveReaction(reactions: ReactionView[], setReactions: (reactions: ReactionView[]) => void) +export default function useRemoveReaction(reactions: AggregatedReactionData[], setReactions: (reactions: AggregatedReactionData[]) => void) { - return useCallback(async (reaction: ReactionView) => + return useCallback(async (reaction: AggregatedReactionData) => { const result = reactions.filter(item => item.id !== reaction.id); diff --git a/src/webui/features/hooks/useTogglePostRating.ts b/src/webui/features/hooks/useTogglePostRating.ts index 78b2d8cc..f597c7ea 100644 --- a/src/webui/features/hooks/useTogglePostRating.ts +++ b/src/webui/features/hooks/useTogglePostRating.ts @@ -1,13 +1,13 @@ import { useCallback } from 'react'; -import requester from '^/domain/authentication/requester'; -import type { AggregatedData as PostView } from '^/domain/post/aggregate/types'; -import toggleRating from '^/domain/post/toggleRating/feature'; +import { requester } from '^/domain/authentication'; +import type { AggregatedData as AggregatedPostData } from '^/domain/post/aggregate'; +import toggleRating from '^/domain/post/toggleRating'; export default function useTogglePostRating() { - return useCallback((post: PostView) => + return useCallback((post: AggregatedPostData) => { return toggleRating(requester, post.id); diff --git a/src/webui/features/hooks/useToggleReactionRating.ts b/src/webui/features/hooks/useToggleReactionRating.ts index d934f8a0..dd0134dd 100644 --- a/src/webui/features/hooks/useToggleReactionRating.ts +++ b/src/webui/features/hooks/useToggleReactionRating.ts @@ -1,13 +1,13 @@ import { useCallback } from 'react'; -import requester from '^/domain/authentication/requester'; -import type { AggregatedData as ReactionView } from '^/domain/reaction/aggregate/types'; -import toggleRating from '^/domain/reaction/toggleRating/feature'; +import { requester } from '^/domain/authentication'; +import type { AggregatedData as AggregatedReactionData } from '^/domain/reaction/aggregate'; +import toggleRating from '^/domain/reaction/toggleRating'; export default function useToggleReactionRating() { - return useCallback((reaction: ReactionView) => + return useCallback((reaction: AggregatedReactionData) => { return toggleRating(requester, reaction.id); diff --git a/src/webui/features/hooks/useUpdateFullName.ts b/src/webui/features/hooks/useUpdateFullName.ts index 088c08d4..c47e2ab2 100644 --- a/src/webui/features/hooks/useUpdateFullName.ts +++ b/src/webui/features/hooks/useUpdateFullName.ts @@ -1,9 +1,9 @@ import { useCallback } from 'react'; -import requester from '^/domain/authentication/requester'; -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; -import updateFullName from '^/domain/creator/updateFullName/feature'; +import { requester } from '^/domain/authentication'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; +import updateFullName from '^/domain/creator/updateFullName'; import { useAppContext } from '^/webui/contexts'; @@ -15,7 +15,7 @@ export default function useUpdateFullName() { await updateFullName(requester, fullName); - setIdentity({ ...identity, fullName } as CreatorView); + setIdentity({ ...identity, fullName } as AggregatedCreatorData); }, [setIdentity, identity]); } diff --git a/src/webui/features/hooks/useUpdateNickname.ts b/src/webui/features/hooks/useUpdateNickname.ts index 79e61bfd..72e67f39 100644 --- a/src/webui/features/hooks/useUpdateNickname.ts +++ b/src/webui/features/hooks/useUpdateNickname.ts @@ -1,9 +1,10 @@ import { useCallback, useState } from 'react'; -import requester from '^/domain/authentication/requester'; -import type { AggregatedData as CreatorView } from '^/domain/creator/aggregate/types'; -import updateNickname from '^/domain/creator/updateNickname/feature'; +import { requester } from '^/domain/authentication'; +import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; +//import updateNickname, { NicknameAlreadyExists } from '^/domain/creator/updateNickname'; +import updateNickname from '^/domain/creator/updateNickname'; import NicknameAlreadyExists from '^/domain/creator/updateNickname/NicknameAlreadyExists'; import { useAppContext } from '^/webui/contexts'; @@ -19,7 +20,7 @@ export default function useUpdateNickname() { await updateNickname(requester, nickname); - setIdentity({ ...identity, nickname } as CreatorView); + setIdentity({ ...identity, nickname } as AggregatedCreatorData); setAlreadyInUse(false); } catch (error: unknown) diff --git a/src/webui/features/hooks/useViewPostDetails.ts b/src/webui/features/hooks/useViewPostDetails.ts index 79a32f17..af603c6f 100644 --- a/src/webui/features/hooks/useViewPostDetails.ts +++ b/src/webui/features/hooks/useViewPostDetails.ts @@ -2,13 +2,13 @@ import { useCallback } from 'react'; import { useNavigate } from 'react-router-dom'; -import type { AggregatedData as PostView } from '^/domain/post/aggregate/types'; +import type { AggregatedData as AggregatedPostData } from '^/domain/post/aggregate'; export default function useViewPostDetails() { const navigate = useNavigate(); - return useCallback((post: PostView) => + return useCallback((post: AggregatedPostData) => { navigate(`/post/${post.id}`); diff --git a/src/webui/features/hooks/useViewProfile.ts b/src/webui/features/hooks/useViewProfile.ts index 1808af26..09ba7595 100644 --- a/src/webui/features/hooks/useViewProfile.ts +++ b/src/webui/features/hooks/useViewProfile.ts @@ -1,11 +1,11 @@ import { useNavigate } from 'react-router-dom'; -import type { AggregatedData as RelationView } from '^/domain/relation/aggregate/types'; +import type { AggregatedData as AggregatedRelationData } from '^/domain/relation/aggregate'; export default function useViewProfile() { const navigate = useNavigate(); - return (relation: RelationView) => navigate(`/profile/${relation.following.nickname}`); + return (relation: AggregatedRelationData) => navigate(`/profile/${relation.following.nickname}`); } diff --git a/src/webui/features/hooks/useViewReactionDetails.ts b/src/webui/features/hooks/useViewReactionDetails.ts index e7971225..f50cff91 100644 --- a/src/webui/features/hooks/useViewReactionDetails.ts +++ b/src/webui/features/hooks/useViewReactionDetails.ts @@ -2,13 +2,13 @@ import { useCallback } from 'react'; import { useNavigate } from 'react-router-dom'; -import type { AggregatedData as ReactionView } from '^/domain/reaction/aggregate/types'; +import type { AggregatedData as AggregatedReactionData } from '^/domain/reaction/aggregate'; export default function useViewReactionDetails() { const navigate = useNavigate(); - return useCallback((reaction: ReactionView) => + return useCallback((reaction: AggregatedReactionData) => { navigate(`/post/${reaction.postId}/reaction/${reaction.id}`); diff --git a/test/domain/authentication/fixtures/databases.fixture.ts b/test/domain/authentication/fixtures/databases.fixture.ts index a700357f..b1cce33d 100644 --- a/test/domain/authentication/fixtures/databases.fixture.ts +++ b/test/domain/authentication/fixtures/databases.fixture.ts @@ -1,5 +1,5 @@ -import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator/definitions'; +import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator'; import database from '^/integrations/database/module'; import { RECORDS } from './records.fixture'; diff --git a/test/domain/authentication/login.spec.ts b/test/domain/authentication/login.spec.ts index cfde27d2..394bf6f6 100644 --- a/test/domain/authentication/login.spec.ts +++ b/test/domain/authentication/login.spec.ts @@ -1,8 +1,8 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import login from '^/domain/authentication/login/feature'; -import TooManySimilarNicknames from '^/domain/creator/generateNickname/TooManySimilarNicknames'; +import login from '^/domain/authentication/login'; +import { TooManySimilarNicknames } from '^/domain/creator/generateNickname'; import { DATABASES, FILE_STORES, HTTP_CLIENTS, IDENTITIES, VALUES } from './fixtures'; diff --git a/test/domain/comic/create.spec.ts b/test/domain/comic/create.spec.ts index 11e1ea0e..b52ac2d6 100644 --- a/test/domain/comic/create.spec.ts +++ b/test/domain/comic/create.spec.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import create from '^/domain/comic/create/feature'; +import create from '^/domain/comic/create/create'; import { RECORD_TYPE as COMIC_RECORD_TYPE } from '^/domain/comic/definitions'; import database from '^/integrations/database/module'; diff --git a/test/domain/comment/create.spec.ts b/test/domain/comment/create.spec.ts index fc4e2327..3b6ec791 100644 --- a/test/domain/comment/create.spec.ts +++ b/test/domain/comment/create.spec.ts @@ -1,9 +1,8 @@ import { describe, expect, it } from 'vitest'; -import create from '^/domain/comment/create/feature'; -import InvalidComment from '^/domain/comment/create/InvalidComment'; -import { RECORD_TYPE } from '^/domain/comment/definitions'; +import { RECORD_TYPE } from '^/domain/comment'; +import create, { InvalidComment } from '^/domain/comment/create'; import database from '^/integrations/database/module'; diff --git a/test/domain/common/validateRange.spec.ts b/test/domain/common/validateRange.spec.ts index e295c916..2e19b3fe 100644 --- a/test/domain/common/validateRange.spec.ts +++ b/test/domain/common/validateRange.spec.ts @@ -1,8 +1,7 @@ import { describe, expect, it } from 'vitest'; -import validateRange from '^/domain/common/validateRange/feature'; -import InvalidRange from '^/domain/common/validateRange/InvalidRange'; +import validateRange, { InvalidRange } from '^/domain/common/validateRange'; import { VALUES } from './fixtures'; diff --git a/test/domain/creator/fixtures/databases.fixture.ts b/test/domain/creator/fixtures/databases.fixture.ts index 500344cf..e4825d91 100644 --- a/test/domain/creator/fixtures/databases.fixture.ts +++ b/test/domain/creator/fixtures/databases.fixture.ts @@ -1,7 +1,7 @@ import database from '^/integrations/database/module'; -import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator/definitions'; +import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator'; import { RECORDS } from './records.fixture'; diff --git a/test/domain/creator/fixtures/requesters.fixture.ts b/test/domain/creator/fixtures/requesters.fixture.ts index 2a679b03..8ae9dd9c 100644 --- a/test/domain/creator/fixtures/requesters.fixture.ts +++ b/test/domain/creator/fixtures/requesters.fixture.ts @@ -1,10 +1,10 @@ -import johnDoe from '^/domain/authentication/requester'; +import { requester } from '^/domain/authentication'; import { VALUES } from './values.fixture'; export const REQUESTERS = { - UNKNOWN: johnDoe, + UNKNOWN: requester, CREATOR: { id: VALUES.IDS.CREATOR, fullName: VALUES.FULL_NAMES.CREATOR, nickname: VALUES.NICKNAMES.CREATOR } }; diff --git a/test/domain/creator/updateFullName.spec.ts b/test/domain/creator/updateFullName.spec.ts index 624446d5..00e70cec 100644 --- a/test/domain/creator/updateFullName.spec.ts +++ b/test/domain/creator/updateFullName.spec.ts @@ -1,9 +1,9 @@ import { beforeEach, describe, expect, it } from 'vitest'; +import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator'; import InvalidCreator from '^/domain/creator/InvalidCreator'; -import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator/definitions'; -import updateFullName from '^/domain/creator/updateFullName/feature'; +import updateFullName from '^/domain/creator/updateFullName'; import database from '^/integrations/database/module'; diff --git a/test/domain/creator/updateNickname.spec.ts b/test/domain/creator/updateNickname.spec.ts index 0c8dfe0c..90ccbc49 100644 --- a/test/domain/creator/updateNickname.spec.ts +++ b/test/domain/creator/updateNickname.spec.ts @@ -1,9 +1,8 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator/definitions'; -import NicknameAlreadyExists from '^/domain/creator/updateNickname/NicknameAlreadyExists'; -import updateNickname from '^/domain/creator/updateNickname/feature'; +import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator'; +import updateNickname, { NicknameAlreadyExists } from '^/domain/creator/updateNickname'; import database from '^/integrations/database/module'; diff --git a/test/domain/image/create.spec.ts b/test/domain/image/create.spec.ts index 6e6e3ba2..31914e7d 100644 --- a/test/domain/image/create.spec.ts +++ b/test/domain/image/create.spec.ts @@ -1,9 +1,8 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import create from '^/domain/image/create/feature'; -import InvalidDataURL from '^/domain/image/create/InvalidDataURL'; -import { RECORD_TYPE } from '^/domain/image/definitions'; +import { RECORD_TYPE } from '^/domain/image'; +import create, { InvalidDataURL } from '^/domain/image/create'; import InvalidImage from '^/domain/image/validate/InvalidImage'; import database from '^/integrations/database/module'; diff --git a/test/domain/image/download.spec.ts b/test/domain/image/download.spec.ts index 6e7e9717..5e10dafe 100644 --- a/test/domain/image/download.spec.ts +++ b/test/domain/image/download.spec.ts @@ -1,9 +1,8 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import { RECORD_TYPE } from '^/domain/image/definitions'; -import download from '^/domain/image/download/feature'; -import ImageNotDownloaded from '^/domain/image/download/ImageNotDownloaded'; +import { RECORD_TYPE } from '^/domain/image'; +import download, { ImageNotDownloaded } from '^/domain/image/download'; import InvalidImage from '^/domain/image/validate/InvalidImage'; import database from '^/integrations/database/module'; diff --git a/test/domain/notification/create.spec.ts b/test/domain/notification/create.spec.ts index 86d3acc2..63cdee60 100644 --- a/test/domain/notification/create.spec.ts +++ b/test/domain/notification/create.spec.ts @@ -1,8 +1,8 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import create from '^/domain/notification/create/feature'; -import { RECORD_TYPE as NOTIFICATION_RECORD_TYPE, Types } from '^/domain/notification/definitions'; +import { RECORD_TYPE as NOTIFICATION_RECORD_TYPE, Types } from '^/domain/notification'; +import create from '^/domain/notification/create'; import database from '^/integrations/database/module'; diff --git a/test/domain/notification/fixtures/databases.fixture.ts b/test/domain/notification/fixtures/databases.fixture.ts index a7c9eaff..405b4254 100644 --- a/test/domain/notification/fixtures/databases.fixture.ts +++ b/test/domain/notification/fixtures/databases.fixture.ts @@ -1,11 +1,11 @@ -import { RECORD_TYPE as COMIC_RECORD_TYPE } from '^/domain/comic/definitions'; -import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator/definitions'; -import { RECORD_TYPE as IMAGE_RECORD_TYPE } from '^/domain/image/definitions'; -import { RECORD_TYPE as NOTIFICATION_RECORD_TYPE } from '^/domain/notification/definitions'; -import { RECORD_TYPE as POST_RECORD_TYPE } from '^/domain/post/definitions'; -import { RECORD_TYPE as RATING_RECORD_TYPE } from '^/domain/rating/definitions'; -import { RECORD_TYPE as REACTION_RECORD_TYPE } from '^/domain/reaction/definitions'; +import { RECORD_TYPE as COMIC_RECORD_TYPE } from '^/domain/comic'; +import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator'; +import { RECORD_TYPE as IMAGE_RECORD_TYPE } from '^/domain/image'; +import { RECORD_TYPE as NOTIFICATION_RECORD_TYPE } from '^/domain/notification'; +import { RECORD_TYPE as POST_RECORD_TYPE } from '^/domain/post'; +import { RECORD_TYPE as RATING_RECORD_TYPE } from '^/domain/rating'; +import { RECORD_TYPE as REACTION_RECORD_TYPE } from '^/domain/reaction'; import database from '^/integrations/database/module'; diff --git a/test/domain/notification/fixtures/records.fixture.ts b/test/domain/notification/fixtures/records.fixture.ts index b71f5eac..a4bd6b4b 100644 --- a/test/domain/notification/fixtures/records.fixture.ts +++ b/test/domain/notification/fixtures/records.fixture.ts @@ -1,7 +1,7 @@ import { RecordData } from '^/integrations/database/module'; -import { Types } from '^/domain/notification/definitions'; +import { Types } from '^/domain/notification'; import { REQUESTERS } from './requesters.fixture'; import { VALUES } from './values.fixture'; diff --git a/test/domain/notification/getRecentAggregated.spec.ts b/test/domain/notification/getRecentAggregated.spec.ts index 776a9574..7fa457b0 100644 --- a/test/domain/notification/getRecentAggregated.spec.ts +++ b/test/domain/notification/getRecentAggregated.spec.ts @@ -1,8 +1,8 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import { Types } from '^/domain/notification/definitions'; -import getRecentAggregated from '^/domain/notification/getRecentAggregated/feature'; +import { Types } from '^/domain/notification'; +import getRecentAggregated from '^/domain/notification/getRecentAggregated'; import { DATABASES, FILE_STORES, REQUESTERS, VALUES } from './fixtures'; beforeEach(async () => diff --git a/test/domain/post/add.spec.ts b/test/domain/post/add.spec.ts index 4df42bba..48e68a3e 100644 --- a/test/domain/post/add.spec.ts +++ b/test/domain/post/add.spec.ts @@ -1,8 +1,8 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import add from '^/domain/post/add/feature'; -import { RECORD_TYPE as POST_RECORD_TYPE } from '^/domain/post/definitions'; +import { RECORD_TYPE as POST_RECORD_TYPE } from '^/domain/post'; +import add from '^/domain/post/add'; import database from '^/integrations/database/module'; diff --git a/test/domain/post/fixtures/databases.fixture.ts b/test/domain/post/fixtures/databases.fixture.ts index b25b34b7..66aa8288 100644 --- a/test/domain/post/fixtures/databases.fixture.ts +++ b/test/domain/post/fixtures/databases.fixture.ts @@ -1,10 +1,10 @@ -import { RECORD_TYPE as COMIC_RECORD_TYPE } from '^/domain/comic/definitions'; -import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator/definitions'; -import { RECORD_TYPE as IMAGE_RECORD_TYPE } from '^/domain/image/definitions'; -import { RECORD_TYPE as POST_RECORD_TYPE } from '^/domain/post/definitions'; -import { RECORD_TYPE as RATING_RECORD_TYPE } from '^/domain/rating/definitions'; -import { RECORD_TYPE as RELATION_RECORD_TYPE } from '^/domain/relation/definitions'; +import { RECORD_TYPE as COMIC_RECORD_TYPE } from '^/domain/comic'; +import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator'; +import { RECORD_TYPE as IMAGE_RECORD_TYPE } from '^/domain/image'; +import { RECORD_TYPE as POST_RECORD_TYPE } from '^/domain/post'; +import { RECORD_TYPE as RATING_RECORD_TYPE } from '^/domain/rating'; +import { RECORD_TYPE as RELATION_RECORD_TYPE } from '^/domain/relation'; import database from '^/integrations/database/module'; diff --git a/test/domain/post/fixtures/requesters.fixture.ts b/test/domain/post/fixtures/requesters.fixture.ts index eafb36b9..36157d57 100644 --- a/test/domain/post/fixtures/requesters.fixture.ts +++ b/test/domain/post/fixtures/requesters.fixture.ts @@ -1,12 +1,12 @@ -import johnDoe from '^/domain/authentication/requester'; +import { requester } from '^/domain/authentication'; import { Requester } from '^/domain/authentication/types'; import { VALUES } from './values.fixture'; export const REQUESTERS: Record = { - UNKNOWN: johnDoe, + UNKNOWN: requester, CREATOR1: { id: VALUES.IDS.CREATOR1, fullName: VALUES.FULL_NAMES.CREATOR1, nickname: VALUES.NICKNAMES.CREATOR1 }, CREATOR2: { id: VALUES.IDS.CREATOR2, fullName: VALUES.FULL_NAMES.CREATOR2, nickname: VALUES.NICKNAMES.CREATOR2 }, diff --git a/test/domain/post/getByFollowingAggregated.spec.ts b/test/domain/post/getByFollowingAggregated.spec.ts index f417cace..828c1bca 100644 --- a/test/domain/post/getByFollowingAggregated.spec.ts +++ b/test/domain/post/getByFollowingAggregated.spec.ts @@ -1,5 +1,5 @@ -import getByFollowingAggregated from '^/domain/post/getByFollowingAggregated/feature'; +import getByFollowingAggregated from '^/domain/post/getByFollowingAggregated'; import { beforeEach, describe, expect, it } from 'vitest'; import { DATABASES, FILE_STORES, REQUESTERS } from './fixtures'; diff --git a/test/domain/post/remove.spec.ts b/test/domain/post/remove.spec.ts index dff2fffe..d85da0bb 100644 --- a/test/domain/post/remove.spec.ts +++ b/test/domain/post/remove.spec.ts @@ -1,9 +1,8 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import { RECORD_TYPE } from '^/domain/post/definitions'; -import PostNotFound from '^/domain/post/PostNotFound'; -import remove from '^/domain/post/remove/feature'; +import { PostNotFound, RECORD_TYPE } from '^/domain/post'; +import remove from '^/domain/post/remove'; import database from '^/integrations/database/module'; diff --git a/test/domain/post/toggleRating.spec.ts b/test/domain/post/toggleRating.spec.ts index 8c1c33cf..4dc5340b 100644 --- a/test/domain/post/toggleRating.spec.ts +++ b/test/domain/post/toggleRating.spec.ts @@ -1,9 +1,9 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import PostNotFound from '^/domain/post/PostNotFound'; -import toggleRating from '^/domain/post/toggleRating/feature'; -import { RECORD_TYPE } from '^/domain/rating/definitions'; +import { PostNotFound } from '^/domain/post'; +import toggleRating from '^/domain/post/toggleRating'; +import { RECORD_TYPE } from '^/domain/rating'; import database from '^/integrations/database/module'; diff --git a/test/domain/rating/fixtures/requesters.fixture.ts b/test/domain/rating/fixtures/requesters.fixture.ts index 301cb4c8..b89ac251 100644 --- a/test/domain/rating/fixtures/requesters.fixture.ts +++ b/test/domain/rating/fixtures/requesters.fixture.ts @@ -1,5 +1,5 @@ -import requester from '^/domain/authentication/requester'; +import { requester } from '^/domain/authentication'; export const REQUESTERS = { diff --git a/test/domain/rating/update.spec.ts b/test/domain/rating/update.spec.ts index 15fc63e4..0b2bbbdd 100644 --- a/test/domain/rating/update.spec.ts +++ b/test/domain/rating/update.spec.ts @@ -1,9 +1,8 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import update from '^/domain/rating/update/feature'; +import update, { InvalidRating } from '^/domain/rating/update'; -import InvalidRating from '^/domain/rating/update/InvalidRating'; import { DATABASES, REQUESTERS, VALUES } from './fixtures'; beforeEach(async () => diff --git a/test/domain/reaction/create.spec.ts b/test/domain/reaction/create.spec.ts index b32d04f4..84d24f15 100644 --- a/test/domain/reaction/create.spec.ts +++ b/test/domain/reaction/create.spec.ts @@ -1,10 +1,9 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import PostNotFound from '^/domain/post/PostNotFound'; -import InvalidReaction from '^/domain/reaction/create/InvalidReaction'; -import create from '^/domain/reaction/create/feature'; -import { RECORD_TYPE as REACTION_RECORD_TYPE } from '^/domain/reaction/definitions'; +import { PostNotFound } from '^/domain/post'; +import { RECORD_TYPE as REACTION_RECORD_TYPE } from '^/domain/reaction'; +import create, { InvalidReaction } from '^/domain/reaction/create'; import database from '^/integrations/database/module'; diff --git a/test/domain/reaction/createComic.spec.ts b/test/domain/reaction/createComic.spec.ts index e2284e60..52a63bff 100644 --- a/test/domain/reaction/createComic.spec.ts +++ b/test/domain/reaction/createComic.spec.ts @@ -1,9 +1,9 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import { RECORD_TYPE as POST_RECORD_TYPE } from '^/domain/post/definitions'; -import create from '^/domain/reaction/createComic/feature'; -import { RECORD_TYPE as REACTION_RECORD_TYPE } from '^/domain/reaction/definitions'; +import { RECORD_TYPE as POST_RECORD_TYPE } from '^/domain/post'; +import { RECORD_TYPE as REACTION_RECORD_TYPE } from '^/domain/reaction'; +import create from '^/domain/reaction/createWithComic'; import database from '^/integrations/database/module'; diff --git a/test/domain/reaction/createComment.spec.ts b/test/domain/reaction/createComment.spec.ts index dc0f148b..45a0f8d8 100644 --- a/test/domain/reaction/createComment.spec.ts +++ b/test/domain/reaction/createComment.spec.ts @@ -1,9 +1,9 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import { RECORD_TYPE as POST_RECORD_TYPE } from '^/domain/post/definitions'; -import create from '^/domain/reaction/createComment/feature'; -import { RECORD_TYPE as REACTION_RECORD_TYPE } from '^/domain/reaction/definitions'; +import { RECORD_TYPE as POST_RECORD_TYPE } from '^/domain/post'; +import { RECORD_TYPE as REACTION_RECORD_TYPE } from '^/domain/reaction'; +import create from '^/domain/reaction/createWithComment'; import database from '^/integrations/database/module'; diff --git a/test/domain/reaction/fixtures/databases.fixture.ts b/test/domain/reaction/fixtures/databases.fixture.ts index 93facd43..e6c77345 100644 --- a/test/domain/reaction/fixtures/databases.fixture.ts +++ b/test/domain/reaction/fixtures/databases.fixture.ts @@ -1,11 +1,11 @@ -import { RECORD_TYPE as COMIC_RECORD_TYPE } from '^/domain/comic/definitions'; -import { RECORD_TYPE as COMMENT_RECORD_TYPE } from '^/domain/comment/definitions'; -import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator/definitions'; -import { RECORD_TYPE as IMAGE_RECORD_TYPE } from '^/domain/image/definitions'; -import { RECORD_TYPE as POST_RECORD_TYPE } from '^/domain/post/definitions'; -import { RECORD_TYPE as RATING_RECORD_TYPE } from '^/domain/rating/definitions'; -import { RECORD_TYPE as REACTION_RECORD_TYPE } from '^/domain/reaction/definitions'; +import { RECORD_TYPE as COMIC_RECORD_TYPE } from '^/domain/comic'; +import { RECORD_TYPE as COMMENT_RECORD_TYPE } from '^/domain/comment'; +import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator'; +import { RECORD_TYPE as IMAGE_RECORD_TYPE } from '^/domain/image'; +import { RECORD_TYPE as POST_RECORD_TYPE } from '^/domain/post'; +import { RECORD_TYPE as RATING_RECORD_TYPE } from '^/domain/rating'; +import { RECORD_TYPE as REACTION_RECORD_TYPE } from '^/domain/reaction'; import database from '^/integrations/database/module'; diff --git a/test/domain/reaction/fixtures/requesters.fixture.ts b/test/domain/reaction/fixtures/requesters.fixture.ts index dbc09532..dbef7197 100644 --- a/test/domain/reaction/fixtures/requesters.fixture.ts +++ b/test/domain/reaction/fixtures/requesters.fixture.ts @@ -1,8 +1,8 @@ -import johnDoe from '^/domain/authentication/requester'; +import { requester } from '^/domain/authentication'; export const REQUESTERS = { - OWNER: johnDoe, + OWNER: requester, VIEWER: { id: '1', fullName: 'Some Other', nickname: 'someOther' } }; diff --git a/test/domain/reaction/getByPostAggregated.spec.ts b/test/domain/reaction/getByPostAggregated.spec.ts index 692681a6..121f490f 100644 --- a/test/domain/reaction/getByPostAggregated.spec.ts +++ b/test/domain/reaction/getByPostAggregated.spec.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import getByPost from '^/domain/reaction/getByPostAggregated/feature'; +import getByPost from '^/domain/reaction/getByPostAggregated'; import { DATABASES, FILE_STORES, REQUESTERS, VALUES } from './fixtures'; diff --git a/test/domain/reaction/remove.spec.ts b/test/domain/reaction/remove.spec.ts index 286ce4cd..186e9ca8 100644 --- a/test/domain/reaction/remove.spec.ts +++ b/test/domain/reaction/remove.spec.ts @@ -1,9 +1,8 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import { RECORD_TYPE as REACTION_RECORD_TYPE } from '^/domain/reaction/definitions'; -import ReactionNotFound from '^/domain/reaction/remove/ReactionNotFound'; -import remove from '^/domain/reaction/remove/feature'; +import { RECORD_TYPE as REACTION_RECORD_TYPE } from '^/domain/reaction'; +import remove, { ReactionNotFound } from '^/domain/reaction/remove'; import database from '^/integrations/database/module'; diff --git a/test/domain/reaction/toggleRating.spec.ts b/test/domain/reaction/toggleRating.spec.ts index 2edff8a6..41354f1d 100644 --- a/test/domain/reaction/toggleRating.spec.ts +++ b/test/domain/reaction/toggleRating.spec.ts @@ -1,8 +1,8 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import { RECORD_TYPE as RATING_RECORD_TYPE } from '^/domain/rating/definitions'; -import toggleRating from '^/domain/reaction/toggleRating/feature'; +import { RECORD_TYPE as RATING_RECORD_TYPE } from '^/domain/rating'; +import toggleRating from '^/domain/reaction/toggleRating'; import database from '^/integrations/database/module'; diff --git a/test/domain/relation/establish.spec.ts b/test/domain/relation/establish.spec.ts index c1b39c5b..212ed5bc 100644 --- a/test/domain/relation/establish.spec.ts +++ b/test/domain/relation/establish.spec.ts @@ -1,11 +1,9 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator/definitions'; -import { RECORD_TYPE as RELATION_RECORD_TYPE } from '^/domain/relation/definitions'; -import InvalidRelation from '^/domain/relation/establish/InvalidRelation'; -import RelationAlreadyExists from '^/domain/relation/establish/RelationAlreadyExists'; -import establish from '^/domain/relation/establish/feature'; +import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator'; +import { RECORD_TYPE as RELATION_RECORD_TYPE } from '^/domain/relation'; +import establish, { InvalidRelation, RelationAlreadyExists } from '^/domain/relation/establish'; import database from '^/integrations/database/module'; diff --git a/test/domain/relation/exploreAggregated.spec.ts b/test/domain/relation/exploreAggregated.spec.ts index 02e437ef..cf3afff5 100644 --- a/test/domain/relation/exploreAggregated.spec.ts +++ b/test/domain/relation/exploreAggregated.spec.ts @@ -2,7 +2,7 @@ import { beforeEach, describe, expect, it } from 'vitest'; import { SortOrder } from '^/domain/relation/definitions'; -import explore from '^/domain/relation/exploreAggregated/feature'; +import explore from '^/domain/relation/exploreAggregated'; import { DATABASES, REQUESTERS, VALUES } from './fixtures'; diff --git a/test/domain/relation/fixtures/databases.fixture.ts b/test/domain/relation/fixtures/databases.fixture.ts index 6fe44e49..b065d1c1 100644 --- a/test/domain/relation/fixtures/databases.fixture.ts +++ b/test/domain/relation/fixtures/databases.fixture.ts @@ -1,8 +1,8 @@ import database from '^/integrations/database/module'; -import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator/definitions'; -import { RECORD_TYPE as RELATION_RECORD_TYPE } from '^/domain/relation/definitions'; +import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator'; +import { RECORD_TYPE as RELATION_RECORD_TYPE } from '^/domain/relation'; import { RECORDS } from './records.fixture'; diff --git a/test/domain/relation/fixtures/requesters.fixture.ts b/test/domain/relation/fixtures/requesters.fixture.ts index 34e4a608..93519a95 100644 --- a/test/domain/relation/fixtures/requesters.fixture.ts +++ b/test/domain/relation/fixtures/requesters.fixture.ts @@ -1,5 +1,5 @@ -import johnDoe from '^/domain/authentication/requester'; +import { requester } from '^/domain/authentication'; import { RECORDS } from './records.fixture'; @@ -10,5 +10,5 @@ export const REQUESTERS = { FIRST: { id: CREATOR1.id as string, fullName: CREATOR1.fullName as string, nickname: CREATOR1.nickname as string }, SECOND: { id: CREATOR2.id as string, fullName: CREATOR2.fullName as string, nickname: CREATOR2.nickname as string }, - UNKNOWN: johnDoe + UNKNOWN: requester }; diff --git a/test/domain/relation/getFollowersAggregated.spec.ts b/test/domain/relation/getFollowersAggregated.spec.ts index aecb5af2..07344572 100644 --- a/test/domain/relation/getFollowersAggregated.spec.ts +++ b/test/domain/relation/getFollowersAggregated.spec.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import getFollowers from '^/domain/relation/getFollowersAggregated/feature'; +import getFollowers from '^/domain/relation/getFollowersAggregated'; import { DATABASES, REQUESTERS, VALUES } from './fixtures'; diff --git a/test/domain/relation/getFollowingAggregated.spec.ts b/test/domain/relation/getFollowingAggregated.spec.ts index d8f587b5..3000e943 100644 --- a/test/domain/relation/getFollowingAggregated.spec.ts +++ b/test/domain/relation/getFollowingAggregated.spec.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import getFollowing from '^/domain/relation/getFollowingAggregated/feature'; +import getFollowing from '^/domain/relation/getFollowingAggregated'; import { DATABASES, REQUESTERS, VALUES } from './fixtures'; From d0a5654bb37e831a0dfeced761f9e4c3407eff70 Mon Sep 17 00:00:00 2001 From: Peter van Vliet Date: Fri, 10 Jan 2025 14:26:31 +0100 Subject: [PATCH 07/14] #361: renamed module files to index for integrations --- src/domain/comic/create/InvalidComic.ts | 2 +- src/domain/comic/create/insertData.ts | 2 +- src/domain/comic/create/validateData.ts | 2 +- src/domain/comic/erase/eraseData.ts | 2 +- src/domain/comic/getById/getById.ts | 2 +- src/domain/comment/create/InvalidComment.ts | 2 +- src/domain/comment/create/insertData.ts | 2 +- src/domain/comment/create/validateData.ts | 2 +- src/domain/comment/erase/erase.ts | 2 +- src/domain/comment/getById/getById.ts | 2 +- src/domain/common/validateRange/InvalidRange.ts | 2 +- src/domain/common/validateRange/validateRange.ts | 2 +- src/domain/creator/InvalidCreator.ts | 2 +- src/domain/creator/create/insertData.ts | 2 +- src/domain/creator/create/validateData.ts | 2 +- src/domain/creator/definitions.ts | 2 +- .../creator/generateNickname/TooManySimilarNicknames.ts | 2 +- src/domain/creator/generateNickname/retrieveByNickname.ts | 2 +- .../creator/generateNickname/retrieveByStartNickname.ts | 2 +- src/domain/creator/getByEmail/getByEmail.ts | 2 +- src/domain/creator/getById/getById.ts | 2 +- src/domain/creator/getByNickname/NicknameNotFound.ts | 2 +- src/domain/creator/getByNickname/getByNickname.ts | 2 +- src/domain/creator/getOthers/getOthers.ts | 2 +- src/domain/creator/index.ts | 2 +- src/domain/creator/update/update.ts | 2 +- src/domain/creator/updateFullName/validateData.ts | 2 +- src/domain/creator/updateNickname/NicknameAlreadyExists.ts | 2 +- src/domain/creator/updateNickname/retrieveByNickname.ts | 2 +- src/domain/definitions.ts | 2 +- src/domain/image/create/InvalidDataURL.ts | 2 +- src/domain/image/definitions.ts | 2 +- src/domain/image/download/ImageNotDownloaded.ts | 2 +- src/domain/image/download/downloadImage.ts | 2 +- src/domain/image/download/getMetaData.ts | 2 +- src/domain/image/erase/erase.ts | 2 +- src/domain/image/getById/retrieveData.ts | 2 +- src/domain/image/getById/retrieveFile.ts | 2 +- src/domain/image/save/InvalidImage.ts | 2 +- src/domain/image/save/fileExists.ts | 2 +- src/domain/image/save/insertData.ts | 2 +- src/domain/image/save/insertFile.ts | 2 +- src/domain/image/save/validateData.ts | 2 +- src/domain/image/validate/InvalidImage.ts | 2 +- src/domain/image/validate/validate.ts | 2 +- src/domain/notification/create/create.ts | 2 +- src/domain/notification/create/insertData.ts | 2 +- src/domain/notification/getById/getById.ts | 2 +- src/domain/notification/getRecent/getRecent.ts | 2 +- .../notification/getRecentAggregated/getRecentAggregated.ts | 2 +- src/domain/post/PostNotFound.ts | 2 +- src/domain/post/add/add.ts | 2 +- src/domain/post/create/insertData.ts | 2 +- src/domain/post/erase/erase.ts | 2 +- src/domain/post/explore/retrieveData.ts | 2 +- src/domain/post/exploreAggregated/exploreAggregated.ts | 2 +- src/domain/post/getAll/getAll.ts | 2 +- src/domain/post/getAllAggregated/getAllAggregated.ts | 2 +- src/domain/post/getByCreator/getByCreator.ts | 2 +- .../post/getByCreatorAggregated/getByCreatorAggregated.ts | 2 +- src/domain/post/getByFollowing/retrieveData.ts | 2 +- .../getByFollowingAggregated/getByFollowingAggregated.ts | 2 +- src/domain/post/getById/getById.ts | 2 +- src/domain/post/remove/deleteData.ts | 2 +- src/domain/post/remove/ownsData.ts | 2 +- src/domain/post/remove/remove.ts | 2 +- src/domain/post/toggleRating/toggleRating.ts | 2 +- src/domain/post/update/update.ts | 2 +- src/domain/rating/exists/exists.ts | 2 +- src/domain/rating/update/InvalidRating.ts | 2 +- src/domain/rating/update/eraseData.ts | 2 +- src/domain/rating/update/getData.ts | 2 +- src/domain/rating/update/insertData.ts | 2 +- src/domain/rating/update/validateData.ts | 2 +- src/domain/reaction/create/InvalidReaction.ts | 2 +- src/domain/reaction/create/create.ts | 2 +- src/domain/reaction/create/eraseData.ts | 2 +- src/domain/reaction/create/insertData.ts | 2 +- src/domain/reaction/create/validateData.ts | 2 +- src/domain/reaction/getById/getById.ts | 2 +- src/domain/reaction/getByPost/getByPost.ts | 2 +- .../reaction/getByPostAggregated/getByPostAggregated.ts | 2 +- src/domain/reaction/remove/ReactionNotFound.ts | 2 +- src/domain/reaction/remove/deleteData.ts | 2 +- src/domain/reaction/remove/remove.ts | 2 +- src/domain/reaction/remove/retrieveOwnedData.ts | 2 +- src/domain/reaction/toggleRating/toggleRating.ts | 2 +- src/domain/reaction/update/update.ts | 2 +- src/domain/relation/establish/InvalidRelation.ts | 2 +- src/domain/relation/establish/RelationAlreadyExists.ts | 2 +- src/domain/relation/establish/dataExists.ts | 2 +- src/domain/relation/establish/eraseData.ts | 2 +- src/domain/relation/establish/establish.ts | 2 +- src/domain/relation/establish/insertData.ts | 2 +- src/domain/relation/establish/validateData.ts | 2 +- src/domain/relation/get/get.ts | 2 +- src/domain/relation/getFollowers/retrieveData.ts | 2 +- src/domain/relation/getFollowing/retrieveData.ts | 2 +- src/integrations/database/{module.ts => index.ts} | 0 src/integrations/filestore/{module.ts => index.ts} | 0 src/integrations/http/{module.ts => index.ts} | 0 src/integrations/logging/{module.ts => index.ts} | 0 src/integrations/notification/{module.ts => index.ts} | 0 src/integrations/runtime/databaseHealthCheck.ts | 2 +- src/integrations/runtime/fileStoreHealthCheck.ts | 2 +- .../runtime/healthchecks/DatabaseHealthCheck.ts | 2 +- src/integrations/runtime/{module.ts => index.ts} | 0 src/integrations/runtime/notificationHealthCheck.ts | 2 +- src/integrations/runtime/setUpNode.ts | 6 +++--- src/integrations/runtime/tearDownNode.ts | 6 +++--- src/integrations/validation/{module.ts => index.ts} | 0 test/domain/authentication/fixtures/databases.fixture.ts | 2 +- test/domain/authentication/fixtures/fileStores.fixture.ts | 2 +- test/domain/authentication/fixtures/httpClients.fixture.ts | 2 +- test/domain/authentication/fixtures/records.fixture.ts | 2 +- test/domain/comic/create.spec.ts | 2 +- test/domain/comic/fixtures/databases.fixture.ts | 2 +- test/domain/comic/fixtures/fileStores.fixture.ts | 2 +- test/domain/comment/create.spec.ts | 2 +- test/domain/creator/fixtures/databases.fixture.ts | 2 +- test/domain/creator/fixtures/records.fixture.ts | 2 +- test/domain/creator/updateFullName.spec.ts | 2 +- test/domain/creator/updateNickname.spec.ts | 2 +- test/domain/image/create.spec.ts | 4 ++-- test/domain/image/download.spec.ts | 4 ++-- test/domain/image/fixtures/databases.fixture.ts | 2 +- test/domain/image/fixtures/fileStores.fixture.ts | 2 +- test/domain/image/fixtures/httpClients.fixture.ts | 2 +- test/domain/notification/create.spec.ts | 2 +- test/domain/notification/fixtures/databases.fixture.ts | 2 +- test/domain/notification/fixtures/fileStores.fixture.ts | 2 +- test/domain/notification/fixtures/records.fixture.ts | 2 +- test/domain/post/add.spec.ts | 2 +- test/domain/post/fixtures/databases.fixture.ts | 2 +- test/domain/post/fixtures/fileStores.fixture.ts | 2 +- test/domain/post/fixtures/queries.fixture.ts | 2 +- test/domain/post/fixtures/records.fixture.ts | 2 +- test/domain/post/remove.spec.ts | 2 +- test/domain/post/toggleRating.spec.ts | 2 +- test/domain/rating/fixtures/databases.fixture.ts | 2 +- test/domain/reaction/create.spec.ts | 2 +- test/domain/reaction/createComic.spec.ts | 2 +- test/domain/reaction/createComment.spec.ts | 2 +- test/domain/reaction/fixtures/databases.fixture.ts | 2 +- test/domain/reaction/fixtures/fileStores.fixture.ts | 2 +- test/domain/reaction/fixtures/queries.fixture.ts | 2 +- test/domain/reaction/fixtures/records.fixture.ts | 2 +- test/domain/reaction/remove.spec.ts | 2 +- test/domain/reaction/toggleRating.spec.ts | 2 +- test/domain/relation/establish.spec.ts | 2 +- test/domain/relation/fixtures/databases.fixture.ts | 2 +- test/domain/relation/fixtures/queries.fixture.ts | 2 +- test/domain/relation/fixtures/records.fixture.ts | 2 +- test/integrations/database/fixtures/databases.fixture.ts | 2 +- test/integrations/database/fixtures/queries.fixture.ts | 2 +- test/integrations/database/fixtures/records.fixture.ts | 2 +- test/integrations/database/fixtures/results.fixture.ts | 2 +- test/integrations/database/fixtures/sorts.fixture.ts | 2 +- test/integrations/database/implementation.spec.ts | 2 +- .../integrations/filestorage/fixtures/fileStores.fixture.ts | 2 +- test/integrations/filestorage/implementation.spec.ts | 2 +- .../notification/fixtures/notificationServices.fixture.ts | 2 +- test/integrations/notification/implementation.spec.ts | 2 +- .../validation/fixtures/validationSchemes.fixture.ts | 2 +- test/integrations/validation/implementation.spec.ts | 2 +- 165 files changed, 164 insertions(+), 164 deletions(-) rename src/integrations/database/{module.ts => index.ts} (100%) rename src/integrations/filestore/{module.ts => index.ts} (100%) rename src/integrations/http/{module.ts => index.ts} (100%) rename src/integrations/logging/{module.ts => index.ts} (100%) rename src/integrations/notification/{module.ts => index.ts} (100%) rename src/integrations/runtime/{module.ts => index.ts} (100%) rename src/integrations/validation/{module.ts => index.ts} (100%) diff --git a/src/domain/comic/create/InvalidComic.ts b/src/domain/comic/create/InvalidComic.ts index c2d5cec8..e437ffc9 100644 --- a/src/domain/comic/create/InvalidComic.ts +++ b/src/domain/comic/create/InvalidComic.ts @@ -1,5 +1,5 @@ -import { ValidationError } from '^/integrations/runtime/module'; +import { ValidationError } from '^/integrations/runtime'; export default class InvalidComic extends ValidationError { diff --git a/src/domain/comic/create/insertData.ts b/src/domain/comic/create/insertData.ts index 8a4b8ddd..764eeeb9 100644 --- a/src/domain/comic/create/insertData.ts +++ b/src/domain/comic/create/insertData.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/comic/create/validateData.ts b/src/domain/comic/create/validateData.ts index c6d8310c..54eccf3a 100644 --- a/src/domain/comic/create/validateData.ts +++ b/src/domain/comic/create/validateData.ts @@ -1,5 +1,5 @@ -import validator, { ValidationSchema } from '^/integrations/validation/module'; +import validator, { ValidationSchema } from '^/integrations/validation'; import { requiredIdValidation } from '^/domain/definitions'; diff --git a/src/domain/comic/erase/eraseData.ts b/src/domain/comic/erase/eraseData.ts index c4395509..63cd83be 100644 --- a/src/domain/comic/erase/eraseData.ts +++ b/src/domain/comic/erase/eraseData.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; diff --git a/src/domain/comic/getById/getById.ts b/src/domain/comic/getById/getById.ts index 73bf5931..954137d2 100644 --- a/src/domain/comic/getById/getById.ts +++ b/src/domain/comic/getById/getById.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/comment/create/InvalidComment.ts b/src/domain/comment/create/InvalidComment.ts index e3a8405f..ad1b03f1 100644 --- a/src/domain/comment/create/InvalidComment.ts +++ b/src/domain/comment/create/InvalidComment.ts @@ -1,5 +1,5 @@ -import { ValidationError } from '^/integrations/runtime/module'; +import { ValidationError } from '^/integrations/runtime'; export default class InvalidComment extends ValidationError { diff --git a/src/domain/comment/create/insertData.ts b/src/domain/comment/create/insertData.ts index 8a4b8ddd..764eeeb9 100644 --- a/src/domain/comment/create/insertData.ts +++ b/src/domain/comment/create/insertData.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/comment/create/validateData.ts b/src/domain/comment/create/validateData.ts index fa09fbd4..c0c1d657 100644 --- a/src/domain/comment/create/validateData.ts +++ b/src/domain/comment/create/validateData.ts @@ -1,5 +1,5 @@ -import validator, { ValidationSchema } from '^/integrations/validation/module'; +import validator, { ValidationSchema } from '^/integrations/validation'; import { MESSAGE_MAX_LENGTH } from '../definitions'; import InvalidComment from './InvalidComment'; diff --git a/src/domain/comment/erase/erase.ts b/src/domain/comment/erase/erase.ts index ea8d43b6..bd2c02cd 100644 --- a/src/domain/comment/erase/erase.ts +++ b/src/domain/comment/erase/erase.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; diff --git a/src/domain/comment/getById/getById.ts b/src/domain/comment/getById/getById.ts index 73bf5931..954137d2 100644 --- a/src/domain/comment/getById/getById.ts +++ b/src/domain/comment/getById/getById.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/common/validateRange/InvalidRange.ts b/src/domain/common/validateRange/InvalidRange.ts index f2c91dc5..f594fb2b 100644 --- a/src/domain/common/validateRange/InvalidRange.ts +++ b/src/domain/common/validateRange/InvalidRange.ts @@ -1,5 +1,5 @@ -import { ValidationError } from '^/integrations/runtime/module'; +import { ValidationError } from '^/integrations/runtime'; export default class InvalidRange extends ValidationError { diff --git a/src/domain/common/validateRange/validateRange.ts b/src/domain/common/validateRange/validateRange.ts index ef25a062..48b9d34e 100644 --- a/src/domain/common/validateRange/validateRange.ts +++ b/src/domain/common/validateRange/validateRange.ts @@ -1,5 +1,5 @@ -import validator, { ValidationSchema } from '^/integrations/validation/module'; +import validator, { ValidationSchema } from '^/integrations/validation'; import { Range } from './types'; diff --git a/src/domain/creator/InvalidCreator.ts b/src/domain/creator/InvalidCreator.ts index 7bcf218b..bbac11fa 100644 --- a/src/domain/creator/InvalidCreator.ts +++ b/src/domain/creator/InvalidCreator.ts @@ -1,5 +1,5 @@ -import { ValidationError } from '^/integrations/runtime/module'; +import { ValidationError } from '^/integrations/runtime'; export default class InvalidCreator extends ValidationError { diff --git a/src/domain/creator/create/insertData.ts b/src/domain/creator/create/insertData.ts index 8a4b8ddd..764eeeb9 100644 --- a/src/domain/creator/create/insertData.ts +++ b/src/domain/creator/create/insertData.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/creator/create/validateData.ts b/src/domain/creator/create/validateData.ts index 91428fa3..97514c0c 100644 --- a/src/domain/creator/create/validateData.ts +++ b/src/domain/creator/create/validateData.ts @@ -1,5 +1,5 @@ -import validator, { ValidationSchema } from '^/integrations/validation/module'; +import validator, { ValidationSchema } from '^/integrations/validation'; import { optionalIdValidation } from '^/domain/definitions'; diff --git a/src/domain/creator/definitions.ts b/src/domain/creator/definitions.ts index 5cb7f879..a2b25379 100644 --- a/src/domain/creator/definitions.ts +++ b/src/domain/creator/definitions.ts @@ -1,5 +1,5 @@ -import type { Validation } from '^/integrations/validation/module'; +import type { Validation } from '^/integrations/validation'; import { SortOrder, SortOrders } from '../definitions'; diff --git a/src/domain/creator/generateNickname/TooManySimilarNicknames.ts b/src/domain/creator/generateNickname/TooManySimilarNicknames.ts index 94044bb8..1d2707c1 100644 --- a/src/domain/creator/generateNickname/TooManySimilarNicknames.ts +++ b/src/domain/creator/generateNickname/TooManySimilarNicknames.ts @@ -1,5 +1,5 @@ -import { BadRequest } from '^/integrations/runtime/module'; +import { BadRequest } from '^/integrations/runtime'; export default class TooManySimilarNicknames extends BadRequest { diff --git a/src/domain/creator/generateNickname/retrieveByNickname.ts b/src/domain/creator/generateNickname/retrieveByNickname.ts index 070fb791..27201487 100644 --- a/src/domain/creator/generateNickname/retrieveByNickname.ts +++ b/src/domain/creator/generateNickname/retrieveByNickname.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/creator/generateNickname/retrieveByStartNickname.ts b/src/domain/creator/generateNickname/retrieveByStartNickname.ts index 2e3205d9..742637f1 100644 --- a/src/domain/creator/generateNickname/retrieveByStartNickname.ts +++ b/src/domain/creator/generateNickname/retrieveByStartNickname.ts @@ -1,5 +1,5 @@ -import database, { RecordSort, SortDirections } from '^/integrations/database/module'; +import database, { RecordSort, SortDirections } from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/creator/getByEmail/getByEmail.ts b/src/domain/creator/getByEmail/getByEmail.ts index b906ceba..35c2e1b7 100644 --- a/src/domain/creator/getByEmail/getByEmail.ts +++ b/src/domain/creator/getByEmail/getByEmail.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/creator/getById/getById.ts b/src/domain/creator/getById/getById.ts index 73bf5931..954137d2 100644 --- a/src/domain/creator/getById/getById.ts +++ b/src/domain/creator/getById/getById.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/creator/getByNickname/NicknameNotFound.ts b/src/domain/creator/getByNickname/NicknameNotFound.ts index 31ba3d4f..0ed9c783 100644 --- a/src/domain/creator/getByNickname/NicknameNotFound.ts +++ b/src/domain/creator/getByNickname/NicknameNotFound.ts @@ -1,5 +1,5 @@ -import { NotFound } from '^/integrations/runtime/module'; +import { NotFound } from '^/integrations/runtime'; export default class NicknameNotFound extends NotFound { diff --git a/src/domain/creator/getByNickname/getByNickname.ts b/src/domain/creator/getByNickname/getByNickname.ts index 65262a0d..41387179 100644 --- a/src/domain/creator/getByNickname/getByNickname.ts +++ b/src/domain/creator/getByNickname/getByNickname.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/creator/getOthers/getOthers.ts b/src/domain/creator/getOthers/getOthers.ts index 97ec007a..26ac7dc8 100644 --- a/src/domain/creator/getOthers/getOthers.ts +++ b/src/domain/creator/getOthers/getOthers.ts @@ -1,5 +1,5 @@ -import database, { QueryStatement, RecordQuery, RecordSort, SortDirections } from '^/integrations/database/module'; +import database, { QueryStatement, RecordQuery, RecordSort, SortDirections } from '^/integrations/database'; import { RECORD_TYPE, SortOrder, SortOrders } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/creator/index.ts b/src/domain/creator/index.ts index 7c4921bd..185eb96a 100644 --- a/src/domain/creator/index.ts +++ b/src/domain/creator/index.ts @@ -1,5 +1,5 @@ -export { IMAGE_TYPE, RECORD_TYPE, SortOrder } from './definitions'; +export { IMAGE_TYPE, RECORD_TYPE, SortOrders } from './definitions'; export type { DataModel } from './types'; diff --git a/src/domain/creator/update/update.ts b/src/domain/creator/update/update.ts index b5585ab0..d0b7e846 100644 --- a/src/domain/creator/update/update.ts +++ b/src/domain/creator/update/update.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/creator/updateFullName/validateData.ts b/src/domain/creator/updateFullName/validateData.ts index 4f149c90..ba45f069 100644 --- a/src/domain/creator/updateFullName/validateData.ts +++ b/src/domain/creator/updateFullName/validateData.ts @@ -1,5 +1,5 @@ -import validator, { ValidationSchema } from '^/integrations/validation/module'; +import validator, { ValidationSchema } from '^/integrations/validation'; import InvalidCreator from '../InvalidCreator'; import { fullNameValidation } from '../definitions'; diff --git a/src/domain/creator/updateNickname/NicknameAlreadyExists.ts b/src/domain/creator/updateNickname/NicknameAlreadyExists.ts index 2a73b6b9..71b68211 100644 --- a/src/domain/creator/updateNickname/NicknameAlreadyExists.ts +++ b/src/domain/creator/updateNickname/NicknameAlreadyExists.ts @@ -1,5 +1,5 @@ -import { BadRequest } from '^/integrations/runtime/module'; +import { BadRequest } from '^/integrations/runtime'; export default class NicknameAlreadyExists extends BadRequest { diff --git a/src/domain/creator/updateNickname/retrieveByNickname.ts b/src/domain/creator/updateNickname/retrieveByNickname.ts index 070fb791..27201487 100644 --- a/src/domain/creator/updateNickname/retrieveByNickname.ts +++ b/src/domain/creator/updateNickname/retrieveByNickname.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/definitions.ts b/src/domain/definitions.ts index e90e6650..83bc06a8 100644 --- a/src/domain/definitions.ts +++ b/src/domain/definitions.ts @@ -1,5 +1,5 @@ -import type { Validation } from '^/integrations/validation/module'; +import type { Validation } from '^/integrations/validation'; export const SortOrders = { POPULAR: 'popular', diff --git a/src/domain/image/create/InvalidDataURL.ts b/src/domain/image/create/InvalidDataURL.ts index 0b45e467..e8dd4e6c 100644 --- a/src/domain/image/create/InvalidDataURL.ts +++ b/src/domain/image/create/InvalidDataURL.ts @@ -1,5 +1,5 @@ -import { BadRequest } from '^/integrations/runtime/module'; +import { BadRequest } from '^/integrations/runtime'; export default class InvalidDataURL extends BadRequest { diff --git a/src/domain/image/definitions.ts b/src/domain/image/definitions.ts index c83ac683..dc022b8e 100644 --- a/src/domain/image/definitions.ts +++ b/src/domain/image/definitions.ts @@ -1,5 +1,5 @@ -import type { Validation } from '^/integrations/validation/module'; +import type { Validation } from '^/integrations/validation'; export const RECORD_TYPE = 'image'; diff --git a/src/domain/image/download/ImageNotDownloaded.ts b/src/domain/image/download/ImageNotDownloaded.ts index 47d50b20..f4d951b7 100644 --- a/src/domain/image/download/ImageNotDownloaded.ts +++ b/src/domain/image/download/ImageNotDownloaded.ts @@ -1,5 +1,5 @@ -import { ServerError } from '^/integrations/runtime/module'; +import { ServerError } from '^/integrations/runtime'; export default class ImageNotDownloaded extends ServerError { diff --git a/src/domain/image/download/downloadImage.ts b/src/domain/image/download/downloadImage.ts index 28bd5c83..22c5ba27 100644 --- a/src/domain/image/download/downloadImage.ts +++ b/src/domain/image/download/downloadImage.ts @@ -1,5 +1,5 @@ -import httpClient from '^/integrations/http/module'; +import httpClient from '^/integrations/http'; import ImageNotDownloaded from './ImageNotDownloaded'; diff --git a/src/domain/image/download/getMetaData.ts b/src/domain/image/download/getMetaData.ts index 5cfe5f4f..c7776c1a 100644 --- a/src/domain/image/download/getMetaData.ts +++ b/src/domain/image/download/getMetaData.ts @@ -1,5 +1,5 @@ -import httpClient from '^/integrations/http/module'; +import httpClient from '^/integrations/http'; import type { MetaData } from '../types'; import ImageNotDownloaded from './ImageNotDownloaded'; diff --git a/src/domain/image/erase/erase.ts b/src/domain/image/erase/erase.ts index ea8d43b6..bd2c02cd 100644 --- a/src/domain/image/erase/erase.ts +++ b/src/domain/image/erase/erase.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; diff --git a/src/domain/image/getById/retrieveData.ts b/src/domain/image/getById/retrieveData.ts index c02d3622..2813caf2 100644 --- a/src/domain/image/getById/retrieveData.ts +++ b/src/domain/image/getById/retrieveData.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import { DataModel } from '../types'; diff --git a/src/domain/image/getById/retrieveFile.ts b/src/domain/image/getById/retrieveFile.ts index df925039..ab507e33 100644 --- a/src/domain/image/getById/retrieveFile.ts +++ b/src/domain/image/getById/retrieveFile.ts @@ -1,5 +1,5 @@ -import fileStore from '^/integrations/filestore/module'; +import fileStore from '^/integrations/filestore'; export default async function retrieveFile(storageKey: string): Promise { diff --git a/src/domain/image/save/InvalidImage.ts b/src/domain/image/save/InvalidImage.ts index 63ba232f..b25f8ea3 100644 --- a/src/domain/image/save/InvalidImage.ts +++ b/src/domain/image/save/InvalidImage.ts @@ -1,5 +1,5 @@ -import { ValidationError } from '^/integrations/runtime/module'; +import { ValidationError } from '^/integrations/runtime'; export default class InvalidImage extends ValidationError { diff --git a/src/domain/image/save/fileExists.ts b/src/domain/image/save/fileExists.ts index 7c2f8aed..0513a3cd 100644 --- a/src/domain/image/save/fileExists.ts +++ b/src/domain/image/save/fileExists.ts @@ -1,5 +1,5 @@ -import fileStore from '^/integrations/filestore/module'; +import fileStore from '^/integrations/filestore'; export default async function fileExists(storageKey: string): Promise { diff --git a/src/domain/image/save/insertData.ts b/src/domain/image/save/insertData.ts index 8a4b8ddd..764eeeb9 100644 --- a/src/domain/image/save/insertData.ts +++ b/src/domain/image/save/insertData.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/image/save/insertFile.ts b/src/domain/image/save/insertFile.ts index 900e07df..772e5a12 100644 --- a/src/domain/image/save/insertFile.ts +++ b/src/domain/image/save/insertFile.ts @@ -1,5 +1,5 @@ -import fileStore from '^/integrations/filestore/module'; +import fileStore from '^/integrations/filestore'; export default async function insertFile(path: string, buffer: Buffer): Promise { diff --git a/src/domain/image/save/validateData.ts b/src/domain/image/save/validateData.ts index c43ae4fe..78f3e458 100644 --- a/src/domain/image/save/validateData.ts +++ b/src/domain/image/save/validateData.ts @@ -1,5 +1,5 @@ -import validator, { ValidationSchema } from '^/integrations/validation/module'; +import validator, { ValidationSchema } from '^/integrations/validation'; import { requiredStringValidation } from '../definitions'; import { DataModel } from '../types'; diff --git a/src/domain/image/validate/InvalidImage.ts b/src/domain/image/validate/InvalidImage.ts index 63ba232f..b25f8ea3 100644 --- a/src/domain/image/validate/InvalidImage.ts +++ b/src/domain/image/validate/InvalidImage.ts @@ -1,5 +1,5 @@ -import { ValidationError } from '^/integrations/runtime/module'; +import { ValidationError } from '^/integrations/runtime'; export default class InvalidImage extends ValidationError { diff --git a/src/domain/image/validate/validate.ts b/src/domain/image/validate/validate.ts index b5ef0bfe..f470bd20 100644 --- a/src/domain/image/validate/validate.ts +++ b/src/domain/image/validate/validate.ts @@ -1,5 +1,5 @@ -import validator, { ValidationSchema } from '^/integrations/validation/module'; +import validator, { ValidationSchema } from '^/integrations/validation'; import type { MetaData } from '../types'; diff --git a/src/domain/notification/create/create.ts b/src/domain/notification/create/create.ts index b0cc2e39..e09126d2 100644 --- a/src/domain/notification/create/create.ts +++ b/src/domain/notification/create/create.ts @@ -1,5 +1,5 @@ -import logger from '^/integrations/logging/module'; +import logger from '^/integrations/logging'; import { Type } from '../definitions'; import createData from './createData'; diff --git a/src/domain/notification/create/insertData.ts b/src/domain/notification/create/insertData.ts index 6e41fd2a..05efd4c9 100644 --- a/src/domain/notification/create/insertData.ts +++ b/src/domain/notification/create/insertData.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import { DataModel } from '../types'; diff --git a/src/domain/notification/getById/getById.ts b/src/domain/notification/getById/getById.ts index 73bf5931..954137d2 100644 --- a/src/domain/notification/getById/getById.ts +++ b/src/domain/notification/getById/getById.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/notification/getRecent/getRecent.ts b/src/domain/notification/getRecent/getRecent.ts index b10ba77f..049190fe 100644 --- a/src/domain/notification/getRecent/getRecent.ts +++ b/src/domain/notification/getRecent/getRecent.ts @@ -1,5 +1,5 @@ -import database, { RecordQuery, RecordSort, SortDirections } from '^/integrations/database/module'; +import database, { RecordQuery, RecordSort, SortDirections } from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/notification/getRecentAggregated/getRecentAggregated.ts b/src/domain/notification/getRecentAggregated/getRecentAggregated.ts index 644b450a..93f94392 100644 --- a/src/domain/notification/getRecentAggregated/getRecentAggregated.ts +++ b/src/domain/notification/getRecentAggregated/getRecentAggregated.ts @@ -1,7 +1,7 @@ import { Requester } from '^/domain/authentication'; import validateRange, { Range } from '^/domain/common/validateRange'; -import logger from '^/integrations/logging/module'; +import logger from '^/integrations/logging'; import aggregate, { AggregatedData } from '../aggregate'; import getRecent from '../getRecent'; diff --git a/src/domain/post/PostNotFound.ts b/src/domain/post/PostNotFound.ts index a2fa520e..c5a3fbea 100644 --- a/src/domain/post/PostNotFound.ts +++ b/src/domain/post/PostNotFound.ts @@ -1,5 +1,5 @@ -import { NotFound } from '^/integrations/runtime/module'; +import { NotFound } from '^/integrations/runtime'; export default class PostNotFound extends NotFound { diff --git a/src/domain/post/add/add.ts b/src/domain/post/add/add.ts index 39272310..f7cc4ca8 100644 --- a/src/domain/post/add/add.ts +++ b/src/domain/post/add/add.ts @@ -1,5 +1,5 @@ -import logger from '^/integrations/logging/module'; +import logger from '^/integrations/logging'; import { Requester } from '^/domain/authentication'; import createComic from '^/domain/comic/create'; diff --git a/src/domain/post/create/insertData.ts b/src/domain/post/create/insertData.ts index 2c1a0b3e..1742358e 100644 --- a/src/domain/post/create/insertData.ts +++ b/src/domain/post/create/insertData.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/post/erase/erase.ts b/src/domain/post/erase/erase.ts index ea8d43b6..bd2c02cd 100644 --- a/src/domain/post/erase/erase.ts +++ b/src/domain/post/erase/erase.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; diff --git a/src/domain/post/explore/retrieveData.ts b/src/domain/post/explore/retrieveData.ts index 01cf8df4..086774c1 100644 --- a/src/domain/post/explore/retrieveData.ts +++ b/src/domain/post/explore/retrieveData.ts @@ -1,5 +1,5 @@ -import database, { RecordQuery, RecordSort, SortDirections } from '^/integrations/database/module'; +import database, { RecordQuery, RecordSort, SortDirections } from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/post/exploreAggregated/exploreAggregated.ts b/src/domain/post/exploreAggregated/exploreAggregated.ts index d7d3411e..76ee6555 100644 --- a/src/domain/post/exploreAggregated/exploreAggregated.ts +++ b/src/domain/post/exploreAggregated/exploreAggregated.ts @@ -1,7 +1,7 @@ import { Requester } from '^/domain/authentication'; import validateRange, { Range } from '^/domain/common/validateRange'; -import logger from '^/integrations/logging/module'; +import logger from '^/integrations/logging'; import aggregate, { AggregatedData } from '../aggregate'; import explore from '../explore'; diff --git a/src/domain/post/getAll/getAll.ts b/src/domain/post/getAll/getAll.ts index 0313742b..d3cee7e1 100644 --- a/src/domain/post/getAll/getAll.ts +++ b/src/domain/post/getAll/getAll.ts @@ -1,5 +1,5 @@ -import database, { RecordQuery, RecordSort, SortDirections } from '^/integrations/database/module'; +import database, { RecordQuery, RecordSort, SortDirections } from '^/integrations/database'; import { Requester } from '^/domain/authentication'; diff --git a/src/domain/post/getAllAggregated/getAllAggregated.ts b/src/domain/post/getAllAggregated/getAllAggregated.ts index b1ad53e9..ca40eb85 100644 --- a/src/domain/post/getAllAggregated/getAllAggregated.ts +++ b/src/domain/post/getAllAggregated/getAllAggregated.ts @@ -1,7 +1,7 @@ import { Requester } from '^/domain/authentication'; import validateRange, { Range } from '^/domain/common/validateRange'; -import logger from '^/integrations/logging/module'; +import logger from '^/integrations/logging'; import aggregate, { AggregatedData } from '../aggregate'; import getAll from '../getAll'; diff --git a/src/domain/post/getByCreator/getByCreator.ts b/src/domain/post/getByCreator/getByCreator.ts index 5c403ace..8779bfb8 100644 --- a/src/domain/post/getByCreator/getByCreator.ts +++ b/src/domain/post/getByCreator/getByCreator.ts @@ -1,5 +1,5 @@ -import database, { RecordQuery, RecordSort, SortDirections } from '^/integrations/database/module'; +import database, { RecordQuery, RecordSort, SortDirections } from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/post/getByCreatorAggregated/getByCreatorAggregated.ts b/src/domain/post/getByCreatorAggregated/getByCreatorAggregated.ts index 1d2e0b7f..244dde71 100644 --- a/src/domain/post/getByCreatorAggregated/getByCreatorAggregated.ts +++ b/src/domain/post/getByCreatorAggregated/getByCreatorAggregated.ts @@ -1,7 +1,7 @@ import { Requester } from '^/domain/authentication'; import validateRange, { Range } from '^/domain/common/validateRange'; -import logger from '^/integrations/logging/module'; +import logger from '^/integrations/logging'; import aggregate, { AggregatedData } from '../aggregate'; import getByCreator from '../getByCreator'; diff --git a/src/domain/post/getByFollowing/retrieveData.ts b/src/domain/post/getByFollowing/retrieveData.ts index 7d9ca90f..7a7c8170 100644 --- a/src/domain/post/getByFollowing/retrieveData.ts +++ b/src/domain/post/getByFollowing/retrieveData.ts @@ -1,5 +1,5 @@ -import database, { RecordQuery, RecordSort, SortDirections } from '^/integrations/database/module'; +import database, { RecordQuery, RecordSort, SortDirections } from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/post/getByFollowingAggregated/getByFollowingAggregated.ts b/src/domain/post/getByFollowingAggregated/getByFollowingAggregated.ts index 195a384d..f619e94a 100644 --- a/src/domain/post/getByFollowingAggregated/getByFollowingAggregated.ts +++ b/src/domain/post/getByFollowingAggregated/getByFollowingAggregated.ts @@ -1,7 +1,7 @@ import { Requester } from '^/domain/authentication'; import validateRange, { Range } from '^/domain/common/validateRange'; -import logger from '^/integrations/logging/module'; +import logger from '^/integrations/logging'; import aggregate, { AggregatedData } from '../aggregate'; import getByFollowing from '../getByFollowing'; diff --git a/src/domain/post/getById/getById.ts b/src/domain/post/getById/getById.ts index a9411e58..7ddf9061 100644 --- a/src/domain/post/getById/getById.ts +++ b/src/domain/post/getById/getById.ts @@ -1,5 +1,5 @@ -import database, { RecordQuery } from '^/integrations/database/module'; +import database, { RecordQuery } from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import PostNotFound from '../PostNotFound'; diff --git a/src/domain/post/remove/deleteData.ts b/src/domain/post/remove/deleteData.ts index a3b59a7b..2f66f82a 100644 --- a/src/domain/post/remove/deleteData.ts +++ b/src/domain/post/remove/deleteData.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; diff --git a/src/domain/post/remove/ownsData.ts b/src/domain/post/remove/ownsData.ts index fefb20a0..88de230e 100644 --- a/src/domain/post/remove/ownsData.ts +++ b/src/domain/post/remove/ownsData.ts @@ -1,5 +1,5 @@ -import database, { RecordQuery } from '^/integrations/database/module'; +import database, { RecordQuery } from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; diff --git a/src/domain/post/remove/remove.ts b/src/domain/post/remove/remove.ts index fd769fab..f85c3ea1 100644 --- a/src/domain/post/remove/remove.ts +++ b/src/domain/post/remove/remove.ts @@ -1,5 +1,5 @@ -import logger from '^/integrations/logging/module'; +import logger from '^/integrations/logging'; import { Requester } from '^/domain/authentication'; import updateCreatorPostCount from '^/domain/creator/updatePostCount'; diff --git a/src/domain/post/toggleRating/toggleRating.ts b/src/domain/post/toggleRating/toggleRating.ts index e77d496c..d29b277f 100644 --- a/src/domain/post/toggleRating/toggleRating.ts +++ b/src/domain/post/toggleRating/toggleRating.ts @@ -1,5 +1,5 @@ -import logger from '^/integrations/logging/module'; +import logger from '^/integrations/logging'; import { Requester } from '^/domain/authentication'; import { Types } from '^/domain/notification'; diff --git a/src/domain/post/update/update.ts b/src/domain/post/update/update.ts index b5585ab0..d0b7e846 100644 --- a/src/domain/post/update/update.ts +++ b/src/domain/post/update/update.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/rating/exists/exists.ts b/src/domain/rating/exists/exists.ts index 4a5b45d6..581424f4 100644 --- a/src/domain/rating/exists/exists.ts +++ b/src/domain/rating/exists/exists.ts @@ -1,5 +1,5 @@ -import database, { RecordQuery } from '^/integrations/database/module'; +import database, { RecordQuery } from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; diff --git a/src/domain/rating/update/InvalidRating.ts b/src/domain/rating/update/InvalidRating.ts index 8e23d23e..312959b9 100644 --- a/src/domain/rating/update/InvalidRating.ts +++ b/src/domain/rating/update/InvalidRating.ts @@ -1,5 +1,5 @@ -import { ValidationError } from '^/integrations/runtime/module'; +import { ValidationError } from '^/integrations/runtime'; export default class InvalidRating extends ValidationError { diff --git a/src/domain/rating/update/eraseData.ts b/src/domain/rating/update/eraseData.ts index c4395509..63cd83be 100644 --- a/src/domain/rating/update/eraseData.ts +++ b/src/domain/rating/update/eraseData.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; diff --git a/src/domain/rating/update/getData.ts b/src/domain/rating/update/getData.ts index 78a56965..f485e297 100644 --- a/src/domain/rating/update/getData.ts +++ b/src/domain/rating/update/getData.ts @@ -1,5 +1,5 @@ -import database, { RecordQuery } from '^/integrations/database/module'; +import database, { RecordQuery } from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; diff --git a/src/domain/rating/update/insertData.ts b/src/domain/rating/update/insertData.ts index 4d6557a3..49294e73 100644 --- a/src/domain/rating/update/insertData.ts +++ b/src/domain/rating/update/insertData.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import { DataModel } from '../types'; diff --git a/src/domain/rating/update/validateData.ts b/src/domain/rating/update/validateData.ts index 996f960f..22786e36 100644 --- a/src/domain/rating/update/validateData.ts +++ b/src/domain/rating/update/validateData.ts @@ -1,5 +1,5 @@ -import validator, { ValidationSchema } from '^/integrations/validation/module'; +import validator, { ValidationSchema } from '^/integrations/validation'; import { optionalIdValidation } from '^/domain/definitions'; import InvalidRating from './InvalidRating'; diff --git a/src/domain/reaction/create/InvalidReaction.ts b/src/domain/reaction/create/InvalidReaction.ts index 5bd522ea..02c1caaa 100644 --- a/src/domain/reaction/create/InvalidReaction.ts +++ b/src/domain/reaction/create/InvalidReaction.ts @@ -1,5 +1,5 @@ -import { ValidationError } from '^/integrations/runtime/module'; +import { ValidationError } from '^/integrations/runtime'; export default class InvalidReaction extends ValidationError { diff --git a/src/domain/reaction/create/create.ts b/src/domain/reaction/create/create.ts index 5e5951b0..9373bc5b 100644 --- a/src/domain/reaction/create/create.ts +++ b/src/domain/reaction/create/create.ts @@ -1,5 +1,5 @@ -import logger from '^/integrations/logging/module'; +import logger from '^/integrations/logging'; import updateReactionCount from '^/domain/post/updateReactionCount'; diff --git a/src/domain/reaction/create/eraseData.ts b/src/domain/reaction/create/eraseData.ts index c4395509..63cd83be 100644 --- a/src/domain/reaction/create/eraseData.ts +++ b/src/domain/reaction/create/eraseData.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; diff --git a/src/domain/reaction/create/insertData.ts b/src/domain/reaction/create/insertData.ts index 9a609b97..f451f0de 100644 --- a/src/domain/reaction/create/insertData.ts +++ b/src/domain/reaction/create/insertData.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import { DataModel } from '../types'; diff --git a/src/domain/reaction/create/validateData.ts b/src/domain/reaction/create/validateData.ts index a0d17de8..b499cb6c 100644 --- a/src/domain/reaction/create/validateData.ts +++ b/src/domain/reaction/create/validateData.ts @@ -1,5 +1,5 @@ -import validator, { ValidationSchema } from '^/integrations/validation/module'; +import validator, { ValidationSchema } from '^/integrations/validation'; import { optionalIdValidation, requiredIdValidation } from '^/domain/definitions'; diff --git a/src/domain/reaction/getById/getById.ts b/src/domain/reaction/getById/getById.ts index 73bf5931..954137d2 100644 --- a/src/domain/reaction/getById/getById.ts +++ b/src/domain/reaction/getById/getById.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/reaction/getByPost/getByPost.ts b/src/domain/reaction/getByPost/getByPost.ts index 11c3e532..cd2c725e 100644 --- a/src/domain/reaction/getByPost/getByPost.ts +++ b/src/domain/reaction/getByPost/getByPost.ts @@ -1,5 +1,5 @@ -import database, { RecordQuery, RecordSort, SortDirections } from '^/integrations/database/module'; +import database, { RecordQuery, RecordSort, SortDirections } from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/reaction/getByPostAggregated/getByPostAggregated.ts b/src/domain/reaction/getByPostAggregated/getByPostAggregated.ts index 3bbdcbb0..842038e7 100644 --- a/src/domain/reaction/getByPostAggregated/getByPostAggregated.ts +++ b/src/domain/reaction/getByPostAggregated/getByPostAggregated.ts @@ -1,7 +1,7 @@ import { Requester } from '^/domain/authentication'; import { Range } from '^/domain/common/validateRange'; -import logger from '^/integrations/logging/module'; +import logger from '^/integrations/logging'; import aggregate, { AggregatedData } from '../aggregate'; import getByPost from '../getByPost'; diff --git a/src/domain/reaction/remove/ReactionNotFound.ts b/src/domain/reaction/remove/ReactionNotFound.ts index 26c44a95..37c628d4 100644 --- a/src/domain/reaction/remove/ReactionNotFound.ts +++ b/src/domain/reaction/remove/ReactionNotFound.ts @@ -1,5 +1,5 @@ -import { NotFound } from '^/integrations/runtime/module'; +import { NotFound } from '^/integrations/runtime'; export default class ReactionNotFound extends NotFound { diff --git a/src/domain/reaction/remove/deleteData.ts b/src/domain/reaction/remove/deleteData.ts index bdd873cf..52eeeab2 100644 --- a/src/domain/reaction/remove/deleteData.ts +++ b/src/domain/reaction/remove/deleteData.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; diff --git a/src/domain/reaction/remove/remove.ts b/src/domain/reaction/remove/remove.ts index 4cc0c167..b13f6607 100644 --- a/src/domain/reaction/remove/remove.ts +++ b/src/domain/reaction/remove/remove.ts @@ -1,5 +1,5 @@ -import logger from '^/integrations/logging/module'; +import logger from '^/integrations/logging'; import { Requester } from '^/domain/authentication'; import updateReactionCount from '^/domain/post/updateReactionCount'; diff --git a/src/domain/reaction/remove/retrieveOwnedData.ts b/src/domain/reaction/remove/retrieveOwnedData.ts index 388139e2..a878972c 100644 --- a/src/domain/reaction/remove/retrieveOwnedData.ts +++ b/src/domain/reaction/remove/retrieveOwnedData.ts @@ -1,5 +1,5 @@ -import database, { RecordQuery } from '^/integrations/database/module'; +import database, { RecordQuery } from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/reaction/toggleRating/toggleRating.ts b/src/domain/reaction/toggleRating/toggleRating.ts index 0ef9173f..1f935ceb 100644 --- a/src/domain/reaction/toggleRating/toggleRating.ts +++ b/src/domain/reaction/toggleRating/toggleRating.ts @@ -1,5 +1,5 @@ -import logger from '^/integrations/logging/module'; +import logger from '^/integrations/logging'; import { Requester } from '^/domain/authentication'; import { Types } from '^/domain/notification'; diff --git a/src/domain/reaction/update/update.ts b/src/domain/reaction/update/update.ts index b5585ab0..d0b7e846 100644 --- a/src/domain/reaction/update/update.ts +++ b/src/domain/reaction/update/update.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/relation/establish/InvalidRelation.ts b/src/domain/relation/establish/InvalidRelation.ts index dc0f48b0..795eba14 100644 --- a/src/domain/relation/establish/InvalidRelation.ts +++ b/src/domain/relation/establish/InvalidRelation.ts @@ -1,5 +1,5 @@ -import { ValidationError } from '^/integrations/runtime/module'; +import { ValidationError } from '^/integrations/runtime'; export default class InvalidRelation extends ValidationError { diff --git a/src/domain/relation/establish/RelationAlreadyExists.ts b/src/domain/relation/establish/RelationAlreadyExists.ts index 73dd52b4..8c862f66 100644 --- a/src/domain/relation/establish/RelationAlreadyExists.ts +++ b/src/domain/relation/establish/RelationAlreadyExists.ts @@ -1,5 +1,5 @@ -import { BadRequest } from '^/integrations/runtime/module'; +import { BadRequest } from '^/integrations/runtime'; export default class RelationAlreadyExists extends BadRequest { diff --git a/src/domain/relation/establish/dataExists.ts b/src/domain/relation/establish/dataExists.ts index 2114c5cf..138172e6 100644 --- a/src/domain/relation/establish/dataExists.ts +++ b/src/domain/relation/establish/dataExists.ts @@ -1,5 +1,5 @@ -import database, { RecordQuery } from '^/integrations/database/module'; +import database, { RecordQuery } from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; diff --git a/src/domain/relation/establish/eraseData.ts b/src/domain/relation/establish/eraseData.ts index c4395509..63cd83be 100644 --- a/src/domain/relation/establish/eraseData.ts +++ b/src/domain/relation/establish/eraseData.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; diff --git a/src/domain/relation/establish/establish.ts b/src/domain/relation/establish/establish.ts index ecaae908..e80845a1 100644 --- a/src/domain/relation/establish/establish.ts +++ b/src/domain/relation/establish/establish.ts @@ -1,5 +1,5 @@ -import logger from '^/integrations/logging/module'; +import logger from '^/integrations/logging'; import { Requester } from '^/domain/authentication'; import updateFollowerCount from '^/domain/creator/updateFollowerCount'; diff --git a/src/domain/relation/establish/insertData.ts b/src/domain/relation/establish/insertData.ts index 8a4b8ddd..764eeeb9 100644 --- a/src/domain/relation/establish/insertData.ts +++ b/src/domain/relation/establish/insertData.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/relation/establish/validateData.ts b/src/domain/relation/establish/validateData.ts index d288ffe2..46e9b2ee 100644 --- a/src/domain/relation/establish/validateData.ts +++ b/src/domain/relation/establish/validateData.ts @@ -1,5 +1,5 @@ -import validator, { ValidationSchema } from '^/integrations/validation/module'; +import validator, { ValidationSchema } from '^/integrations/validation'; import { requiredIdValidation } from '^/domain/definitions'; diff --git a/src/domain/relation/get/get.ts b/src/domain/relation/get/get.ts index 24b17bdc..c68ae707 100644 --- a/src/domain/relation/get/get.ts +++ b/src/domain/relation/get/get.ts @@ -1,5 +1,5 @@ -import database, { RecordQuery } from '^/integrations/database/module'; +import database, { RecordQuery } from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/relation/getFollowers/retrieveData.ts b/src/domain/relation/getFollowers/retrieveData.ts index e22c7c0d..f6375ff3 100644 --- a/src/domain/relation/getFollowers/retrieveData.ts +++ b/src/domain/relation/getFollowers/retrieveData.ts @@ -1,5 +1,5 @@ -import database, { RecordQuery } from '^/integrations/database/module'; +import database, { RecordQuery } from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/domain/relation/getFollowing/retrieveData.ts b/src/domain/relation/getFollowing/retrieveData.ts index 902e9475..dba2225a 100644 --- a/src/domain/relation/getFollowing/retrieveData.ts +++ b/src/domain/relation/getFollowing/retrieveData.ts @@ -1,5 +1,5 @@ -import database, { RecordQuery } from '^/integrations/database/module'; +import database, { RecordQuery } from '^/integrations/database'; import { RECORD_TYPE } from '../definitions'; import type { DataModel } from '../types'; diff --git a/src/integrations/database/module.ts b/src/integrations/database/index.ts similarity index 100% rename from src/integrations/database/module.ts rename to src/integrations/database/index.ts diff --git a/src/integrations/filestore/module.ts b/src/integrations/filestore/index.ts similarity index 100% rename from src/integrations/filestore/module.ts rename to src/integrations/filestore/index.ts diff --git a/src/integrations/http/module.ts b/src/integrations/http/index.ts similarity index 100% rename from src/integrations/http/module.ts rename to src/integrations/http/index.ts diff --git a/src/integrations/logging/module.ts b/src/integrations/logging/index.ts similarity index 100% rename from src/integrations/logging/module.ts rename to src/integrations/logging/index.ts diff --git a/src/integrations/notification/module.ts b/src/integrations/notification/index.ts similarity index 100% rename from src/integrations/notification/module.ts rename to src/integrations/notification/index.ts diff --git a/src/integrations/runtime/databaseHealthCheck.ts b/src/integrations/runtime/databaseHealthCheck.ts index 78a14d62..56e8f475 100644 --- a/src/integrations/runtime/databaseHealthCheck.ts +++ b/src/integrations/runtime/databaseHealthCheck.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database/index.js'; import DatabaseHealthCheck from './healthchecks/DatabaseHealthCheck.js'; diff --git a/src/integrations/runtime/fileStoreHealthCheck.ts b/src/integrations/runtime/fileStoreHealthCheck.ts index 7321a1ab..89b713e1 100644 --- a/src/integrations/runtime/fileStoreHealthCheck.ts +++ b/src/integrations/runtime/fileStoreHealthCheck.ts @@ -1,5 +1,5 @@ -import fileStore from '^/integrations/filestore/module'; +import fileStore from '^/integrations/filestore'; import FileStoreHealthCheck from './healthchecks/FileStoreHealthCheck'; diff --git a/src/integrations/runtime/healthchecks/DatabaseHealthCheck.ts b/src/integrations/runtime/healthchecks/DatabaseHealthCheck.ts index 1c6148b3..c498b847 100644 --- a/src/integrations/runtime/healthchecks/DatabaseHealthCheck.ts +++ b/src/integrations/runtime/healthchecks/DatabaseHealthCheck.ts @@ -1,7 +1,7 @@ import { HealthCheck } from 'jitar'; -import type { Database } from '^/integrations/database/module'; +import type { Database } from '^/integrations/database'; export default class DatabaseHealthCheck implements HealthCheck { diff --git a/src/integrations/runtime/module.ts b/src/integrations/runtime/index.ts similarity index 100% rename from src/integrations/runtime/module.ts rename to src/integrations/runtime/index.ts diff --git a/src/integrations/runtime/notificationHealthCheck.ts b/src/integrations/runtime/notificationHealthCheck.ts index 74a0942a..7c839463 100644 --- a/src/integrations/runtime/notificationHealthCheck.ts +++ b/src/integrations/runtime/notificationHealthCheck.ts @@ -1,5 +1,5 @@ -import notificationService from '^/integrations/notification/module'; +import notificationService from '^/integrations/notification'; import NotificationHealthCheck from './healthchecks/NotificationHealthCheck'; diff --git a/src/integrations/runtime/setUpNode.ts b/src/integrations/runtime/setUpNode.ts index b8fbed08..b672c314 100644 --- a/src/integrations/runtime/setUpNode.ts +++ b/src/integrations/runtime/setUpNode.ts @@ -1,7 +1,7 @@ -import database from '^/integrations/database/module'; -import fileStore from '^/integrations/filestore/module'; -import notificationService from '^/integrations/notification/module'; +import database from '^/integrations/database'; +import fileStore from '^/integrations/filestore'; +import notificationService from '^/integrations/notification'; try { diff --git a/src/integrations/runtime/tearDownNode.ts b/src/integrations/runtime/tearDownNode.ts index f4d12340..ffccbe06 100644 --- a/src/integrations/runtime/tearDownNode.ts +++ b/src/integrations/runtime/tearDownNode.ts @@ -1,7 +1,7 @@ -import database from '^/integrations/database/module'; -import fileStore from '^/integrations/filestore/module'; -import notificationService from '^/integrations/notification/module'; +import database from '^/integrations/database'; +import fileStore from '^/integrations/filestore'; +import notificationService from '^/integrations/notification'; const disconnections = []; diff --git a/src/integrations/validation/module.ts b/src/integrations/validation/index.ts similarity index 100% rename from src/integrations/validation/module.ts rename to src/integrations/validation/index.ts diff --git a/test/domain/authentication/fixtures/databases.fixture.ts b/test/domain/authentication/fixtures/databases.fixture.ts index b1cce33d..b5d310dd 100644 --- a/test/domain/authentication/fixtures/databases.fixture.ts +++ b/test/domain/authentication/fixtures/databases.fixture.ts @@ -1,6 +1,6 @@ import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator'; -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORDS } from './records.fixture'; diff --git a/test/domain/authentication/fixtures/fileStores.fixture.ts b/test/domain/authentication/fixtures/fileStores.fixture.ts index 67506be3..94f8503d 100644 --- a/test/domain/authentication/fixtures/fileStores.fixture.ts +++ b/test/domain/authentication/fixtures/fileStores.fixture.ts @@ -1,5 +1,5 @@ -import fileStore from '^/integrations/filestore/module'; +import fileStore from '^/integrations/filestore'; fileStore.connect(); diff --git a/test/domain/authentication/fixtures/httpClients.fixture.ts b/test/domain/authentication/fixtures/httpClients.fixture.ts index 834d7cb6..7ea28d91 100644 --- a/test/domain/authentication/fixtures/httpClients.fixture.ts +++ b/test/domain/authentication/fixtures/httpClients.fixture.ts @@ -1,5 +1,5 @@ -import httpClient, { HTTP_METHODS } from '^/integrations/http/module'; +import httpClient, { HTTP_METHODS } from '^/integrations/http'; import { IMAGES } from './images.fixture'; import { VALUES } from './values.fixture'; diff --git a/test/domain/authentication/fixtures/records.fixture.ts b/test/domain/authentication/fixtures/records.fixture.ts index 6c08712a..1de0fd3f 100644 --- a/test/domain/authentication/fixtures/records.fixture.ts +++ b/test/domain/authentication/fixtures/records.fixture.ts @@ -1,5 +1,5 @@ -import { RecordData } from '^/integrations/database/module'; +import { RecordData } from '^/integrations/database'; import { VALUES } from './values.fixture'; diff --git a/test/domain/comic/create.spec.ts b/test/domain/comic/create.spec.ts index b52ac2d6..3dda4344 100644 --- a/test/domain/comic/create.spec.ts +++ b/test/domain/comic/create.spec.ts @@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it } from 'vitest'; import create from '^/domain/comic/create/create'; import { RECORD_TYPE as COMIC_RECORD_TYPE } from '^/domain/comic/definitions'; -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { DATABASES, FILE_STORES, VALUES } from './fixtures'; diff --git a/test/domain/comic/fixtures/databases.fixture.ts b/test/domain/comic/fixtures/databases.fixture.ts index 87fe1d65..54971410 100644 --- a/test/domain/comic/fixtures/databases.fixture.ts +++ b/test/domain/comic/fixtures/databases.fixture.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; database.connect(); diff --git a/test/domain/comic/fixtures/fileStores.fixture.ts b/test/domain/comic/fixtures/fileStores.fixture.ts index 67506be3..94f8503d 100644 --- a/test/domain/comic/fixtures/fileStores.fixture.ts +++ b/test/domain/comic/fixtures/fileStores.fixture.ts @@ -1,5 +1,5 @@ -import fileStore from '^/integrations/filestore/module'; +import fileStore from '^/integrations/filestore'; fileStore.connect(); diff --git a/test/domain/comment/create.spec.ts b/test/domain/comment/create.spec.ts index 3b6ec791..bc816c65 100644 --- a/test/domain/comment/create.spec.ts +++ b/test/domain/comment/create.spec.ts @@ -4,7 +4,7 @@ import { describe, expect, it } from 'vitest'; import { RECORD_TYPE } from '^/domain/comment'; import create, { InvalidComment } from '^/domain/comment/create'; -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { VALUES } from './fixtures'; diff --git a/test/domain/creator/fixtures/databases.fixture.ts b/test/domain/creator/fixtures/databases.fixture.ts index e4825d91..c9018de5 100644 --- a/test/domain/creator/fixtures/databases.fixture.ts +++ b/test/domain/creator/fixtures/databases.fixture.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator'; diff --git a/test/domain/creator/fixtures/records.fixture.ts b/test/domain/creator/fixtures/records.fixture.ts index a9fa63f9..bf7bf975 100644 --- a/test/domain/creator/fixtures/records.fixture.ts +++ b/test/domain/creator/fixtures/records.fixture.ts @@ -1,5 +1,5 @@ -import { RecordData } from '^/integrations/database/module'; +import { RecordData } from '^/integrations/database'; import { VALUES } from './values.fixture'; diff --git a/test/domain/creator/updateFullName.spec.ts b/test/domain/creator/updateFullName.spec.ts index 00e70cec..312c5811 100644 --- a/test/domain/creator/updateFullName.spec.ts +++ b/test/domain/creator/updateFullName.spec.ts @@ -5,7 +5,7 @@ import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator'; import InvalidCreator from '^/domain/creator/InvalidCreator'; import updateFullName from '^/domain/creator/updateFullName'; -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { DATABASES, REQUESTERS, VALUES } from './fixtures'; diff --git a/test/domain/creator/updateNickname.spec.ts b/test/domain/creator/updateNickname.spec.ts index 90ccbc49..6bc36368 100644 --- a/test/domain/creator/updateNickname.spec.ts +++ b/test/domain/creator/updateNickname.spec.ts @@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it } from 'vitest'; import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator'; import updateNickname, { NicknameAlreadyExists } from '^/domain/creator/updateNickname'; -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { DATABASES, REQUESTERS, VALUES } from './fixtures'; diff --git a/test/domain/image/create.spec.ts b/test/domain/image/create.spec.ts index 31914e7d..502033cb 100644 --- a/test/domain/image/create.spec.ts +++ b/test/domain/image/create.spec.ts @@ -5,8 +5,8 @@ import { RECORD_TYPE } from '^/domain/image'; import create, { InvalidDataURL } from '^/domain/image/create'; import InvalidImage from '^/domain/image/validate/InvalidImage'; -import database from '^/integrations/database/module'; -import fileStore from '^/integrations/filestore/module'; +import database from '^/integrations/database'; +import fileStore from '^/integrations/filestore'; import { DATA_URLS, DATABASES, FILE_STORES } from './fixtures'; diff --git a/test/domain/image/download.spec.ts b/test/domain/image/download.spec.ts index 5e10dafe..9621401c 100644 --- a/test/domain/image/download.spec.ts +++ b/test/domain/image/download.spec.ts @@ -5,8 +5,8 @@ import { RECORD_TYPE } from '^/domain/image'; import download, { ImageNotDownloaded } from '^/domain/image/download'; import InvalidImage from '^/domain/image/validate/InvalidImage'; -import database from '^/integrations/database/module'; -import fileStore from '^/integrations/filestore/module'; +import database from '^/integrations/database'; +import fileStore from '^/integrations/filestore'; import { DATABASES, FILE_STORES, HTTP_CLIENTS, URLS } from './fixtures'; diff --git a/test/domain/image/fixtures/databases.fixture.ts b/test/domain/image/fixtures/databases.fixture.ts index a0d6ec0d..6001e32f 100644 --- a/test/domain/image/fixtures/databases.fixture.ts +++ b/test/domain/image/fixtures/databases.fixture.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; database.connect(); diff --git a/test/domain/image/fixtures/fileStores.fixture.ts b/test/domain/image/fixtures/fileStores.fixture.ts index 67506be3..94f8503d 100644 --- a/test/domain/image/fixtures/fileStores.fixture.ts +++ b/test/domain/image/fixtures/fileStores.fixture.ts @@ -1,5 +1,5 @@ -import fileStore from '^/integrations/filestore/module'; +import fileStore from '^/integrations/filestore'; fileStore.connect(); diff --git a/test/domain/image/fixtures/httpClients.fixture.ts b/test/domain/image/fixtures/httpClients.fixture.ts index c6749b9a..396acdf4 100644 --- a/test/domain/image/fixtures/httpClients.fixture.ts +++ b/test/domain/image/fixtures/httpClients.fixture.ts @@ -1,5 +1,5 @@ -import httpClient, { HTTP_METHODS } from '^/integrations/http/module'; +import httpClient, { HTTP_METHODS } from '^/integrations/http'; import { RESPONSES } from './responses.fixture'; import { URLS } from './urls.fixture'; diff --git a/test/domain/notification/create.spec.ts b/test/domain/notification/create.spec.ts index 10984733..d1bf4afe 100644 --- a/test/domain/notification/create.spec.ts +++ b/test/domain/notification/create.spec.ts @@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it } from 'vitest'; import { RECORD_TYPE as NOTIFICATION_RECORD_TYPE, Types } from '^/domain/notification'; import create from '^/domain/notification/create'; -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { DATABASES } from './fixtures/databases.fixture'; import { REQUESTERS } from './fixtures/requesters.fixture'; diff --git a/test/domain/notification/fixtures/databases.fixture.ts b/test/domain/notification/fixtures/databases.fixture.ts index 405b4254..d171401a 100644 --- a/test/domain/notification/fixtures/databases.fixture.ts +++ b/test/domain/notification/fixtures/databases.fixture.ts @@ -7,7 +7,7 @@ import { RECORD_TYPE as POST_RECORD_TYPE } from '^/domain/post'; import { RECORD_TYPE as RATING_RECORD_TYPE } from '^/domain/rating'; import { RECORD_TYPE as REACTION_RECORD_TYPE } from '^/domain/reaction'; -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORDS } from './records.fixture'; diff --git a/test/domain/notification/fixtures/fileStores.fixture.ts b/test/domain/notification/fixtures/fileStores.fixture.ts index d522b9c6..50145d54 100644 --- a/test/domain/notification/fixtures/fileStores.fixture.ts +++ b/test/domain/notification/fixtures/fileStores.fixture.ts @@ -1,5 +1,5 @@ -import fileStore from '^/integrations/filestore/module'; +import fileStore from '^/integrations/filestore'; import { FILES } from './files.fixture'; import { VALUES } from './values.fixture'; diff --git a/test/domain/notification/fixtures/records.fixture.ts b/test/domain/notification/fixtures/records.fixture.ts index f4e5ba0c..f2ee72ea 100644 --- a/test/domain/notification/fixtures/records.fixture.ts +++ b/test/domain/notification/fixtures/records.fixture.ts @@ -1,5 +1,5 @@ -import { RecordData } from '^/integrations/database/module'; +import { RecordData } from '^/integrations/database'; import { Types } from '^/domain/notification'; import { REQUESTERS } from './requesters.fixture'; diff --git a/test/domain/post/add.spec.ts b/test/domain/post/add.spec.ts index 48e68a3e..079ea47b 100644 --- a/test/domain/post/add.spec.ts +++ b/test/domain/post/add.spec.ts @@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it } from 'vitest'; import { RECORD_TYPE as POST_RECORD_TYPE } from '^/domain/post'; import add from '^/domain/post/add'; -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { DATABASES, DATA_URLS, FILE_STORES, REQUESTERS } from './fixtures'; diff --git a/test/domain/post/fixtures/databases.fixture.ts b/test/domain/post/fixtures/databases.fixture.ts index 66aa8288..638de880 100644 --- a/test/domain/post/fixtures/databases.fixture.ts +++ b/test/domain/post/fixtures/databases.fixture.ts @@ -6,7 +6,7 @@ import { RECORD_TYPE as POST_RECORD_TYPE } from '^/domain/post'; import { RECORD_TYPE as RATING_RECORD_TYPE } from '^/domain/rating'; import { RECORD_TYPE as RELATION_RECORD_TYPE } from '^/domain/relation'; -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORDS } from './records.fixture'; diff --git a/test/domain/post/fixtures/fileStores.fixture.ts b/test/domain/post/fixtures/fileStores.fixture.ts index 7290d40b..2c46102b 100644 --- a/test/domain/post/fixtures/fileStores.fixture.ts +++ b/test/domain/post/fixtures/fileStores.fixture.ts @@ -1,5 +1,5 @@ -import fileStore from '^/integrations/filestore/module'; +import fileStore from '^/integrations/filestore'; import { FILES } from './files.fixture'; import { VALUES } from './values.fixture'; diff --git a/test/domain/post/fixtures/queries.fixture.ts b/test/domain/post/fixtures/queries.fixture.ts index 9d970532..59d36b78 100644 --- a/test/domain/post/fixtures/queries.fixture.ts +++ b/test/domain/post/fixtures/queries.fixture.ts @@ -1,5 +1,5 @@ -import { RecordQuery } from '^/integrations/database/module'; +import { RecordQuery } from '^/integrations/database'; import { REQUESTERS } from './requesters.fixture'; import { VALUES } from './values.fixture'; diff --git a/test/domain/post/fixtures/records.fixture.ts b/test/domain/post/fixtures/records.fixture.ts index 74f9205e..3eeabb8e 100644 --- a/test/domain/post/fixtures/records.fixture.ts +++ b/test/domain/post/fixtures/records.fixture.ts @@ -1,5 +1,5 @@ -import { RecordData } from '^/integrations/database/module'; +import { RecordData } from '^/integrations/database'; import { REQUESTERS } from './requesters.fixture'; import { VALUES } from './values.fixture'; diff --git a/test/domain/post/remove.spec.ts b/test/domain/post/remove.spec.ts index d85da0bb..b7f97167 100644 --- a/test/domain/post/remove.spec.ts +++ b/test/domain/post/remove.spec.ts @@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it } from 'vitest'; import { PostNotFound, RECORD_TYPE } from '^/domain/post'; import remove from '^/domain/post/remove'; -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { DATABASES, REQUESTERS, VALUES } from './fixtures'; diff --git a/test/domain/post/toggleRating.spec.ts b/test/domain/post/toggleRating.spec.ts index 4dc5340b..d934129c 100644 --- a/test/domain/post/toggleRating.spec.ts +++ b/test/domain/post/toggleRating.spec.ts @@ -5,7 +5,7 @@ import { PostNotFound } from '^/domain/post'; import toggleRating from '^/domain/post/toggleRating'; import { RECORD_TYPE } from '^/domain/rating'; -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { DATABASES, QUERIES, REQUESTERS, VALUES } from './fixtures'; diff --git a/test/domain/rating/fixtures/databases.fixture.ts b/test/domain/rating/fixtures/databases.fixture.ts index a0d6ec0d..6001e32f 100644 --- a/test/domain/rating/fixtures/databases.fixture.ts +++ b/test/domain/rating/fixtures/databases.fixture.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; database.connect(); diff --git a/test/domain/reaction/create.spec.ts b/test/domain/reaction/create.spec.ts index 84d24f15..bc3b0d6c 100644 --- a/test/domain/reaction/create.spec.ts +++ b/test/domain/reaction/create.spec.ts @@ -5,7 +5,7 @@ import { PostNotFound } from '^/domain/post'; import { RECORD_TYPE as REACTION_RECORD_TYPE } from '^/domain/reaction'; import create, { InvalidReaction } from '^/domain/reaction/create'; -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { DATABASES, FILE_STORES, REQUESTERS, VALUES } from './fixtures'; diff --git a/test/domain/reaction/createComic.spec.ts b/test/domain/reaction/createComic.spec.ts index 52a63bff..ac63a275 100644 --- a/test/domain/reaction/createComic.spec.ts +++ b/test/domain/reaction/createComic.spec.ts @@ -5,7 +5,7 @@ import { RECORD_TYPE as POST_RECORD_TYPE } from '^/domain/post'; import { RECORD_TYPE as REACTION_RECORD_TYPE } from '^/domain/reaction'; import create from '^/domain/reaction/createWithComic'; -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { DATABASES, FILE_STORES, REQUESTERS, VALUES } from './fixtures'; diff --git a/test/domain/reaction/createComment.spec.ts b/test/domain/reaction/createComment.spec.ts index 45a0f8d8..229ca09c 100644 --- a/test/domain/reaction/createComment.spec.ts +++ b/test/domain/reaction/createComment.spec.ts @@ -5,7 +5,7 @@ import { RECORD_TYPE as POST_RECORD_TYPE } from '^/domain/post'; import { RECORD_TYPE as REACTION_RECORD_TYPE } from '^/domain/reaction'; import create from '^/domain/reaction/createWithComment'; -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { DATABASES, FILE_STORES, REQUESTERS, VALUES } from './fixtures'; diff --git a/test/domain/reaction/fixtures/databases.fixture.ts b/test/domain/reaction/fixtures/databases.fixture.ts index e6c77345..47f7dad4 100644 --- a/test/domain/reaction/fixtures/databases.fixture.ts +++ b/test/domain/reaction/fixtures/databases.fixture.ts @@ -7,7 +7,7 @@ import { RECORD_TYPE as POST_RECORD_TYPE } from '^/domain/post'; import { RECORD_TYPE as RATING_RECORD_TYPE } from '^/domain/rating'; import { RECORD_TYPE as REACTION_RECORD_TYPE } from '^/domain/reaction'; -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORDS } from './records.fixture'; diff --git a/test/domain/reaction/fixtures/fileStores.fixture.ts b/test/domain/reaction/fixtures/fileStores.fixture.ts index 5061456b..56c9b5f6 100644 --- a/test/domain/reaction/fixtures/fileStores.fixture.ts +++ b/test/domain/reaction/fixtures/fileStores.fixture.ts @@ -1,5 +1,5 @@ -import fileStore from '^/integrations/filestore/module'; +import fileStore from '^/integrations/filestore'; import { FILES } from './files.fixture'; import { VALUES } from './values.fixture'; diff --git a/test/domain/reaction/fixtures/queries.fixture.ts b/test/domain/reaction/fixtures/queries.fixture.ts index 7d2fe4eb..eb39527f 100644 --- a/test/domain/reaction/fixtures/queries.fixture.ts +++ b/test/domain/reaction/fixtures/queries.fixture.ts @@ -1,5 +1,5 @@ -import { RecordQuery } from '^/integrations/database/module'; +import { RecordQuery } from '^/integrations/database'; import { REQUESTERS } from './requesters.fixture'; import { VALUES } from './values.fixture'; diff --git a/test/domain/reaction/fixtures/records.fixture.ts b/test/domain/reaction/fixtures/records.fixture.ts index a6797053..8ad29881 100644 --- a/test/domain/reaction/fixtures/records.fixture.ts +++ b/test/domain/reaction/fixtures/records.fixture.ts @@ -1,5 +1,5 @@ -import { RecordData } from '^/integrations/database/module'; +import { RecordData } from '^/integrations/database'; import { REQUESTERS } from './requesters.fixture'; import { VALUES } from './values.fixture'; diff --git a/test/domain/reaction/remove.spec.ts b/test/domain/reaction/remove.spec.ts index 186e9ca8..fe08e845 100644 --- a/test/domain/reaction/remove.spec.ts +++ b/test/domain/reaction/remove.spec.ts @@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it } from 'vitest'; import { RECORD_TYPE as REACTION_RECORD_TYPE } from '^/domain/reaction'; import remove, { ReactionNotFound } from '^/domain/reaction/remove'; -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { DATABASES, REQUESTERS, VALUES } from './fixtures'; diff --git a/test/domain/reaction/toggleRating.spec.ts b/test/domain/reaction/toggleRating.spec.ts index 41354f1d..d9257896 100644 --- a/test/domain/reaction/toggleRating.spec.ts +++ b/test/domain/reaction/toggleRating.spec.ts @@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it } from 'vitest'; import { RECORD_TYPE as RATING_RECORD_TYPE } from '^/domain/rating'; import toggleRating from '^/domain/reaction/toggleRating'; -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { DATABASES, QUERIES, REQUESTERS, VALUES } from './fixtures'; diff --git a/test/domain/relation/establish.spec.ts b/test/domain/relation/establish.spec.ts index 212ed5bc..d64c310e 100644 --- a/test/domain/relation/establish.spec.ts +++ b/test/domain/relation/establish.spec.ts @@ -5,7 +5,7 @@ import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator'; import { RECORD_TYPE as RELATION_RECORD_TYPE } from '^/domain/relation'; import establish, { InvalidRelation, RelationAlreadyExists } from '^/domain/relation/establish'; -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { DATABASES, QUERIES, REQUESTERS, VALUES } from './fixtures'; diff --git a/test/domain/relation/fixtures/databases.fixture.ts b/test/domain/relation/fixtures/databases.fixture.ts index b065d1c1..bb8fdc25 100644 --- a/test/domain/relation/fixtures/databases.fixture.ts +++ b/test/domain/relation/fixtures/databases.fixture.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPE as CREATOR_RECORD_TYPE } from '^/domain/creator'; import { RECORD_TYPE as RELATION_RECORD_TYPE } from '^/domain/relation'; diff --git a/test/domain/relation/fixtures/queries.fixture.ts b/test/domain/relation/fixtures/queries.fixture.ts index 78643a04..cab89327 100644 --- a/test/domain/relation/fixtures/queries.fixture.ts +++ b/test/domain/relation/fixtures/queries.fixture.ts @@ -1,5 +1,5 @@ -import { RecordQuery } from '^/integrations/database/module'; +import { RecordQuery } from '^/integrations/database'; import { REQUESTERS } from './requesters.fixture'; import { VALUES } from './values.fixture'; diff --git a/test/domain/relation/fixtures/records.fixture.ts b/test/domain/relation/fixtures/records.fixture.ts index 6fde3cb5..bb5a31cf 100644 --- a/test/domain/relation/fixtures/records.fixture.ts +++ b/test/domain/relation/fixtures/records.fixture.ts @@ -1,5 +1,5 @@ -import { RecordData } from '^/integrations/database/module'; +import { RecordData } from '^/integrations/database'; import { VALUES } from './values.fixture'; diff --git a/test/integrations/database/fixtures/databases.fixture.ts b/test/integrations/database/fixtures/databases.fixture.ts index 26caeb3a..837042b7 100644 --- a/test/integrations/database/fixtures/databases.fixture.ts +++ b/test/integrations/database/fixtures/databases.fixture.ts @@ -1,5 +1,5 @@ -import database from '^/integrations/database/module'; +import database from '^/integrations/database'; import { RECORD_TYPES, RECORDS } from './records.fixture'; diff --git a/test/integrations/database/fixtures/queries.fixture.ts b/test/integrations/database/fixtures/queries.fixture.ts index e50e0372..5c16d34c 100644 --- a/test/integrations/database/fixtures/queries.fixture.ts +++ b/test/integrations/database/fixtures/queries.fixture.ts @@ -1,5 +1,5 @@ -import { RecordQuery } from '^/integrations/database/module'; +import { RecordQuery } from '^/integrations/database'; import { RECORDS } from './records.fixture'; diff --git a/test/integrations/database/fixtures/records.fixture.ts b/test/integrations/database/fixtures/records.fixture.ts index 98156fec..3d6d3592 100644 --- a/test/integrations/database/fixtures/records.fixture.ts +++ b/test/integrations/database/fixtures/records.fixture.ts @@ -1,5 +1,5 @@ -import { RecordData } from '^/integrations/database/module'; +import { RecordData } from '^/integrations/database'; export const RECORD_TYPES = { diff --git a/test/integrations/database/fixtures/results.fixture.ts b/test/integrations/database/fixtures/results.fixture.ts index c3a83f09..afa1523d 100644 --- a/test/integrations/database/fixtures/results.fixture.ts +++ b/test/integrations/database/fixtures/results.fixture.ts @@ -1,5 +1,5 @@ -import { RecordData } from '^/integrations/database/module'; +import { RecordData } from '^/integrations/database'; import { RECORDS } from './records.fixture'; diff --git a/test/integrations/database/fixtures/sorts.fixture.ts b/test/integrations/database/fixtures/sorts.fixture.ts index 2e071eae..80c25b61 100644 --- a/test/integrations/database/fixtures/sorts.fixture.ts +++ b/test/integrations/database/fixtures/sorts.fixture.ts @@ -1,5 +1,5 @@ -import { RecordSort, SortDirections } from '^/integrations/database/module'; +import { RecordSort, SortDirections } from '^/integrations/database'; export const SORTS: Record = { diff --git a/test/integrations/database/implementation.spec.ts b/test/integrations/database/implementation.spec.ts index a76130ad..00e5a90c 100644 --- a/test/integrations/database/implementation.spec.ts +++ b/test/integrations/database/implementation.spec.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import database, { RecordNotFound, RecordNotUpdated } from '^/integrations/database/module'; +import database, { RecordNotFound, RecordNotUpdated } from '^/integrations/database'; import { DATABASES, QUERIES, RECORDS, RECORD_TYPES, RESULTS, SORTS, VALUES } from './fixtures'; diff --git a/test/integrations/filestorage/fixtures/fileStores.fixture.ts b/test/integrations/filestorage/fixtures/fileStores.fixture.ts index af6214bf..5f349438 100644 --- a/test/integrations/filestorage/fixtures/fileStores.fixture.ts +++ b/test/integrations/filestorage/fixtures/fileStores.fixture.ts @@ -1,5 +1,5 @@ -import fileStore from '^/integrations/filestore/module'; +import fileStore from '^/integrations/filestore'; import { FILES } from './files.fixture'; import { VALUES } from './values.fixture'; diff --git a/test/integrations/filestorage/implementation.spec.ts b/test/integrations/filestorage/implementation.spec.ts index cd829d4d..a18d80d2 100644 --- a/test/integrations/filestorage/implementation.spec.ts +++ b/test/integrations/filestorage/implementation.spec.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import fileStore, { FileNotFound } from '^/integrations/filestore/module'; +import fileStore, { FileNotFound } from '^/integrations/filestore'; import { FILES, FILE_STORES, VALUES } from './fixtures'; diff --git a/test/integrations/notification/fixtures/notificationServices.fixture.ts b/test/integrations/notification/fixtures/notificationServices.fixture.ts index 1b369864..47e3ba59 100644 --- a/test/integrations/notification/fixtures/notificationServices.fixture.ts +++ b/test/integrations/notification/fixtures/notificationServices.fixture.ts @@ -1,5 +1,5 @@ -import notificationService from '^/integrations/notification/module'; +import notificationService from '^/integrations/notification'; import { VALUES } from './values.fixture'; diff --git a/test/integrations/notification/implementation.spec.ts b/test/integrations/notification/implementation.spec.ts index f10a4991..87e6095e 100644 --- a/test/integrations/notification/implementation.spec.ts +++ b/test/integrations/notification/implementation.spec.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import notificationService, { SubscriptionNotFound } from '^/integrations/notification/module'; +import notificationService, { SubscriptionNotFound } from '^/integrations/notification'; import { NOTIFICATION_SERVICES, VALUES } from './fixtures'; diff --git a/test/integrations/validation/fixtures/validationSchemes.fixture.ts b/test/integrations/validation/fixtures/validationSchemes.fixture.ts index cdb14030..ed0d5e3c 100644 --- a/test/integrations/validation/fixtures/validationSchemes.fixture.ts +++ b/test/integrations/validation/fixtures/validationSchemes.fixture.ts @@ -1,5 +1,5 @@ -import { ValidationSchema } from '^/integrations/validation/module'; +import { ValidationSchema } from '^/integrations/validation'; import { VALUES } from './values.fixture'; diff --git a/test/integrations/validation/implementation.spec.ts b/test/integrations/validation/implementation.spec.ts index f80a4131..88991623 100644 --- a/test/integrations/validation/implementation.spec.ts +++ b/test/integrations/validation/implementation.spec.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from 'vitest'; -import validator, { ValidationSchema } from '^/integrations/validation/module'; +import validator, { ValidationSchema } from '^/integrations/validation'; import { VALIDATION_SCHEMES, VALUES } from './fixtures'; From 8f7323865d9512e0480601abfca0fe01912c650b Mon Sep 17 00:00:00 2001 From: Peter van Vliet Date: Fri, 10 Jan 2025 16:11:17 +0100 Subject: [PATCH 08/14] #361: updated resource list to use the index files --- resources/global.resources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/global.resources.json b/resources/global.resources.json index b4c647ca..c2d9ce01 100644 --- a/resources/global.resources.json +++ b/resources/global.resources.json @@ -1,6 +1,6 @@ [ "./integrations/authentication", - "./integrations/database/module", - "./integrations/filestore/module", - "./integrations/notification/module" + "./integrations/database", + "./integrations/filestore", + "./integrations/notification" ] \ No newline at end of file From c488cc7f0ddaf9945ef54cb26b754192a32cc2c5 Mon Sep 17 00:00:00 2001 From: Bas Meeuwissen Date: Fri, 10 Jan 2025 21:29:22 +0100 Subject: [PATCH 09/14] #361: logger is also a resource --- resources/global.resources.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/global.resources.json b/resources/global.resources.json index c2d9ce01..16327ec6 100644 --- a/resources/global.resources.json +++ b/resources/global.resources.json @@ -2,5 +2,6 @@ "./integrations/authentication", "./integrations/database", "./integrations/filestore", + "./integrations/logging", "./integrations/notification" ] \ No newline at end of file From e17e5912aa786cadbb95d002273f74da2a460c02 Mon Sep 17 00:00:00 2001 From: Bas Meeuwissen Date: Fri, 10 Jan 2025 21:56:10 +0100 Subject: [PATCH 10/14] #361: .resources.json not required as extension --- resources/{global.resources.json => global.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename resources/{global.resources.json => global.json} (100%) diff --git a/resources/global.resources.json b/resources/global.json similarity index 100% rename from resources/global.resources.json rename to resources/global.json From 957d6db7e20eeff4411ef289bc606bf870af2fbf Mon Sep 17 00:00:00 2001 From: Peter van Vliet Date: Fri, 10 Jan 2025 22:32:09 +0100 Subject: [PATCH 11/14] #368: upgraded Jitar to v0.9 --- package-lock.json | 22 +++++++++++----------- package.json | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index ea492df3..44a87eaf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.0", "dependencies": { "dayjs": "^1.11.13", - "jitar": "^0.8.2", + "jitar": "^0.9.0", "minio": "^8.0.3", "mongodb": "^6.12.0", "openid-client": "^5.7.1", @@ -21,7 +21,7 @@ "zod": "^3.24.1" }, "devDependencies": { - "@jitar/plugin-vite": "^0.8.2", + "@jitar/plugin-vite": "^0.9.0", "@types/node": "22.10.5", "@types/react": "^19.0.0", "@types/react-dom": "^19.0.0", @@ -2599,13 +2599,13 @@ } }, "node_modules/@jitar/plugin-vite": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/@jitar/plugin-vite/-/plugin-vite-0.8.2.tgz", - "integrity": "sha512-G2QSJKH+ad5xrQqQZdwe2pv3ilSm9zPVTrqVqKyRwuYaEPLBJN2JE4vnjJjnnWeWycSKS32DIh6Mj0g91P9YJA==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@jitar/plugin-vite/-/plugin-vite-0.9.0.tgz", + "integrity": "sha512-NeXzNFY4Dwon3yz3ycWCOVID87tN5jASBmEM2GcqWBILI7vRKY5HFayhVcILsOBl60R5CnLMevFjjvSFPxlBGQ==", "dev": true, "license": "MIT", "peerDependencies": { - "vite": ">=4.0.0 || >=5.0.0" + "vite": ">=4.0.0 || >=5.0.0 || >=6.0.0" }, "peerDependenciesMeta": { "vite": { @@ -7063,13 +7063,13 @@ } }, "node_modules/jitar": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/jitar/-/jitar-0.8.2.tgz", - "integrity": "sha512-3Ymdxc047t93qqfqaxbQZrXL7UUjYW32ru/bGdtB66O0rqRMFiukXACokN3myObIKXTQQJZJrqUq+6+XXAw1UA==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/jitar/-/jitar-0.9.0.tgz", + "integrity": "sha512-nvnQmUeRCvK4l1NNXvWpsVdK3oMlP3AoX++XcXI4tdpL93VFDXEZxWLj2cqKUNYUSnE7Obyy/I7RuYgSONI9jQ==", "license": "MIT", "dependencies": { - "dotenv": "^16.4.5", - "express": "^4.19.2", + "dotenv": "^16.4.7", + "express": "^4.21.2", "fs-extra": "^11.2.0", "glob": "11.0.0", "mime-types": "^2.1.35" diff --git a/package.json b/package.json index b681fa67..e4a51b14 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ ], "dependencies": { "dayjs": "^1.11.13", - "jitar": "^0.8.2", + "jitar": "^0.9.0", "minio": "^8.0.3", "mongodb": "^6.12.0", "openid-client": "^5.7.1", @@ -51,7 +51,7 @@ "zod": "^3.24.1" }, "devDependencies": { - "@jitar/plugin-vite": "^0.8.2", + "@jitar/plugin-vite": "^0.9.0", "@types/node": "22.10.5", "@types/react": "^19.0.0", "@types/react-dom": "^19.0.0", From 80c62dbb399343bb662d1a28d9fafc273a1afa39 Mon Sep 17 00:00:00 2001 From: Peter van Vliet Date: Fri, 10 Jan 2025 23:06:27 +0100 Subject: [PATCH 12/14] #368: removed .js extentions --- .../authentication/definitions/interfaces.ts | 2 +- .../authentication/errors/NotConnected.ts | 2 +- .../errors/UnknownImplementation.ts | 2 +- .../authentication/implementation.ts | 6 +++--- .../implementations/openid/OpenID.ts | 6 +++--- .../implementations/openid/create.ts | 2 +- src/integrations/authentication/index.ts | 13 ++++++------ src/integrations/database/Database.ts | 6 +++--- .../database/definitions/interfaces.ts | 2 +- .../database/errors/NotConnected.ts | 2 +- .../database/errors/RecordNotCreated.ts | 2 +- .../database/errors/RecordNotDeleted.ts | 2 +- .../database/errors/RecordNotFound.ts | 2 +- .../database/errors/RecordNotUpdated.ts | 2 +- .../database/errors/UnknownImplementation.ts | 2 +- src/integrations/database/implementation.ts | 8 ++++---- .../database/implementations/memory/Memory.ts | 12 +++++------ .../database/implementations/memory/create.ts | 2 +- .../implementations/mongodb/MongoDb.ts | 18 ++++++++--------- .../implementations/mongodb/create.ts | 2 +- src/integrations/database/index.ts | 20 +++++++++---------- .../filestore/errors/FileNotFound.ts | 2 +- .../filestore/errors/NotConnected.ts | 2 +- .../filestore/errors/UnknownImplementation.ts | 2 +- src/integrations/filestore/implementation.ts | 8 ++++---- .../implementations/memory/Memory.ts | 6 +++--- .../implementations/memory/create.ts | 2 +- .../implementations/minio/MinioFS.ts | 6 +++--- .../filestore/implementations/minio/create.ts | 2 +- src/integrations/filestore/index.ts | 11 +++++----- src/integrations/http/Client.ts | 4 ++-- .../http/errors/UnknownImplementation.ts | 2 +- src/integrations/http/implementation.ts | 6 +++--- .../http/implementations/fetch/Fetch.ts | 4 ++-- src/integrations/http/index.ts | 6 +++--- .../notification/errors/NotConnected.ts | 2 +- .../errors/SubscriptionNotFound.ts | 2 +- .../errors/UnknownImplementation.ts | 2 +- .../notification/implementation.ts | 8 ++++---- .../implementations/memory/Memory.ts | 4 ++-- .../implementations/memory/create.ts | 2 +- .../implementations/webpush/WebPush.ts | 4 ++-- .../implementations/webpush/create.ts | 2 +- src/integrations/notification/index.ts | 11 +++++----- .../runtime/databaseHealthCheck.ts | 4 ++-- src/integrations/runtime/index.ts | 10 +++++----- .../validation/definitions/interfaces.ts | 2 +- .../errors/UnknownImplementation.ts | 2 +- .../validation/errors/UnknownValidator.ts | 2 +- src/integrations/validation/implementation.ts | 6 +++--- .../validation/implementations/zod/Zod.ts | 10 +++++----- .../validation/implementations/zod/create.ts | 2 +- src/integrations/validation/index.ts | 13 ++++++------ 53 files changed, 135 insertions(+), 131 deletions(-) diff --git a/src/integrations/authentication/definitions/interfaces.ts b/src/integrations/authentication/definitions/interfaces.ts index 4f619645..f7bb4416 100644 --- a/src/integrations/authentication/definitions/interfaces.ts +++ b/src/integrations/authentication/definitions/interfaces.ts @@ -1,5 +1,5 @@ -import { Session } from './types.js'; +import { Session } from './types'; export interface IdentityProvider { diff --git a/src/integrations/authentication/errors/NotConnected.ts b/src/integrations/authentication/errors/NotConnected.ts index 8c0e1e49..68aeecba 100644 --- a/src/integrations/authentication/errors/NotConnected.ts +++ b/src/integrations/authentication/errors/NotConnected.ts @@ -1,5 +1,5 @@ -import AuthenticationError from './AuthenticationError.js'; +import AuthenticationError from './AuthenticationError'; export default class NotConnected extends AuthenticationError { diff --git a/src/integrations/authentication/errors/UnknownImplementation.ts b/src/integrations/authentication/errors/UnknownImplementation.ts index 0ddb71de..13e875bc 100644 --- a/src/integrations/authentication/errors/UnknownImplementation.ts +++ b/src/integrations/authentication/errors/UnknownImplementation.ts @@ -1,5 +1,5 @@ -import AuthenticationError from './AuthenticationError.js'; +import AuthenticationError from './AuthenticationError'; export default class UnknownImplementation extends AuthenticationError { diff --git a/src/integrations/authentication/implementation.ts b/src/integrations/authentication/implementation.ts index a6ea2cd8..2c6b0cdf 100644 --- a/src/integrations/authentication/implementation.ts +++ b/src/integrations/authentication/implementation.ts @@ -1,7 +1,7 @@ -import { IdentityProvider } from './definitions/interfaces.js'; -import UnknownImplementation from './errors/UnknownImplementation.js'; -import createOpenID from './implementations/openid/create.js'; +import { IdentityProvider } from './definitions/interfaces'; +import UnknownImplementation from './errors/UnknownImplementation'; +import createOpenID from './implementations/openid/create'; const implementations = new Map IdentityProvider>([ ['openid', createOpenID], diff --git a/src/integrations/authentication/implementations/openid/OpenID.ts b/src/integrations/authentication/implementations/openid/OpenID.ts index 6d6e4daf..067feeab 100644 --- a/src/integrations/authentication/implementations/openid/OpenID.ts +++ b/src/integrations/authentication/implementations/openid/OpenID.ts @@ -1,9 +1,9 @@ import { AuthorizationParameters, BaseClient, ClientMetadata, Issuer } from 'openid-client'; -import { IdentityProvider } from '../../definitions/interfaces.js'; -import { Identity, Session } from '../../definitions/types.js'; -import NotConnected from '../../errors/NotConnected.js'; +import { IdentityProvider } from '../../definitions/interfaces'; +import { Identity, Session } from '../../definitions/types'; +import NotConnected from '../../errors/NotConnected'; type OpenIDConfiguration = { issuer: string; diff --git a/src/integrations/authentication/implementations/openid/create.ts b/src/integrations/authentication/implementations/openid/create.ts index 115111dd..ed2b5309 100644 --- a/src/integrations/authentication/implementations/openid/create.ts +++ b/src/integrations/authentication/implementations/openid/create.ts @@ -1,5 +1,5 @@ -import OpenID from './OpenID.js'; +import OpenID from './OpenID'; export default function create(): OpenID { diff --git a/src/integrations/authentication/index.ts b/src/integrations/authentication/index.ts index 5a40ae8d..46a3a6e0 100644 --- a/src/integrations/authentication/index.ts +++ b/src/integrations/authentication/index.ts @@ -1,7 +1,8 @@ -export * from './definitions/interfaces.js'; -export * from './definitions/types.js'; -export { default as AuthenticationError } from './errors/AuthenticationError.js'; -export { default as NotConnected } from './errors/NotConnected.js'; -export { default as UnknownImplementation } from './errors/UnknownImplementation.js'; -export { default } from './implementation.js'; +export * from './definitions/interfaces'; +export * from './definitions/types'; +export { default as AuthenticationError } from './errors/AuthenticationError'; +export { default as NotConnected } from './errors/NotConnected'; +export { default as UnknownImplementation } from './errors/UnknownImplementation'; +export { default } from './implementation'; + diff --git a/src/integrations/database/Database.ts b/src/integrations/database/Database.ts index c8947da1..fe7da949 100644 --- a/src/integrations/database/Database.ts +++ b/src/integrations/database/Database.ts @@ -1,8 +1,8 @@ -import { sanitize } from '^/integrations/utilities/sanitize.js'; +import { sanitize } from '^/integrations/utilities/sanitize'; -import { Driver } from './definitions/interfaces.js'; -import { RecordData, RecordField, RecordId, RecordQuery, RecordSort, RecordType } from './definitions/types.js'; +import { Driver } from './definitions/interfaces'; +import { RecordData, RecordField, RecordId, RecordQuery, RecordSort, RecordType } from './definitions/types'; export default class Database implements Driver { diff --git a/src/integrations/database/definitions/interfaces.ts b/src/integrations/database/definitions/interfaces.ts index e37f2698..f0717656 100644 --- a/src/integrations/database/definitions/interfaces.ts +++ b/src/integrations/database/definitions/interfaces.ts @@ -1,5 +1,5 @@ -import { RecordData, RecordField, RecordId, RecordQuery, RecordSort, RecordType } from './types.js'; +import { RecordData, RecordField, RecordId, RecordQuery, RecordSort, RecordType } from './types'; export interface Driver { diff --git a/src/integrations/database/errors/NotConnected.ts b/src/integrations/database/errors/NotConnected.ts index 41702717..c68f5472 100644 --- a/src/integrations/database/errors/NotConnected.ts +++ b/src/integrations/database/errors/NotConnected.ts @@ -1,5 +1,5 @@ -import DatabaseError from './DatabaseError.js'; +import DatabaseError from './DatabaseError'; export default class NotConnected extends DatabaseError { diff --git a/src/integrations/database/errors/RecordNotCreated.ts b/src/integrations/database/errors/RecordNotCreated.ts index af5c097b..d496bd30 100644 --- a/src/integrations/database/errors/RecordNotCreated.ts +++ b/src/integrations/database/errors/RecordNotCreated.ts @@ -1,5 +1,5 @@ -import DatabaseError from './DatabaseError.js'; +import DatabaseError from './DatabaseError'; export default class RecordNotCreated extends DatabaseError { diff --git a/src/integrations/database/errors/RecordNotDeleted.ts b/src/integrations/database/errors/RecordNotDeleted.ts index de599cad..2030e734 100644 --- a/src/integrations/database/errors/RecordNotDeleted.ts +++ b/src/integrations/database/errors/RecordNotDeleted.ts @@ -1,5 +1,5 @@ -import DatabaseError from './DatabaseError.js'; +import DatabaseError from './DatabaseError'; export default class RecordNotDeleted extends DatabaseError { diff --git a/src/integrations/database/errors/RecordNotFound.ts b/src/integrations/database/errors/RecordNotFound.ts index c9fb3426..23495975 100644 --- a/src/integrations/database/errors/RecordNotFound.ts +++ b/src/integrations/database/errors/RecordNotFound.ts @@ -1,5 +1,5 @@ -import DatabaseError from './DatabaseError.js'; +import DatabaseError from './DatabaseError'; export default class RecordNotFound extends DatabaseError { diff --git a/src/integrations/database/errors/RecordNotUpdated.ts b/src/integrations/database/errors/RecordNotUpdated.ts index 5b8821ca..044ffa5d 100644 --- a/src/integrations/database/errors/RecordNotUpdated.ts +++ b/src/integrations/database/errors/RecordNotUpdated.ts @@ -1,5 +1,5 @@ -import DatabaseError from './DatabaseError.js'; +import DatabaseError from './DatabaseError'; export default class RecordNotUpdated extends DatabaseError { diff --git a/src/integrations/database/errors/UnknownImplementation.ts b/src/integrations/database/errors/UnknownImplementation.ts index 415c8f63..9f21ddc7 100644 --- a/src/integrations/database/errors/UnknownImplementation.ts +++ b/src/integrations/database/errors/UnknownImplementation.ts @@ -1,5 +1,5 @@ -import DatabaseError from './DatabaseError.js'; +import DatabaseError from './DatabaseError'; export default class UnknownImplementation extends DatabaseError { diff --git a/src/integrations/database/implementation.ts b/src/integrations/database/implementation.ts index e2ff8a9b..f615311d 100644 --- a/src/integrations/database/implementation.ts +++ b/src/integrations/database/implementation.ts @@ -1,8 +1,8 @@ -import { Driver } from './definitions/interfaces.js'; -import UnknownImplementation from './errors/UnknownImplementation.js'; -import createMemoryDb from './implementations/memory/create.js'; -import createMongoDb from './implementations/mongodb/create.js'; +import { Driver } from './definitions/interfaces'; +import UnknownImplementation from './errors/UnknownImplementation'; +import createMemoryDb from './implementations/memory/create'; +import createMongoDb from './implementations/mongodb/create'; const implementations = new Map Driver>([ ['memory', createMemoryDb], diff --git a/src/integrations/database/implementations/memory/Memory.ts b/src/integrations/database/implementations/memory/Memory.ts index b47aa104..c9a54a35 100644 --- a/src/integrations/database/implementations/memory/Memory.ts +++ b/src/integrations/database/implementations/memory/Memory.ts @@ -1,10 +1,10 @@ -import { LogicalOperators, QueryOperators, SortDirections } from '../../definitions/constants.js'; -import { Driver } from '../../definitions/interfaces.js'; -import { QueryExpression, QueryMultiExpressionStatement, QueryOperator, QuerySingleExpressionStatement, QueryStatement, RecordData, RecordField, RecordQuery, RecordSort, RecordValue } from '../../definitions/types.js'; -import NotConnected from '../../errors/NotConnected.js'; -import RecordNotFound from '../../errors/RecordNotFound.js'; -import RecordNotUpdated from '../../errors/RecordNotUpdated.js'; +import { LogicalOperators, QueryOperators, SortDirections } from '../../definitions/constants'; +import { Driver } from '../../definitions/interfaces'; +import { QueryExpression, QueryMultiExpressionStatement, QueryOperator, QuerySingleExpressionStatement, QueryStatement, RecordData, RecordField, RecordQuery, RecordSort, RecordValue } from '../../definitions/types'; +import NotConnected from '../../errors/NotConnected'; +import RecordNotFound from '../../errors/RecordNotFound'; +import RecordNotUpdated from '../../errors/RecordNotUpdated'; type FilterFunction = (record: RecordData) => boolean; diff --git a/src/integrations/database/implementations/memory/create.ts b/src/integrations/database/implementations/memory/create.ts index 7eeb21c8..171ae9fb 100644 --- a/src/integrations/database/implementations/memory/create.ts +++ b/src/integrations/database/implementations/memory/create.ts @@ -1,5 +1,5 @@ -import Memory from './Memory.js'; +import Memory from './Memory'; export default function create(): Memory { diff --git a/src/integrations/database/implementations/mongodb/MongoDb.ts b/src/integrations/database/implementations/mongodb/MongoDb.ts index 557e6869..0b11ecbf 100644 --- a/src/integrations/database/implementations/mongodb/MongoDb.ts +++ b/src/integrations/database/implementations/mongodb/MongoDb.ts @@ -3,15 +3,15 @@ import { Collection, Db, Document, Filter, MongoClient, Sort } from 'mongodb'; -import { ID, LogicalOperators, QueryOperators, SortDirections } from '../../definitions/constants.js'; -import { Driver } from '../../definitions/interfaces.js'; -import { QueryMultiExpressionStatement, QueryOperator, QuerySingleExpressionStatement, RecordData, RecordField, RecordId, RecordQuery, RecordSort, RecordType, RecordValue } from '../../definitions/types.js'; -import DatabaseError from '../../errors/DatabaseError.js'; -import NotConnected from '../../errors/NotConnected.js'; -import RecordNotCreated from '../../errors/RecordNotCreated.js'; -import RecordNotDeleted from '../../errors/RecordNotDeleted.js'; -import RecordNotFound from '../../errors/RecordNotFound.js'; -import RecordNotUpdated from '../../errors/RecordNotUpdated.js'; +import { ID, LogicalOperators, QueryOperators, SortDirections } from '../../definitions/constants'; +import { Driver } from '../../definitions/interfaces'; +import { QueryMultiExpressionStatement, QueryOperator, QuerySingleExpressionStatement, RecordData, RecordField, RecordId, RecordQuery, RecordSort, RecordType, RecordValue } from '../../definitions/types'; +import DatabaseError from '../../errors/DatabaseError'; +import NotConnected from '../../errors/NotConnected'; +import RecordNotCreated from '../../errors/RecordNotCreated'; +import RecordNotDeleted from '../../errors/RecordNotDeleted'; +import RecordNotFound from '../../errors/RecordNotFound'; +import RecordNotUpdated from '../../errors/RecordNotUpdated'; const UNKNOWN_ERROR = 'Unknown error'; diff --git a/src/integrations/database/implementations/mongodb/create.ts b/src/integrations/database/implementations/mongodb/create.ts index c065a70b..3a23d98b 100644 --- a/src/integrations/database/implementations/mongodb/create.ts +++ b/src/integrations/database/implementations/mongodb/create.ts @@ -1,5 +1,5 @@ -import MongoDb from './MongoDb.js'; +import MongoDb from './MongoDb'; export default function create(): MongoDb { diff --git a/src/integrations/database/index.ts b/src/integrations/database/index.ts index b14f84f9..26955018 100644 --- a/src/integrations/database/index.ts +++ b/src/integrations/database/index.ts @@ -44,18 +44,18 @@ const records = await searchRecords(ITEM_COLLECTION, query, undefined, sort, lim *************************************************************************************/ -import Database from './Database.js'; -import implementation from './implementation.js'; +import Database from './Database'; +import implementation from './implementation'; const database = new Database(implementation); -export * from './definitions/constants.js'; -export * from './definitions/types.js'; -export { default as DatabaseError } from './errors/DatabaseError.js'; -export { default as NotConnected } from './errors/NotConnected.js'; -export { default as RecordNotCreated } from './errors/RecordNotCreated.js'; -export { default as RecordNotDeleted } from './errors/RecordNotDeleted.js'; -export { default as RecordNotFound } from './errors/RecordNotFound.js'; -export { default as RecordNotUpdated } from './errors/RecordNotUpdated.js'; +export * from './definitions/constants'; +export * from './definitions/types'; +export { default as DatabaseError } from './errors/DatabaseError'; +export { default as NotConnected } from './errors/NotConnected'; +export { default as RecordNotCreated } from './errors/RecordNotCreated'; +export { default as RecordNotDeleted } from './errors/RecordNotDeleted'; +export { default as RecordNotFound } from './errors/RecordNotFound'; +export { default as RecordNotUpdated } from './errors/RecordNotUpdated'; export type { Database }; export default database; diff --git a/src/integrations/filestore/errors/FileNotFound.ts b/src/integrations/filestore/errors/FileNotFound.ts index d36c8b34..a9000ca7 100644 --- a/src/integrations/filestore/errors/FileNotFound.ts +++ b/src/integrations/filestore/errors/FileNotFound.ts @@ -1,5 +1,5 @@ -import FileSystemError from './FileSystemError.js'; +import FileSystemError from './FileSystemError'; export default class FileNotFound extends FileSystemError { diff --git a/src/integrations/filestore/errors/NotConnected.ts b/src/integrations/filestore/errors/NotConnected.ts index a86cdb00..dfb6510d 100644 --- a/src/integrations/filestore/errors/NotConnected.ts +++ b/src/integrations/filestore/errors/NotConnected.ts @@ -1,5 +1,5 @@ -import FileSystemError from './FileSystemError.js'; +import FileSystemError from './FileSystemError'; export default class NotConnected extends FileSystemError { diff --git a/src/integrations/filestore/errors/UnknownImplementation.ts b/src/integrations/filestore/errors/UnknownImplementation.ts index a136f5ca..e2ed7e15 100644 --- a/src/integrations/filestore/errors/UnknownImplementation.ts +++ b/src/integrations/filestore/errors/UnknownImplementation.ts @@ -1,5 +1,5 @@ -import FileSystemError from './FileSystemError.js'; +import FileSystemError from './FileSystemError'; export default class UnknownImplementation extends FileSystemError { diff --git a/src/integrations/filestore/implementation.ts b/src/integrations/filestore/implementation.ts index 583da4f4..ef98d282 100644 --- a/src/integrations/filestore/implementation.ts +++ b/src/integrations/filestore/implementation.ts @@ -1,8 +1,8 @@ -import { FileStore } from './definitions/interfaces.js'; -import UnknownImplementation from './errors/UnknownImplementation.js'; -import createMemoryFS from './implementations/memory/create.js'; -import createMinioFS from './implementations/minio/create.js'; +import { FileStore } from './definitions/interfaces'; +import UnknownImplementation from './errors/UnknownImplementation'; +import createMemoryFS from './implementations/memory/create'; +import createMinioFS from './implementations/minio/create'; const implementations = new Map FileStore>([ ['memory', createMemoryFS], diff --git a/src/integrations/filestore/implementations/memory/Memory.ts b/src/integrations/filestore/implementations/memory/Memory.ts index b12c527e..53059551 100644 --- a/src/integrations/filestore/implementations/memory/Memory.ts +++ b/src/integrations/filestore/implementations/memory/Memory.ts @@ -1,7 +1,7 @@ -import { FileStore } from '../../definitions/interfaces.js'; -import FileNotFound from '../../errors/FileNotFound.js'; -import NotConnected from '../../errors/NotConnected.js'; +import { FileStore } from '../../definitions/interfaces'; +import FileNotFound from '../../errors/FileNotFound'; +import NotConnected from '../../errors/NotConnected'; export default class Memory implements FileStore { diff --git a/src/integrations/filestore/implementations/memory/create.ts b/src/integrations/filestore/implementations/memory/create.ts index 7eeb21c8..171ae9fb 100644 --- a/src/integrations/filestore/implementations/memory/create.ts +++ b/src/integrations/filestore/implementations/memory/create.ts @@ -1,5 +1,5 @@ -import Memory from './Memory.js'; +import Memory from './Memory'; export default function create(): Memory { diff --git a/src/integrations/filestore/implementations/minio/MinioFS.ts b/src/integrations/filestore/implementations/minio/MinioFS.ts index e96caa5e..f433fc56 100644 --- a/src/integrations/filestore/implementations/minio/MinioFS.ts +++ b/src/integrations/filestore/implementations/minio/MinioFS.ts @@ -1,9 +1,9 @@ import { Client, ClientOptions } from 'minio'; -import { FileStore } from '../../definitions/interfaces.js'; -import FileNotFound from '../../errors/FileNotFound.js'; -import NotConnected from '../../errors/NotConnected.js'; +import { FileStore } from '../../definitions/interfaces'; +import FileNotFound from '../../errors/FileNotFound'; +import NotConnected from '../../errors/NotConnected'; const BUCKET_NAME = 'comify'; diff --git a/src/integrations/filestore/implementations/minio/create.ts b/src/integrations/filestore/implementations/minio/create.ts index c8eac04d..a81f1afa 100644 --- a/src/integrations/filestore/implementations/minio/create.ts +++ b/src/integrations/filestore/implementations/minio/create.ts @@ -1,5 +1,5 @@ -import MinioFS from './MinioFS.js'; +import MinioFS from './MinioFS'; export default function create(): MinioFS { diff --git a/src/integrations/filestore/index.ts b/src/integrations/filestore/index.ts index c857a7ba..737800b1 100644 --- a/src/integrations/filestore/index.ts +++ b/src/integrations/filestore/index.ts @@ -1,6 +1,7 @@ -export { default as FileNotFound } from './errors/FileNotFound.js'; -export { default as FileSystemError } from './errors/FileSystemError.js'; -export { default as NotConnected } from './errors/NotConnected.js'; -export { default as UnknownImplementation } from './errors/UnknownImplementation.js'; -export { default } from './implementation.js'; +export { default as FileNotFound } from './errors/FileNotFound'; +export { default as FileSystemError } from './errors/FileSystemError'; +export { default as NotConnected } from './errors/NotConnected'; +export { default as UnknownImplementation } from './errors/UnknownImplementation'; +export { default } from './implementation'; + diff --git a/src/integrations/http/Client.ts b/src/integrations/http/Client.ts index bd14b5bb..3b6f336b 100644 --- a/src/integrations/http/Client.ts +++ b/src/integrations/http/Client.ts @@ -1,6 +1,6 @@ -import { HTTP_METHODS } from './definitions/constants.js'; -import { Http } from './definitions/interfaces.js'; +import { HTTP_METHODS } from './definitions/constants'; +import { Http } from './definitions/interfaces'; export default class Memory implements Http { diff --git a/src/integrations/http/errors/UnknownImplementation.ts b/src/integrations/http/errors/UnknownImplementation.ts index 84105ca7..e872e141 100644 --- a/src/integrations/http/errors/UnknownImplementation.ts +++ b/src/integrations/http/errors/UnknownImplementation.ts @@ -1,5 +1,5 @@ -import HttpError from './HttpError.js'; +import HttpError from './HttpError'; export default class UnknownImplementation extends HttpError { diff --git a/src/integrations/http/implementation.ts b/src/integrations/http/implementation.ts index c0776b21..bf95706f 100644 --- a/src/integrations/http/implementation.ts +++ b/src/integrations/http/implementation.ts @@ -1,7 +1,7 @@ -import { Http } from './definitions/interfaces.js'; -import UnknownImplementation from './errors/UnknownImplementation.js'; -import createFetch from './implementations/fetch/create.js'; +import { Http } from './definitions/interfaces'; +import UnknownImplementation from './errors/UnknownImplementation'; +import createFetch from './implementations/fetch/create'; const implementations = new Map Http>([ ['fetch', createFetch] diff --git a/src/integrations/http/implementations/fetch/Fetch.ts b/src/integrations/http/implementations/fetch/Fetch.ts index 9d552620..6fe07fb5 100644 --- a/src/integrations/http/implementations/fetch/Fetch.ts +++ b/src/integrations/http/implementations/fetch/Fetch.ts @@ -1,6 +1,6 @@ -import { HTTP_METHODS } from '../../definitions/constants.js'; -import { Http } from '../../definitions/interfaces.js'; +import { HTTP_METHODS } from '../../definitions/constants'; +import { Http } from '../../definitions/interfaces'; export default class Fetch implements Http { diff --git a/src/integrations/http/index.ts b/src/integrations/http/index.ts index 3c733a4b..6341a060 100644 --- a/src/integrations/http/index.ts +++ b/src/integrations/http/index.ts @@ -1,8 +1,8 @@ -import Client from './Client.js'; -import implementation from './implementation.js'; +import Client from './Client'; +import implementation from './implementation'; const client = new Client(implementation); -export * from './definitions/constants.js'; +export * from './definitions/constants'; export default client; diff --git a/src/integrations/notification/errors/NotConnected.ts b/src/integrations/notification/errors/NotConnected.ts index ae382a58..78aec6ac 100644 --- a/src/integrations/notification/errors/NotConnected.ts +++ b/src/integrations/notification/errors/NotConnected.ts @@ -1,5 +1,5 @@ -import NotificationError from './NotificationError.js'; +import NotificationError from './NotificationError'; export default class NotConnected extends NotificationError { diff --git a/src/integrations/notification/errors/SubscriptionNotFound.ts b/src/integrations/notification/errors/SubscriptionNotFound.ts index 6ce62c97..14b07386 100644 --- a/src/integrations/notification/errors/SubscriptionNotFound.ts +++ b/src/integrations/notification/errors/SubscriptionNotFound.ts @@ -1,5 +1,5 @@ -import NotificationError from './NotificationError.js'; +import NotificationError from './NotificationError'; export default class SubscriptionNotFound extends NotificationError { diff --git a/src/integrations/notification/errors/UnknownImplementation.ts b/src/integrations/notification/errors/UnknownImplementation.ts index bff33452..c92f44b5 100644 --- a/src/integrations/notification/errors/UnknownImplementation.ts +++ b/src/integrations/notification/errors/UnknownImplementation.ts @@ -1,5 +1,5 @@ -import NotificationError from './NotificationError.js'; +import NotificationError from './NotificationError'; export default class UnknownImplementation extends NotificationError { diff --git a/src/integrations/notification/implementation.ts b/src/integrations/notification/implementation.ts index 928dcb9e..71934f5d 100644 --- a/src/integrations/notification/implementation.ts +++ b/src/integrations/notification/implementation.ts @@ -1,8 +1,8 @@ -import { NotificationService } from './definitions/interfaces.js'; -import UnknownImplementation from './errors/UnknownImplementation.js'; -import createMemory from './implementations/memory/create.js'; -import createWebPush from './implementations/webpush/create.js'; +import { NotificationService } from './definitions/interfaces'; +import UnknownImplementation from './errors/UnknownImplementation'; +import createMemory from './implementations/memory/create'; +import createWebPush from './implementations/webpush/create'; const implementations = new Map NotificationService>([ ['memory', createMemory], diff --git a/src/integrations/notification/implementations/memory/Memory.ts b/src/integrations/notification/implementations/memory/Memory.ts index a0a0394f..136c4d71 100644 --- a/src/integrations/notification/implementations/memory/Memory.ts +++ b/src/integrations/notification/implementations/memory/Memory.ts @@ -1,7 +1,7 @@ import { NotificationService } from '../../definitions/interfaces'; -import NotConnected from '../../errors/NotConnected.js'; -import SubscriptionNotFound from '../../errors/SubscriptionNotFound.js'; +import NotConnected from '../../errors/NotConnected'; +import SubscriptionNotFound from '../../errors/SubscriptionNotFound'; type Notification = { title: string; diff --git a/src/integrations/notification/implementations/memory/create.ts b/src/integrations/notification/implementations/memory/create.ts index 7eeb21c8..171ae9fb 100644 --- a/src/integrations/notification/implementations/memory/create.ts +++ b/src/integrations/notification/implementations/memory/create.ts @@ -1,5 +1,5 @@ -import Memory from './Memory.js'; +import Memory from './Memory'; export default function create(): Memory { diff --git a/src/integrations/notification/implementations/webpush/WebPush.ts b/src/integrations/notification/implementations/webpush/WebPush.ts index 3ca0b9da..1aab0d7c 100644 --- a/src/integrations/notification/implementations/webpush/WebPush.ts +++ b/src/integrations/notification/implementations/webpush/WebPush.ts @@ -2,8 +2,8 @@ import webpush, { PushSubscription } from 'web-push'; import { NotificationService } from '../../definitions/interfaces'; -import NotConnected from '../../errors/NotConnected.js'; -import SubscriptionNotFound from '../../errors/SubscriptionNotFound.js'; +import NotConnected from '../../errors/NotConnected'; +import SubscriptionNotFound from '../../errors/SubscriptionNotFound'; type VapidDetails = { subject: string; diff --git a/src/integrations/notification/implementations/webpush/create.ts b/src/integrations/notification/implementations/webpush/create.ts index 68b95bda..fa440025 100644 --- a/src/integrations/notification/implementations/webpush/create.ts +++ b/src/integrations/notification/implementations/webpush/create.ts @@ -1,5 +1,5 @@ -import WebPush from './WebPush.js'; +import WebPush from './WebPush'; export default function create(): WebPush { diff --git a/src/integrations/notification/index.ts b/src/integrations/notification/index.ts index f0d3471d..f185c93f 100644 --- a/src/integrations/notification/index.ts +++ b/src/integrations/notification/index.ts @@ -1,6 +1,7 @@ -export { default as NotConnected } from './errors/NotConnected.js'; -export { default as NotificationError } from './errors/NotificationError.js'; -export { default as SubscriptionNotFound } from './errors/SubscriptionNotFound.js'; -export { default as UnknownImplementation } from './errors/UnknownImplementation.js'; -export { default } from './implementation.js'; +export { default as NotConnected } from './errors/NotConnected'; +export { default as NotificationError } from './errors/NotificationError'; +export { default as SubscriptionNotFound } from './errors/SubscriptionNotFound'; +export { default as UnknownImplementation } from './errors/UnknownImplementation'; +export { default } from './implementation'; + diff --git a/src/integrations/runtime/databaseHealthCheck.ts b/src/integrations/runtime/databaseHealthCheck.ts index 56e8f475..05e06dd7 100644 --- a/src/integrations/runtime/databaseHealthCheck.ts +++ b/src/integrations/runtime/databaseHealthCheck.ts @@ -1,6 +1,6 @@ -import database from '^/integrations/database/index.js'; +import database from '^/integrations/database'; -import DatabaseHealthCheck from './healthchecks/DatabaseHealthCheck.js'; +import DatabaseHealthCheck from './healthchecks/DatabaseHealthCheck'; export default new DatabaseHealthCheck(database); diff --git a/src/integrations/runtime/index.ts b/src/integrations/runtime/index.ts index 4178a6a9..c01c6990 100644 --- a/src/integrations/runtime/index.ts +++ b/src/integrations/runtime/index.ts @@ -1,7 +1,7 @@ -export { default as BadRequest } from './errors/BadRequest.js'; -export { default as NotFound } from './errors/NotFound.js'; -export { default as ServerError } from './errors/ServerError.js'; -export { default as Unauthorized } from './errors/Unauthorized.js'; -export { default as ValidationError } from './errors/ValidationError.js'; +export { default as BadRequest } from './errors/BadRequest'; +export { default as NotFound } from './errors/NotFound'; +export { default as ServerError } from './errors/ServerError'; +export { default as Unauthorized } from './errors/Unauthorized'; +export { default as ValidationError } from './errors/ValidationError'; diff --git a/src/integrations/validation/definitions/interfaces.ts b/src/integrations/validation/definitions/interfaces.ts index 28de3908..a82521b1 100644 --- a/src/integrations/validation/definitions/interfaces.ts +++ b/src/integrations/validation/definitions/interfaces.ts @@ -1,6 +1,6 @@ import type ValidationResult from './ValidationResult'; -import { ValidationSchema } from './types.js'; +import { ValidationSchema } from './types'; export interface Validator { diff --git a/src/integrations/validation/errors/UnknownImplementation.ts b/src/integrations/validation/errors/UnknownImplementation.ts index a750c378..41280c11 100644 --- a/src/integrations/validation/errors/UnknownImplementation.ts +++ b/src/integrations/validation/errors/UnknownImplementation.ts @@ -1,5 +1,5 @@ -import ValidationError from './ValidationError.js'; +import ValidationError from './ValidationError'; export default class UnknownImplementation extends ValidationError { diff --git a/src/integrations/validation/errors/UnknownValidator.ts b/src/integrations/validation/errors/UnknownValidator.ts index 794befb0..f92dfbee 100644 --- a/src/integrations/validation/errors/UnknownValidator.ts +++ b/src/integrations/validation/errors/UnknownValidator.ts @@ -1,5 +1,5 @@ -import ValidationError from './ValidationError.js'; +import ValidationError from './ValidationError'; export default class UnknownValidator extends ValidationError { diff --git a/src/integrations/validation/implementation.ts b/src/integrations/validation/implementation.ts index c444c1bd..dde52074 100644 --- a/src/integrations/validation/implementation.ts +++ b/src/integrations/validation/implementation.ts @@ -1,7 +1,7 @@ -import { Validator } from './definitions/interfaces.js'; -import UnknownImplementation from './errors/UnknownImplementation.js'; -import createZod from './implementations/zod/create.js'; +import { Validator } from './definitions/interfaces'; +import UnknownImplementation from './errors/UnknownImplementation'; +import createZod from './implementations/zod/create'; const implementations = new Map Validator>([ ['zod', createZod] diff --git a/src/integrations/validation/implementations/zod/Zod.ts b/src/integrations/validation/implementations/zod/Zod.ts index 799febff..7bd8738c 100644 --- a/src/integrations/validation/implementations/zod/Zod.ts +++ b/src/integrations/validation/implementations/zod/Zod.ts @@ -1,11 +1,11 @@ import { ZodIssue, ZodType, ZodUnrecognizedKeysIssue, z } from 'zod'; -import ValidationResult from '../../definitions/ValidationResult.js'; -import { FieldTypes, MAX_EMAIL_LENGTH, MAX_URL_LENGTH } from '../../definitions/constants.js'; -import { Validator } from '../../definitions/interfaces.js'; -import { Message, Validation, ValidationTypes, type ValidationSchema } from '../../definitions/types.js'; -import UnknownValidator from '../../errors/UnknownValidator.js'; +import ValidationResult from '../../definitions/ValidationResult'; +import { FieldTypes, MAX_EMAIL_LENGTH, MAX_URL_LENGTH } from '../../definitions/constants'; +import { Validator } from '../../definitions/interfaces'; +import { Message, Validation, ValidationTypes, type ValidationSchema } from '../../definitions/types'; +import UnknownValidator from '../../errors/UnknownValidator'; type ValidatorFunction = (value: ValidationTypes[keyof ValidationTypes]) => z.ZodType | z.ZodArray>; diff --git a/src/integrations/validation/implementations/zod/create.ts b/src/integrations/validation/implementations/zod/create.ts index fb1116d4..a9024824 100644 --- a/src/integrations/validation/implementations/zod/create.ts +++ b/src/integrations/validation/implementations/zod/create.ts @@ -1,5 +1,5 @@ -import Zod from './Zod.js'; +import Zod from './Zod'; export default function create(): Zod { diff --git a/src/integrations/validation/index.ts b/src/integrations/validation/index.ts index 9b336618..3f7996ed 100644 --- a/src/integrations/validation/index.ts +++ b/src/integrations/validation/index.ts @@ -1,7 +1,8 @@ -export * from './definitions/constants.js'; -export * from './definitions/types.js'; -export { default as UnknownImplementation } from './errors/UnknownImplementation.js'; -export { default as UnknownValidator } from './errors/UnknownValidator.js'; -export { default as ValidationError } from './errors/ValidationError.js'; -export { default } from './implementation.js'; +export * from './definitions/constants'; +export * from './definitions/types'; +export { default as UnknownImplementation } from './errors/UnknownImplementation'; +export { default as UnknownValidator } from './errors/UnknownValidator'; +export { default as ValidationError } from './errors/ValidationError'; +export { default } from './implementation'; + From ef6a231feac7d9d5ba38fa8d51d9c71d36d9c90d Mon Sep 17 00:00:00 2001 From: Peter van Vliet Date: Fri, 10 Jan 2025 23:27:11 +0100 Subject: [PATCH 13/14] #368: cleaned up imports --- src/domain/comic/aggregate/aggregate.ts | 2 +- src/domain/comic/create/create.ts | 2 +- src/domain/creator/aggregate/aggregate.ts | 2 +- src/domain/image/create/create.ts | 2 +- src/domain/image/download/download.ts | 2 +- .../post/getByCreatorAggregated/getByCreatorAggregated.ts | 3 ++- src/domain/reaction/create/create.ts | 4 ++-- src/domain/reaction/createWithComic/createWithComic.ts | 2 +- src/domain/relation/establish/establish.ts | 2 +- src/webui/features/hooks/useUpdateNickname.ts | 1 - test/domain/comic/create.spec.ts | 2 +- test/domain/notification/fixtures/requesters.fixture.ts | 2 +- test/domain/post/fixtures/requesters.fixture.ts | 3 +-- 13 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/domain/comic/aggregate/aggregate.ts b/src/domain/comic/aggregate/aggregate.ts index 63b65c8f..1dc6c90e 100644 --- a/src/domain/comic/aggregate/aggregate.ts +++ b/src/domain/comic/aggregate/aggregate.ts @@ -1,5 +1,5 @@ -import getImageData from '^/domain/image/getById/getById'; +import getImageData from '^/domain/image/getById'; import type { DataModel } from '../types'; import type { AggregatedData } from './types'; diff --git a/src/domain/comic/create/create.ts b/src/domain/comic/create/create.ts index 4fd6005f..ab0f6c74 100644 --- a/src/domain/comic/create/create.ts +++ b/src/domain/comic/create/create.ts @@ -1,5 +1,5 @@ -import createImage from '^/domain/image/create/create'; +import createImage from '^/domain/image/create'; import { IMAGE_TYPE } from '../definitions'; diff --git a/src/domain/creator/aggregate/aggregate.ts b/src/domain/creator/aggregate/aggregate.ts index f2bd9168..22c24dfd 100644 --- a/src/domain/creator/aggregate/aggregate.ts +++ b/src/domain/creator/aggregate/aggregate.ts @@ -1,5 +1,5 @@ -import getImageData from '^/domain/image/getById/getById'; +import getImageData from '^/domain/image/getById'; import { DataModel } from '../types'; import { AggregatedData } from './types'; diff --git a/src/domain/image/create/create.ts b/src/domain/image/create/create.ts index 82b25932..620976bd 100644 --- a/src/domain/image/create/create.ts +++ b/src/domain/image/create/create.ts @@ -1,5 +1,5 @@ -import save from '../save/save'; +import save from '../save'; import validate from '../validate/validate'; import convertDataUrl from './convertDataUrl'; diff --git a/src/domain/image/download/download.ts b/src/domain/image/download/download.ts index 48bd50e5..84eefba7 100644 --- a/src/domain/image/download/download.ts +++ b/src/domain/image/download/download.ts @@ -1,5 +1,5 @@ -import save from '../save/save'; +import save from '../save'; import validate from '../validate/validate'; import downloadImage from './downloadImage'; import getMetaData from './getMetaData'; diff --git a/src/domain/post/getByCreatorAggregated/getByCreatorAggregated.ts b/src/domain/post/getByCreatorAggregated/getByCreatorAggregated.ts index 244dde71..5e63b1d7 100644 --- a/src/domain/post/getByCreatorAggregated/getByCreatorAggregated.ts +++ b/src/domain/post/getByCreatorAggregated/getByCreatorAggregated.ts @@ -1,7 +1,8 @@ +import logger from '^/integrations/logging'; + import { Requester } from '^/domain/authentication'; import validateRange, { Range } from '^/domain/common/validateRange'; -import logger from '^/integrations/logging'; import aggregate, { AggregatedData } from '../aggregate'; import getByCreator from '../getByCreator'; diff --git a/src/domain/reaction/create/create.ts b/src/domain/reaction/create/create.ts index 9373bc5b..c04f822d 100644 --- a/src/domain/reaction/create/create.ts +++ b/src/domain/reaction/create/create.ts @@ -1,11 +1,11 @@ import logger from '^/integrations/logging'; -import updateReactionCount from '^/domain/post/updateReactionCount'; - import { Types } from '^/domain/notification'; import createNotification from '^/domain/notification/create'; import retrievePost from '^/domain/post/getById'; +import updateReactionCount from '^/domain/post/updateReactionCount'; + import createData from './createData'; import eraseData from './eraseData'; import insertData from './insertData'; diff --git a/src/domain/reaction/createWithComic/createWithComic.ts b/src/domain/reaction/createWithComic/createWithComic.ts index af448c8c..38957689 100644 --- a/src/domain/reaction/createWithComic/createWithComic.ts +++ b/src/domain/reaction/createWithComic/createWithComic.ts @@ -1,6 +1,6 @@ import { Requester } from '^/domain/authentication'; -import createComic from '^/domain/comic/create/create'; +import createComic from '^/domain/comic/create'; import createReaction from '../create'; diff --git a/src/domain/relation/establish/establish.ts b/src/domain/relation/establish/establish.ts index e80845a1..0b006485 100644 --- a/src/domain/relation/establish/establish.ts +++ b/src/domain/relation/establish/establish.ts @@ -4,9 +4,9 @@ import logger from '^/integrations/logging'; import { Requester } from '^/domain/authentication'; import updateFollowerCount from '^/domain/creator/updateFollowerCount'; import updateFollowingCount from '^/domain/creator/updateFollowingCount'; - import { Types } from '^/domain/notification'; import createNotification from '^/domain/notification/create'; + import createData from './createData'; import dataExists from './dataExists'; import eraseData from './eraseData'; diff --git a/src/webui/features/hooks/useUpdateNickname.ts b/src/webui/features/hooks/useUpdateNickname.ts index 72e67f39..652ad351 100644 --- a/src/webui/features/hooks/useUpdateNickname.ts +++ b/src/webui/features/hooks/useUpdateNickname.ts @@ -3,7 +3,6 @@ import { useCallback, useState } from 'react'; import { requester } from '^/domain/authentication'; import type { AggregatedData as AggregatedCreatorData } from '^/domain/creator/aggregate'; -//import updateNickname, { NicknameAlreadyExists } from '^/domain/creator/updateNickname'; import updateNickname from '^/domain/creator/updateNickname'; import NicknameAlreadyExists from '^/domain/creator/updateNickname/NicknameAlreadyExists'; diff --git a/test/domain/comic/create.spec.ts b/test/domain/comic/create.spec.ts index 3dda4344..dba2ca4f 100644 --- a/test/domain/comic/create.spec.ts +++ b/test/domain/comic/create.spec.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import create from '^/domain/comic/create/create'; +import create from '^/domain/comic/create'; import { RECORD_TYPE as COMIC_RECORD_TYPE } from '^/domain/comic/definitions'; import database from '^/integrations/database'; diff --git a/test/domain/notification/fixtures/requesters.fixture.ts b/test/domain/notification/fixtures/requesters.fixture.ts index f08beb55..69b1384f 100644 --- a/test/domain/notification/fixtures/requesters.fixture.ts +++ b/test/domain/notification/fixtures/requesters.fixture.ts @@ -1,5 +1,5 @@ -import { Requester } from '^/domain/authentication/types'; +import { Requester } from '^/domain/authentication'; import { VALUES } from './values.fixture'; diff --git a/test/domain/post/fixtures/requesters.fixture.ts b/test/domain/post/fixtures/requesters.fixture.ts index 36157d57..24cb0b45 100644 --- a/test/domain/post/fixtures/requesters.fixture.ts +++ b/test/domain/post/fixtures/requesters.fixture.ts @@ -1,6 +1,5 @@ -import { requester } from '^/domain/authentication'; -import { Requester } from '^/domain/authentication/types'; +import { requester, Requester } from '^/domain/authentication'; import { VALUES } from './values.fixture'; From 3682ffedd5d6b6d70f4e1d87585caff664844b60 Mon Sep 17 00:00:00 2001 From: Peter van Vliet Date: Fri, 10 Jan 2025 23:38:02 +0100 Subject: [PATCH 14/14] #368: last import clean up --- src/domain/image/download/download.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/domain/image/download/download.ts b/src/domain/image/download/download.ts index 84eefba7..95f7c0c3 100644 --- a/src/domain/image/download/download.ts +++ b/src/domain/image/download/download.ts @@ -1,6 +1,6 @@ import save from '../save'; -import validate from '../validate/validate'; +import validate from '../validate'; import downloadImage from './downloadImage'; import getMetaData from './getMetaData';