refactor(arch): move Farm into Modules/Farm

src/Cluckwork.Api/AuthPolicies.cs

@@ -1,4 +1,4 @@
-using Cluckwork.Domain.Accounts;
+using Cluckwork.Domain.Modules.Farm.Accounts;
 
 namespace Cluckwork.Api;
 

src/Cluckwork.Api/Cli/ListAccountsCliCommand.cs

@@ -1,4 +1,4 @@
-using Cluckwork.Application.Features.Accounts;
+using Cluckwork.Application.Modules.Farm.Contracts;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 

src/Cluckwork.Api/Cli/ProvisionAccountCliCommand.cs

@@ -1,5 +1,5 @@
 using Cluckwork.Application.Modules.Access.Contracts;
-using Cluckwork.Domain.Accounts;
+using Cluckwork.Domain.Modules.Farm.Accounts;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 

src/Cluckwork.Api/Cli/ReactivateAccountCliCommand.cs

@@ -1,5 +1,5 @@
-using Cluckwork.Application.Features.Accounts;
 using Cluckwork.Application.Modules.Access.Contracts;
+using Cluckwork.Application.Modules.Farm.Contracts;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 

src/Cluckwork.Api/Cli/RenameAccountCliCommand.cs

@@ -1,6 +1,6 @@
-using Cluckwork.Application.Features.Accounts;
 using Cluckwork.Application.Modules.Access.Contracts;
-using Cluckwork.Domain.Accounts;
+using Cluckwork.Application.Modules.Farm.Contracts;
+using Cluckwork.Domain.Modules.Farm.Accounts;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 

src/Cluckwork.Api/Cli/SeedCliCommand.cs

@@ -1,4 +1,4 @@
-using Cluckwork.Application.Features.Accounts;
+using Cluckwork.Application.Modules.Farm.Contracts;
 using Cluckwork.Infrastructure.Persistence;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.EntityFrameworkCore;

src/Cluckwork.Api/Cli/SuspendAccountCliCommand.cs

@@ -1,5 +1,5 @@
-using Cluckwork.Application.Features.Accounts;
 using Cluckwork.Application.Modules.Access.Contracts;
+using Cluckwork.Application.Modules.Farm.Contracts;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 

src/Cluckwork.Api/Configuration/FarmBannerOptions.cs

@@ -1,4 +1,4 @@
-using Cluckwork.Domain.Media;
+using Cluckwork.Domain.Modules.Farm.Media;
 using Microsoft.Extensions.Options;
 
 namespace Cluckwork.Api.Configuration;

src/Cluckwork.Api/Configuration/FarmLogoOptions.cs

@@ -1,4 +1,4 @@
-using Cluckwork.Domain.Media;
+using Cluckwork.Domain.Modules.Farm.Media;
 using Microsoft.Extensions.Options;
 
 namespace Cluckwork.Api.Configuration;

src/Cluckwork.Api/Hosting/CluckworkPersistenceServiceCollectionExtensions.cs

@@ -1,8 +1,8 @@
 using Cluckwork.Application.Common;
-using Cluckwork.Application.Features.Accounts;
 using Cluckwork.Application.Modules.Access.Contracts;
 using Cluckwork.Application.Modules.Commerce.Contracts;
 using Cluckwork.Application.Modules.EggOperations.Contracts;
+using Cluckwork.Application.Modules.Farm.Contracts;
 using Cluckwork.Application.Modules.Finance.Contracts;
 using Cluckwork.Application.Modules.FlockManagement.Contracts;
 using Cluckwork.Application.Modules.GeneralInventory.Contracts;

src/Cluckwork.Api/Hosting/FarmBannerRequestBodyCap.cs

@@ -1,5 +1,5 @@
 using Cluckwork.Api.Configuration;
-using Cluckwork.Api.Endpoints.Accounts;
+using Cluckwork.Api.Modules.Farm.Accounts;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.Options;
 

src/Cluckwork.Api/Hosting/FarmLogoRequestBodyCap.cs

@@ -1,5 +1,5 @@
 using Cluckwork.Api.Configuration;
