diff --git a/src/app/events.ts b/src/app/events.ts index 49bf0ed..b8b8fa8 100644 --- a/src/app/events.ts +++ b/src/app/events.ts @@ -4,8 +4,8 @@ export { schemas }; import { Schemas, CSchema, TSchema } from '@/lib/eventSourcing/eventStore'; -import { ApplicationSubmitted } from '@/domain/cookingClub/membership2/events/membership/applicationSubmitted'; -import { ApplicationEvaluated } from '@/domain/cookingClub/membership2/events/membership/applicationEvaluated'; +import { ApplicationSubmitted } from '@/domain/cookingClub/membership/events/membership/applicationSubmitted'; +import { ApplicationEvaluated } from '@/domain/cookingClub/membership/events/membership/applicationEvaluated'; const schemas = new Schemas([ new CSchema( diff --git a/src/app/projections.ts b/src/app/projections.ts index 125a97f..55975bc 100644 --- a/src/app/projections.ts +++ b/src/app/projections.ts @@ -11,7 +11,7 @@ export { import { RepoCuisine, RepoMembershipApplication, -} from '@/domain/cookingClub/membership2/projection/membersByCuisine'; +} from '@/domain/cookingClub/membership/projection/membersByCuisine'; import { MongoProjectionStore } from '@/app/projectionStore'; // An object containing all initialized repositories. diff --git a/src/domain/cookingClub/membership2/aggregate/membership.ts b/src/domain/cookingClub/membership/aggregate/membership.ts similarity index 100% rename from src/domain/cookingClub/membership2/aggregate/membership.ts rename to src/domain/cookingClub/membership/aggregate/membership.ts diff --git a/src/domain/cookingClub/membership2/command/submitApplication.ts b/src/domain/cookingClub/membership/command/submitApplication.ts similarity index 90% rename from src/domain/cookingClub/membership2/command/submitApplication.ts rename to src/domain/cookingClub/membership/command/submitApplication.ts index 3fbbdb2..6aad3d7 100644 --- a/src/domain/cookingClub/membership2/command/submitApplication.ts +++ b/src/domain/cookingClub/membership/command/submitApplication.ts @@ -5,8 +5,8 @@ import { CommandController, CommandHandler } from '@/app/handleCommand'; import { Future } from '@/lib/Future'; import { Response, json } from '@/lib/router'; import { Id } from '@/lib/eventSourcing/event'; -import { ApplicationSubmitted } from '@/domain/cookingClub/membership2/events/membership/applicationSubmitted'; -import { Membership } from '@/domain/cookingClub/membership2/aggregate/membership'; +import { ApplicationSubmitted } from '@/domain/cookingClub/membership/events/membership/applicationSubmitted'; +import { Membership } from '@/domain/cookingClub/membership/aggregate/membership'; type Command = d.Infer; const decoder = d.object({ diff --git a/src/domain/cookingClub/membership2/events/membership/applicationEvaluated.ts b/src/domain/cookingClub/membership/events/membership/applicationEvaluated.ts similarity index 92% rename from src/domain/cookingClub/membership2/events/membership/applicationEvaluated.ts rename to src/domain/cookingClub/membership/events/membership/applicationEvaluated.ts index d66c41d..e5739d1 100644 --- a/src/domain/cookingClub/membership2/events/membership/applicationEvaluated.ts +++ b/src/domain/cookingClub/membership/events/membership/applicationEvaluated.ts @@ -5,7 +5,7 @@ import * as s from '@/lib/json/schema'; import { Membership, schema_MembershipStatus, -} from '@/domain/cookingClub/membership2/aggregate/membership'; +} from '@/domain/cookingClub/membership/aggregate/membership'; const type = 'ApplicationEvaluated' as const; const args = s.object({ diff --git a/src/domain/cookingClub/membership2/events/membership/applicationSubmitted.ts b/src/domain/cookingClub/membership/events/membership/applicationSubmitted.ts similarity index 91% rename from src/domain/cookingClub/membership2/events/membership/applicationSubmitted.ts rename to src/domain/cookingClub/membership/events/membership/applicationSubmitted.ts index 7494efe..ef635cc 100644 --- a/src/domain/cookingClub/membership2/events/membership/applicationSubmitted.ts +++ b/src/domain/cookingClub/membership/events/membership/applicationSubmitted.ts @@ -2,7 +2,7 @@ export { ApplicationSubmitted }; import { Id, CreationEvent, toSchema } from '@/lib/eventSourcing/event'; import * as s from '@/lib/json/schema'; -import { Membership } from '@/domain/cookingClub/membership2/aggregate/membership'; +import { Membership } from '@/domain/cookingClub/membership/aggregate/membership'; const type = 'ApplicationSubmitted' as const; const args = s.object({ diff --git a/src/domain/cookingClub/membership2/projection/membersByCuisine.ts b/src/domain/cookingClub/membership/projection/membersByCuisine.ts similarity index 98% rename from src/domain/cookingClub/membership2/projection/membersByCuisine.ts rename to src/domain/cookingClub/membership/projection/membersByCuisine.ts index 5d4459a..f532d93 100644 --- a/src/domain/cookingClub/membership2/projection/membersByCuisine.ts +++ b/src/domain/cookingClub/membership/projection/membersByCuisine.ts @@ -15,8 +15,8 @@ import { ProjectionController, } from '@/app/handleProjection'; import { Future } from '@/lib/Future'; -import { ApplicationSubmitted } from '@/domain/cookingClub/membership2/events/membership/applicationSubmitted'; -import { ApplicationEvaluated } from '@/domain/cookingClub/membership2/events/membership/applicationEvaluated'; +import { ApplicationSubmitted } from '@/domain/cookingClub/membership/events/membership/applicationSubmitted'; +import { ApplicationEvaluated } from '@/domain/cookingClub/membership/events/membership/applicationEvaluated'; import { AmbarResponse, ErrorMustRetry } from '@/lib/ambar'; import * as m from '@/lib/Maybe'; import { diff --git a/src/domain/cookingClub/membership2/query/membersByCuisine.ts b/src/domain/cookingClub/membership/query/membersByCuisine.ts similarity index 89% rename from src/domain/cookingClub/membership2/query/membersByCuisine.ts rename to src/domain/cookingClub/membership/query/membersByCuisine.ts index f669d6c..df29a4c 100644 --- a/src/domain/cookingClub/membership2/query/membersByCuisine.ts +++ b/src/domain/cookingClub/membership/query/membersByCuisine.ts @@ -4,7 +4,7 @@ import * as d from '@/lib/json/decoder'; import { QueryHandler, QueryController } from '@/app/handleQuery'; import { Future } from '@/lib/Future'; import { internalServerError } from '@/app/responses'; -import { RepoCuisine } from '@/domain/cookingClub/membership2/projection/membersByCuisine'; +import { RepoCuisine } from '@/domain/cookingClub/membership/projection/membersByCuisine'; import * as router from '@/lib/router'; type Query = d.Infer; diff --git a/src/domain/cookingClub/membership2/reaction/evaluateApplication.ts b/src/domain/cookingClub/membership/reaction/evaluateApplication.ts similarity index 88% rename from src/domain/cookingClub/membership2/reaction/evaluateApplication.ts rename to src/domain/cookingClub/membership/reaction/evaluateApplication.ts index 48bd533..9431e09 100644 --- a/src/domain/cookingClub/membership2/reaction/evaluateApplication.ts +++ b/src/domain/cookingClub/membership/reaction/evaluateApplication.ts @@ -4,9 +4,9 @@ import * as d from '@/lib/json/decoder'; import { accept } from '@/lib/eventSourcing/projection'; import { ReactionHandler, ReactionController } from '@/app/handleReaction'; import { Future } from '@/lib/Future'; -import { ApplicationSubmitted } from '@/domain/cookingClub/membership2/events/membership/applicationSubmitted'; -import { ApplicationEvaluated } from '@/domain/cookingClub/membership2/events/membership/applicationEvaluated'; -import { Membership } from '@/domain/cookingClub/membership2/aggregate/membership'; +import { ApplicationSubmitted } from '@/domain/cookingClub/membership/events/membership/applicationSubmitted'; +import { ApplicationEvaluated } from '@/domain/cookingClub/membership/events/membership/applicationEvaluated'; +import { Membership } from '@/domain/cookingClub/membership/aggregate/membership'; import { AmbarResponse, ErrorMustRetry } from '@/lib/ambar'; import * as m from '@/lib/Maybe'; diff --git a/src/index.ts b/src/index.ts index f896591..a8362fa 100644 --- a/src/index.ts +++ b/src/index.ts @@ -12,10 +12,10 @@ import { } from '@/app/handleReaction'; import { handleProjection, ProjectionController } from '@/app/handleProjection'; import { handleQuery, QueryController } from '@/app/handleQuery'; -import * as membership_command_submitApplication from '@/domain/cookingClub/membership2/command/submitApplication'; -import * as membership_reaction_evaluateApplication from '@/domain/cookingClub/membership2/reaction/evaluateApplication'; -import * as membership_projection_membersByCuisine from '@/domain/cookingClub/membership2/projection/membersByCuisine'; -import * as membership_query_membersByCuisine from '@/domain/cookingClub/membership2/query/membersByCuisine'; +import * as membership_command_submitApplication from '@/domain/cookingClub/membership/command/submitApplication'; +import * as membership_reaction_evaluateApplication from '@/domain/cookingClub/membership/reaction/evaluateApplication'; +import * as membership_projection_membersByCuisine from '@/domain/cookingClub/membership/projection/membersByCuisine'; +import * as membership_query_membersByCuisine from '@/domain/cookingClub/membership/query/membersByCuisine'; async function main() { // Configure dependency injection