-using Cluckwork.Api.Endpoints.Accounts;
+using Cluckwork.Api.Modules.Farm.Accounts;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.Options;
 

src/Cluckwork.Api/Hosting/Modules/CluckworkModulesServiceCollectionExtensions.cs

@@ -1,5 +1,6 @@
 using Cluckwork.Api.Modules.Commerce;
 using Cluckwork.Api.Modules.EggOperations;
+using Cluckwork.Api.Modules.Farm;
 using Cluckwork.Api.Modules.Finance;
 using Cluckwork.Api.Modules.FlockManagement;
 using Cluckwork.Api.Modules.GeneralInventory;

src/Cluckwork.Api/Middleware/FlockScopeResolutionMiddleware.cs

@@ -45,8 +45,8 @@ public async Task InvokeAsync(HttpContext context, FlockScope scope, CurrentUser
         // #612 — only a plain Worker is ever flock-scoped. Owner, Manager,
         // Sales, ReadOnly and Denied all bypass assignment rows entirely —
         // their route permissions are a separate, untouched surface.
-        if (Cluckwork.Domain.Accounts.Roles.ResolveEffective(user.Roles)
-            != Cluckwork.Domain.Accounts.EffectiveAccountRole.Worker)
+        if (Cluckwork.Domain.Modules.Farm.Accounts.Roles.ResolveEffective(user.Roles)
+            != Cluckwork.Domain.Modules.Farm.Accounts.EffectiveAccountRole.Worker)
         {
             scope.Resolve(true, []);
             await next(context);

src/Cluckwork.Api/Modules/Access/Auth/AuthEndpoints.cs

@@ -4,7 +4,7 @@
 using Cluckwork.Api.Validation;
 using Cluckwork.Application.Common;
 using Cluckwork.Application.Modules.Access.Contracts;
-using Cluckwork.Domain.Accounts;
+using Cluckwork.Domain.Modules.Farm.Accounts;
 using Cluckwork.Infrastructure.Persistence;
 using FluentValidation;
 

src/Cluckwork.Api/Modules/Access/Auth/LoginRequestValidator.cs

@@ -1,5 +1,5 @@
 using Cluckwork.Application.Modules.Access.Users;
-using Cluckwork.Domain.Accounts;
+using Cluckwork.Domain.Modules.Farm.Accounts;
 using FluentValidation;
 
 namespace Cluckwork.Api.Modules.Access.Auth;

src/Cluckwork.Api/Modules/Commerce/Sales/PaymentEndpoints.cs

@@ -121,7 +121,7 @@ private static async Task<IResult> VoidPayment(
 
     private static async Task<IResult> ListCustomerBalances(
         ICommerceModule commerce,
-        Cluckwork.Application.Features.Accounts.IFarmModule farm,
+        Cluckwork.Application.Modules.Farm.Contracts.IFarmModule farm,
         TenantContext tenant,
         CancellationToken ct)
     {

src/Cluckwork.Api/Endpoints/Accounts/AccountEndpoints.cs → src/Cluckwork.Api/Modules/Farm/Accounts/AccountEndpoints.cs

@@ -1,15 +1,14 @@
 using Cluckwork.Application.Common;
-using Cluckwork.Application.Features.Accounts;
-using Cluckwork.Application.Features.Accounts.UpdateFarmSettings;
-using Cluckwork.Domain.Accounts;
+using Cluckwork.Application.Modules.Farm.Contracts;
 using Cluckwork.Api.Configuration;
 using Cluckwork.Api.Validation;
 using Cluckwork.Domain.Common;
+using Cluckwork.Domain.Modules.Farm.Accounts;
 using Cluckwork.Infrastructure.Persistence;
 using FluentValidation;
 using Microsoft.Extensions.Options;
 
-namespace Cluckwork.Api.Endpoints.Accounts;
+namespace Cluckwork.Api.Modules.Farm.Accounts;
 
 public static class AccountEndpoints
 {

src/Cluckwork.Api/Endpoints/Accounts/FarmBannerEndpoints.cs → src/Cluckwork.Api/Modules/Farm/Accounts/FarmBannerEndpoints.cs

@@ -1,14 +1,14 @@
+using Cluckwork.Application.Modules.Farm.Contracts;
+using Cluckwork.Domain.Modules.Farm.Media;
 using System.Buffers;
 using Cluckwork.Api.Configuration;
-using Cluckwork.Application.Features.Accounts;
 using Cluckwork.Domain.Common;
-using Cluckwork.Domain.Media;
 using Cluckwork.Infrastructure.Persistence;
 using Microsoft.Extensions.Options;
 using Microsoft.Net.Http.Headers;
 using Cluckwork.Api.Hosting;
 
-namespace Cluckwork.Api.Endpoints.Accounts;
+namespace Cluckwork.Api.Modules.Farm.Accounts;
 
 // #179 — the farm banner: upload, serve, remove. Mirrors FarmLogoEndpoints.cs
 // exactly, including the raw-body-PUT and ETag/304 reasoning documented there;

src/Cluckwork.Api/Endpoints/Accounts/FarmLogoEndpoints.cs → src/Cluckwork.Api/Modules/Farm/Accounts/FarmLogoEndpoints.cs

@@ -1,14 +1,14 @@
+using Cluckwork.Application.Modules.Farm.Contracts;
+using Cluckwork.Domain.Modules.Farm.Media;
 using System.Buffers;
 using Cluckwork.Api.Configuration;
-using Cluckwork.Application.Features.Accounts;
 using Cluckwork.Domain.Common;
-using Cluckwork.Domain.Media;
 using Cluckwork.Infrastructure.Persistence;
 using Microsoft.Extensions.Options;
 using Microsoft.Net.Http.Headers;
 using Cluckwork.Api.Hosting;
 
-namespace Cluckwork.Api.Endpoints.Accounts;
+namespace Cluckwork.Api.Modules.Farm.Accounts;
 
 // #123 — the farm logo: upload, serve, remove.
 //

src/Cluckwork.Api/Hosting/Modules/FarmModuleServiceCollectionExtensions.cs → src/Cluckwork.Api/Modules/Farm/FarmModuleServiceCollectionExtensions.cs

@@ -1,10 +1,11 @@
 using Cluckwork.Api.Configuration;
-using Cluckwork.Application.Features.Accounts;
+using Cluckwork.Application.Modules.Farm.Accounts;
+using Cluckwork.Application.Modules.Farm.Contracts;
 using Cluckwork.Infrastructure.Repositories;
 using FluentValidation;
 using Microsoft.Extensions.Options;
 
-namespace Cluckwork.Api.Hosting.Modules;
+namespace Cluckwork.Api.Modules.Farm;
 
 internal static class FarmModuleServiceCollectionExtensions
 {
@@ -32,18 +33,18 @@ public static IServiceCollection AddFarmModule(this IServiceCollection services,
             IFarmLogoRepository,
             FarmLogoRepository>();
         services.AddScoped<
-            IValidator<Cluckwork.Application.Features.Accounts.UpdateFarmSettings.UpdateFarmSettingsCommand>,
-            Cluckwork.Application.Features.Accounts.UpdateFarmSettings.UpdateFarmSettingsValidator>();
+            IValidator<Cluckwork.Application.Modules.Farm.Contracts.UpdateFarmSettingsCommand>,
+            Cluckwork.Application.Modules.Farm.Accounts.UpdateFarmSettings.UpdateFarmSettingsValidator>();
         services.AddScoped<
-            Cluckwork.Application.Features.Accounts.UpdateFarmSettings.UpdateFarmSettingsHandler>();
+            Cluckwork.Application.Modules.Farm.Accounts.UpdateFarmSettings.UpdateFarmSettingsHandler>();
         services.AddScoped<
-            Cluckwork.Application.Features.Accounts.SetFarmLogo.SetFarmLogoHandler>();
+            Cluckwork.Application.Modules.Farm.Accounts.SetFarmLogo.SetFarmLogoHandler>();
         services.AddScoped<
-            Cluckwork.Application.Features.Accounts.RemoveFarmLogo.RemoveFarmLogoHandler>();
+            Cluckwork.Application.Modules.Farm.Accounts.RemoveFarmLogo.RemoveFarmLogoHandler>();
         services.AddScoped<
-            Cluckwork.Application.Features.Accounts.SetFarmBanner.SetFarmBannerHandler>();
+            Cluckwork.Application.Modules.Farm.Accounts.SetFarmBanner.SetFarmBannerHandler>();
         services.AddScoped<
-            Cluckwork.Application.Features.Accounts.RemoveFarmBanner.RemoveFarmBannerHandler>();
+            Cluckwork.Application.Modules.Farm.Accounts.RemoveFarmBanner.RemoveFarmBannerHandler>();
         services.AddScoped<
             IFarmModule,
             FarmModule>();

src/Cluckwork.Api/Modules/Finance/Expenses/ExpenseEndpoints.cs

@@ -1,5 +1,5 @@
 using Cluckwork.Api.Validation;
-using Cluckwork.Application.Features.Accounts;
+using Cluckwork.Application.Modules.Farm.Contracts;
 using Cluckwork.Application.Modules.Finance.Contracts;
 using Cluckwork.Application.Modules.Insights.Contracts;
 using Cluckwork.Infrastructure.Persistence;

src/Cluckwork.Api/Program.cs

@@ -1,6 +1,5 @@
 using Cluckwork.Api;
 using Cluckwork.Api.Cli;
-using Cluckwork.Api.Endpoints.Accounts;
 using Cluckwork.Api.Endpoints.ClientErrors;
 using Cluckwork.Api.Hosting;
 using Cluckwork.Api.Hosting.Modules;
@@ -14,6 +13,7 @@
 using Cluckwork.Api.Modules.EggOperations.DailyEntries;
 using Cluckwork.Api.Modules.EggOperations.EggGrades;
 using Cluckwork.Api.Modules.EggOperations.Stock;
+using Cluckwork.Api.Modules.Farm.Accounts;
 using Cluckwork.Api.Modules.Finance.Expenses;
 using Cluckwork.Api.Modules.FlockManagement.Flocks;
 using Cluckwork.Api.Modules.GeneralInventory.Inventory;

src/Cluckwork.Application/Modules/Access/Contracts/IAccessLookup.cs

@@ -7,7 +7,7 @@ namespace Cluckwork.Application.Modules.Access.Contracts;
 public interface IAccessLookup
 {
     // Null when the user is not an ACTIVE member of the account (#612).
-    Task<Cluckwork.Domain.Accounts.EffectiveAccountRole?> GetEffectiveRoleAsync(
+    Task<Cluckwork.Domain.Modules.Farm.Accounts.EffectiveAccountRole?> GetEffectiveRoleAsync(
         Guid accountId, Guid userId, CancellationToken ct = default);
 
     // Null means account-wide access: zero rows or any farm-wide row.

src/Cluckwork.Application/Modules/Access/Users/AssignFlock/AssignFlockHandler.cs

@@ -1,8 +1,8 @@
 using Cluckwork.Application.Common;
 using Cluckwork.Application.Modules.Access.Contracts;
 using Cluckwork.Application.Modules.FlockManagement.Contracts;
-using Cluckwork.Domain.Accounts;
 using Cluckwork.Domain.Common;
+using Cluckwork.Domain.Modules.Farm.Accounts;
 
 namespace Cluckwork.Application.Modules.Access.Users.AssignFlock;
 

src/Cluckwork.Application/Modules/Access/Users/ChangeUserRole/ChangeUserRoleValidator.cs

@@ -9,7 +9,7 @@ public sealed class ChangeUserRoleValidator : AbstractValidator<ChangeUserRoleCo
     public ChangeUserRoleValidator()
     {
         RuleFor(x => x.Role)
-            .Must(r => r == CreateUserValidator.WorkerRole || Cluckwork.Domain.Accounts.Roles.Assignable.Contains(r))
+            .Must(r => r == CreateUserValidator.WorkerRole || Cluckwork.Domain.Modules.Farm.Accounts.Roles.Assignable.Contains(r))
             .WithMessage("Role must be Admin (owner), Manager, Sales, ReadOnly, or Worker.")
             .WithErrorCode("User.Role.Allowed");
     }

src/Cluckwork.Application/Modules/Access/Users/CreateUser/CreateUserValidator.cs

@@ -5,7 +5,7 @@ namespace Cluckwork.Application.Modules.Access.Users.CreateUser;
 
 public sealed class CreateUserValidator : AbstractValidator<CreateUserCommand>
 {
-    public const string AdminRole = Cluckwork.Domain.Accounts.Roles.Owner;
+    public const string AdminRole = Cluckwork.Domain.Modules.Farm.Accounts.Roles.Owner;
     public const string WorkerRole = "Worker";
 
     public CreateUserValidator()
@@ -28,7 +28,7 @@ public CreateUserValidator()
             .MaximumLength(Cluckwork.Application.Modules.Access.Users.PasswordRules.MaxLength)
             .WithErrorCode("User.Password.MaxLength");
         RuleFor(x => x.Role)
-            .Must(r => r == WorkerRole || Cluckwork.Domain.Accounts.Roles.Assignable.Contains(r))
+            .Must(r => r == WorkerRole || Cluckwork.Domain.Modules.Farm.Accounts.Roles.Assignable.Contains(r))
             .WithMessage("Role must be Admin (owner), Manager, Sales, ReadOnly, or Worker.")
             .WithErrorCode("User.Role.Allowed");
         // #163 — Name is optional; only its length is bounded.

src/Cluckwork.Application/Modules/Access/Users/IUserRoleAssignmentRepository.cs

@@ -1,4 +1,4 @@
-using Cluckwork.Domain.Accounts;
+using Cluckwork.Domain.Modules.Farm.Accounts;
 
 namespace Cluckwork.Application.Modules.Access.Users;
 

src/Cluckwork.Application/Modules/Commerce/Catalog/CreateProduct/CreateProductHandler.cs

@@ -1,11 +1,11 @@
 using Cluckwork.Application.Common;
-using Cluckwork.Application.Features.Accounts;
 using Cluckwork.Application.Modules.Commerce.Contracts;
 using Cluckwork.Application.Modules.EggOperations.Contracts;
-using Cluckwork.Domain.Accounts;
+using Cluckwork.Application.Modules.Farm.Accounts;
 using Cluckwork.Domain.Common;
 using Cluckwork.Domain.Modules.Commerce.Catalog;
 using Cluckwork.Domain.Modules.Commerce.Contracts;
+using Cluckwork.Domain.Modules.Farm.Accounts;
 
 namespace Cluckwork.Application.Modules.Commerce.Catalog.CreateProduct;
 

src/Cluckwork.Application/Modules/Commerce/Catalog/UpdateProduct/UpdateProductHandler.cs

@@ -1,7 +1,7 @@
 using Cluckwork.Application.Common;
-using Cluckwork.Application.Features.Accounts;
 using Cluckwork.Application.Modules.Commerce.Contracts;
 using Cluckwork.Application.Modules.EggOperations.Contracts;
+using Cluckwork.Application.Modules.Farm.Accounts;
 using Cluckwork.Domain.Common;
 using Cluckwork.Domain.Modules.Commerce.Catalog;
 using Cluckwork.Domain.Modules.Commerce.Contracts;

src/Cluckwork.Application/Modules/Commerce/Sales/ConfirmSale/ConfirmSaleHandler.cs

@@ -1,11 +1,11 @@
 using Cluckwork.Application.Modules.Access.Contracts;
 using Cluckwork.Application.Modules.Commerce.Contracts;
 using Cluckwork.Application.Modules.EggOperations.Contracts;
+using Cluckwork.Application.Modules.Farm.Accounts;
 using Cluckwork.Domain.Modules.Commerce.Sales;
+using Cluckwork.Domain.Modules.Farm.Accounts;
 using System.Globalization;
 using Cluckwork.Application.Common;
-using Cluckwork.Application.Features.Accounts;
-using Cluckwork.Domain.Accounts;
 using Cluckwork.Domain.Common;
 using Microsoft.Extensions.Logging;
 

src/Cluckwork.Application/Modules/Commerce/Sales/CreateSalesOrder/CreateSalesOrderHandler.cs

@@ -1,7 +1,7 @@
 using Cluckwork.Application.Common;
-using Cluckwork.Application.Features.Accounts;
 using Cluckwork.Application.Modules.Commerce.Contracts;
 using Cluckwork.Application.Modules.Commerce.Customers;
+using Cluckwork.Application.Modules.Farm.Accounts;
 using Cluckwork.Domain.Common;
 using Cluckwork.Domain.Modules.Commerce.Sales;
 

src/Cluckwork.Application/Modules/EggOperations/EggGrades/CreateEggGrade/CreateEggGradeHandler.cs

@@ -1,9 +1,9 @@
 using Cluckwork.Application.Common;
 using Cluckwork.Application.Modules.EggOperations.Contracts;
-using Cluckwork.Domain.Accounts;
 using Cluckwork.Domain.Common;
 using Cluckwork.Domain.Modules.EggOperations.Contracts;
 using Cluckwork.Domain.Modules.EggOperations.Eggs;
+using Cluckwork.Domain.Modules.Farm.Accounts;
 
 namespace Cluckwork.Application.Modules.EggOperations.EggGrades.CreateEggGrade;
 

src/Cluckwork.Application/Modules/EggOperations/EggGrades/EggGradeFloorPolicy.cs

@@ -1,5 +1,5 @@
 using Cluckwork.Application.Common;
-using Cluckwork.Domain.Accounts;
+using Cluckwork.Domain.Modules.Farm.Accounts;
 
 namespace Cluckwork.Application.Modules.EggOperations.EggGrades;
 

src/Cluckwork.Application/Features/Accounts/CurrencyBoundRowProbe.cs → src/Cluckwork.Application/Modules/Farm/Accounts/CurrencyBoundRowProbe.cs

@@ -1,4 +1,4 @@
-namespace Cluckwork.Application.Features.Accounts;
+namespace Cluckwork.Application.Modules.Farm.Accounts;
 
 // #854: everything that has snapshotted the farm currency, asked of the
 // modules that own it, scoped to the current tenant by their query filters.

src/Cluckwork.Application/Features/Accounts/FarmModule.cs → src/Cluckwork.Application/Modules/Farm/Accounts/FarmModule.cs

@@ -1,12 +1,13 @@
-using Cluckwork.Application.Features.Accounts.RemoveFarmBanner;
-using Cluckwork.Application.Features.Accounts.RemoveFarmLogo;
-using Cluckwork.Application.Features.Accounts.SetFarmBanner;
-using Cluckwork.Application.Features.Accounts.SetFarmLogo;
-using Cluckwork.Application.Features.Accounts.UpdateFarmSettings;
-using Cluckwork.Domain.Accounts;
+using Cluckwork.Application.Modules.Farm.Accounts.RemoveFarmBanner;
+using Cluckwork.Application.Modules.Farm.Accounts.RemoveFarmLogo;
+using Cluckwork.Application.Modules.Farm.Accounts.SetFarmBanner;
+using Cluckwork.Application.Modules.Farm.Accounts.SetFarmLogo;
+using Cluckwork.Application.Modules.Farm.Accounts.UpdateFarmSettings;
+using Cluckwork.Application.Modules.Farm.Contracts;
 using Cluckwork.Domain.Common;
+using Cluckwork.Domain.Modules.Farm.Accounts;
 
-namespace Cluckwork.Application.Features.Accounts;
+namespace Cluckwork.Application.Modules.Farm.Accounts;
 
 public sealed class FarmModule(
     IAccountRepository accounts,

src/Cluckwork.Application/Features/Accounts/FarmSettingsRules.cs → src/Cluckwork.Application/Modules/Farm/Accounts/FarmSettingsRules.cs

@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace Cluckwork.Application.Features.Accounts;
+namespace Cluckwork.Application.Modules.Farm.Accounts;
 
 public static class FarmSettingsRules
 {