Skip to content

Commit 7bb4840

Browse files
xnodeoncodexnodeoncode
authored
Merge pull request #21 from xnodeoncode/development - Simple Start Refactor
Simple Start Refactor
2 parents ddd5bb4 + cb644ec commit 7bb4840

278 files changed

Lines changed: 48449 additions & 23926 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/copilot-instructions.md‎

Lines changed: 940 additions & 0 deletions
Large diffs are not rendered by default.

‎0-Aquiis.Core/Constants/ApplicationConstants.cs‎

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static class OrganizationRoles
5050
/// <summary>
5151
/// PropertyManager - Full property management features (no admin/settings access)
5252
/// </summary>
53-
public const string PropertyManager = "Property Manager";
53+
public const string PropertyManager = "PropertyManager";
5454

5555
/// <summary>
5656
/// Maintenance - Maintenance requests, work orders, and vendors
@@ -176,14 +176,16 @@ public static class InvoiceStatuses
176176
public const string Paid = "Paid";
177177
public const string Overdue = "Overdue";
178178
public const string Cancelled = "Cancelled";
179+
public const string Voided = "Voided";
179180

180181
public static IReadOnlyList<string> AllInvoiceStatuses { get; } = new List<string>
181182
{
182183
Pending,
183184
PaidPartial,
184185
Paid,
185186
Overdue,
186-
Cancelled
187+
Cancelled,
188+
Voided
187189
};
188190
}
189191

@@ -193,13 +195,15 @@ public static class PaymentStatuses
193195
public const string Pending = "Pending";
194196
public const string Failed = "Failed";
195197
public const string Refunded = "Refunded";
198+
public const string Voided = "Voided";
196199

197200
public static IReadOnlyList<string> AllPaymentStatuses { get; } = new List<string>
198201
{
199202
Completed,
200203
Pending,
201204
Failed,
202-
Refunded
205+
Refunded,
206+
Voided
203207
};
204208
}
205209
public static class InspectionTypes
@@ -275,6 +279,13 @@ public static class LeaseStatuses {
275279
Terminated,
276280
Expired
277281
};
282+
283+
public static IReadOnlyList<string> DefaultStatuses { get; } = new List<string>
284+
{
285+
Active,
286+
MonthToMonth,
287+
Terminated
288+
};
278289
}
279290

280291

@@ -359,6 +370,44 @@ public static class MaintenanceRequestTypes
359370
};
360371
}
361372

373+
/// <summary>
374+
/// Repair type categories for logging work performed on properties.
375+
/// Used by the Repair entity (work WITHOUT workflow).
376+
/// </summary>
377+
public static class RepairTypes
378+
{
379+
public const string Plumbing = "Plumbing";
380+
public const string Electrical = "Electrical";
381+
public const string HeatingCooling = "Heating/Cooling";
382+
public const string Appliance = "Appliance";
383+
public const string Structural = "Structural";
384+
public const string Landscaping = "Landscaping";
385+
public const string PestControl = "Pest Control";
386+
public const string Painting = "Painting";
387+
public const string Carpentry = "Carpentry";
388+
public const string Flooring = "Flooring";
389+
public const string Roofing = "Roofing";
390+
public const string Windows = "Windows/Doors";
391+
public const string Other = "Other";
392+
393+
public static IReadOnlyList<string> AllRepairTypes { get; } = new List<string>
394+
{
395+
Plumbing,
396+
Electrical,
397+
HeatingCooling,
398+
Appliance,
399+
Structural,
400+
Landscaping,
401+
PestControl,
402+
Painting,
403+
Carpentry,
404+
Flooring,
405+
Roofing,
406+
Windows,
407+
Other
408+
};
409+
}
410+
362411
public static class MaintenanceRequestPriorities
363412
{
364413
public const string Low = "Low";

‎0-Aquiis.Core/Constants/ApplicationSettings.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ public class ApplicationSettings
99
public string Repository { get; set; } = string.Empty;
1010
public bool SoftDeleteEnabled { get; set; }
1111
public string SchemaVersion { get; set; } = "1.0.0";
12+
public int MaxOrganizationUsers { get; set; } = 0; // 0 = unlimited (Professional), 3 = SimpleStart limit
1213
}
1314

1415
// Property & Tenant Lifecycle Enums

‎0-Aquiis.Core/Entities/MaintenanceRequest.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,23 @@ public class MaintenanceRequest : BaseModel, ISchedulableEntity
6767
public virtual Property? Property { get; set; }
6868
public virtual Lease? Lease { get; set; }
6969

70+
/// <summary>
71+
/// Collection of repairs that comprise this maintenance request.
72+
/// A MaintenanceRequest CONSISTS of one or more Repairs (composition relationship).
73+
/// Professional product: MR must have at least one repair before completion.
74+
/// </summary>
75+
public virtual ICollection<Repair> Repairs { get; set; } = new List<Repair>();
76+
77+
// Computed properties for repair aggregation
78+
[NotMapped]
79+
public decimal TotalRepairCost => Repairs?.Sum(r => r.Cost) ?? 0;
80+
81+
[NotMapped]
82+
public int RepairCount => Repairs?.Count ?? 0;
83+
84+
[NotMapped]
85+
public int TotalRepairDuration => Repairs?.Sum(r => r.DurationMinutes) ?? 0;
86+
7087
// Computed property for days open
7188
[NotMapped]
7289
public int DaysOpen

‎0-Aquiis.Core/Entities/Organization.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class Organization
4141
public bool IsDeleted { get; set; } = false;
4242

4343
// Navigation properties
44-
public virtual ICollection<UserOrganization> UserOrganizations { get; set; } = new List<UserOrganization>();
44+
public virtual ICollection<OrganizationUser> OrganizationUsers { get; set; } = new List<OrganizationUser>();
4545
public virtual ICollection<Property> Properties { get; set; } = new List<Property>();
4646
public virtual ICollection<Tenant> Tenants { get; set; } = new List<Tenant>();
4747
public virtual ICollection<Lease> Leases { get; set; } = new List<Lease>();

0-Aquiis.Core/Entities/UserOrganization.cs renamed to 0-Aquiis.Core/Entities/OrganizationUser.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ namespace Aquiis.Core.Entities
88
/// <summary>
99
/// Junction table for multi-organization user assignments with role-based permissions
1010
/// </summary>
11-
public class UserOrganization
11+
public class OrganizationUser
1212
{
1313

1414
[RequiredGuid]
15-
[Display(Name = "UserOrganization ID")]
15+
[Display(Name = "OrganizationUser ID")]
1616
public Guid Id { get; set; } = Guid.NewGuid();
1717

1818
/// <summary>

‎0-Aquiis.Core/Entities/Payment.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ public class Payment : BaseModel
1010
[Display(Name = "Organization ID")]
1111
public Guid OrganizationId { get; set; } = Guid.Empty;
1212

13+
[Required]
14+
[StringLength(50)]
15+
[Display(Name = "Payment Number")]
16+
public string PaymentNumber { get; set; } = string.Empty;
17+
1318
[Required]
1419
public Guid InvoiceId { get; set; }
1520

‎0-Aquiis.Core/Entities/Property.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ public class Property : BaseModel
124124
// Navigation properties
125125
public virtual ICollection<Lease> Leases { get; set; } = new List<Lease>();
126126
public virtual ICollection<Document> Documents { get; set; } = new List<Document>();
127+
public virtual ICollection<Repair> Repairs { get; set; } = new List<Repair>();
128+
public virtual ICollection<MaintenanceRequest> MaintenanceRequests { get; set; } = new List<MaintenanceRequest>();
127129

128130
// Computed property for pending application count
129131
[NotMapped]

‎0-Aquiis.Core/Entities/Repair.cs‎

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
using System.ComponentModel.DataAnnotations;
2+
using System.ComponentModel.DataAnnotations.Schema;
3+
using Aquiis.Core.Validation;
4+
5+
namespace Aquiis.Core.Entities;
6+
7+
/// <summary>
8+
/// Represents work performed on a property WITHOUT workflow/status tracking.
9+
/// Repairs capture what work was done (or is being done) without the complexity
10+
/// of MaintenanceRequest workflow (no Status, Priority, or Assignment).
11+
/// Use CompletedOn to determine if work is finished (null = in progress, date = completed).
12+
/// </summary>
13+
public class Repair : BaseModel
14+
{
15+
// Core Identity
16+
[RequiredGuid]
17+
[Display(Name = "Organization ID")]
18+
public Guid OrganizationId { get; set; } = Guid.Empty;
19+
20+
[RequiredGuid]
21+
public Guid PropertyId { get; set; }
22+
23+
// Optional Relationships (Soft References)
24+
/// <summary>
25+
/// Optional: Links this repair to a MaintenanceRequest workflow (Professional product).
26+
/// Null for standalone repairs (SimpleStart product).
27+
/// </summary>
28+
public Guid? MaintenanceRequestId { get; set; }
29+
30+
/// <summary>
31+
/// Optional: Links this repair to a specific lease/tenant.
32+
/// </summary>
33+
public Guid? LeaseId { get; set; }
34+
35+
// Repair Details
36+
[Required]
37+
[StringLength(200)]
38+
[Display(Name = "Description")]
39+
public string Description { get; set; } = string.Empty;
40+
41+
[StringLength(50)]
42+
[Display(Name = "Repair Type")]
43+
public string RepairType { get; set; } = string.Empty; // From ApplicationConstants.RepairTypes
44+
45+
/// <summary>
46+
/// Optional: Date when work was actually completed.
47+
/// Null = work in progress or not yet completed.
48+
/// Date = work finished on this date.
49+
/// Since Repairs have no Status field, CompletedOn provides definitive completion date.
50+
/// </summary>
51+
[Display(Name = "Completed On")]
52+
public DateTime? CompletedOn { get; set; }
53+
54+
// Cost & Duration
55+
[Column(TypeName = "decimal(18,2)")]
56+
[Display(Name = "Cost")]
57+
public decimal Cost { get; set; }
58+
59+
[Display(Name = "Duration (Minutes)")]
60+
public int DurationMinutes { get; set; } // Time spent on repair
61+
62+
// Who did the work
63+
[StringLength(100)]
64+
[Display(Name = "Contractor/Company Name")]
65+
public string ContractorName { get; set; } = string.Empty; // Company or person name (e.g., "ABC Plumbing & Heating" or "John Doe")
66+
67+
[StringLength(100)]
68+
[Display(Name = "Contact Person")]
69+
public string ContactPerson { get; set; } = string.Empty; // Specific person at company (optional for companies)
70+
71+
[StringLength(20)]
72+
[Display(Name = "Contractor Phone")]
73+
public string ContractorPhone { get; set; } = string.Empty; // Optional: "555-1234"
74+
75+
/// <summary>
76+
/// Optional: Link to Contractor entity when contractor list is implemented.
77+
/// When null, contractor details are stored in text fields (ContractorName/ContactPerson/ContractorPhone).
78+
/// </summary>
79+
[Display(Name = "Contractor ID")]
80+
public Guid? ContractorId { get; set; }
81+
82+
/// <summary>
83+
/// Future: Link to formal Contact entity when added to the system.
84+
/// </summary>
85+
public Guid? ContactId { get; set; }
86+
87+
// Additional Details
88+
[StringLength(2000)]
89+
[Display(Name = "Notes")]
90+
public string Notes { get; set; } = string.Empty;
91+
92+
[StringLength(500)]
93+
[Display(Name = "Parts Replaced")]
94+
public string PartsReplaced { get; set; } = string.Empty; // e.g., "Faucet cartridge, shower seal"
95+
96+
[Display(Name = "Warranty Applies")]
97+
public bool WarrantyApplies { get; set; } = false;
98+
99+
[Display(Name = "Warranty Expires On")]
100+
public DateTime? WarrantyExpiresOn { get; set; }
101+
102+
// Navigation Properties
103+
public virtual Property? Property { get; set; }
104+
public virtual MaintenanceRequest? MaintenanceRequest { get; set; }
105+
public virtual Lease? Lease { get; set; }
106+
107+
// Computed Properties
108+
[NotMapped]
109+
[Display(Name = "Duration")]
110+
public string DurationDisplay
111+
{
112+
get
113+
{
114+
if (DurationMinutes < 60)
115+
return $"{DurationMinutes} minutes";
116+
117+
var hours = DurationMinutes / 60;
118+
var minutes = DurationMinutes % 60;
119+
return minutes > 0
120+
? $"{hours}h {minutes}m"
121+
: $"{hours} hour{(hours > 1 ? "s" : "")}";
122+
}
123+
}
124+
125+
[NotMapped]
126+
[Display(Name = "Under Warranty")]
127+
public bool IsUnderWarranty => WarrantyApplies &&
128+
WarrantyExpiresOn.HasValue &&
129+
WarrantyExpiresOn.Value > DateTime.Today;
130+
131+
[NotMapped]
132+
[Display(Name = "Completed")]
133+
public bool IsCompleted => CompletedOn.HasValue; //Provides quick check for completion status. If no value, work is In Progess in the display.
134+
}

‎0-Aquiis.Core/Entities/UserProfile.cs‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
using System;
2+
3+
namespace Aquiis.Core.Entities;
4+
5+
/// <summary>
6+
/// User profile information stored in business context (ApplicationDbContext).
7+
/// Separate from Identity (AspNetUsers) to enable single-context queries with business entities.
8+
/// Email is denormalized for query simplification (considered read-only in B2B context).
9+
/// </summary>
10+
public class UserProfile : BaseModel
11+
{
12+
/// <summary>
13+
/// Foreign key to AspNetUsers.Id (Identity context).
14+
/// This links the profile to the authentication user.
15+
/// </summary>
16+
public string UserId { get; set; } = string.Empty;
17+
18+
// Personal Information (denormalized from Identity for query efficiency)
19+
20+
/// <summary>
21+
/// User's email address (cached from AspNetUsers).
22+
/// Considered read-only - changes require sync with Identity table.
23+
/// </summary>
24+
public string Email { get; set; } = string.Empty;
25+
26+
public string FirstName { get; set; } = string.Empty;
27+
public string LastName { get; set; } = string.Empty;
28+
public string? PhoneNumber { get; set; }
29+
30+
// Organization Context
31+
32+
/// <summary>
33+
/// User's "home" organization - their primary/default organization.
34+
/// </summary>
35+
public Guid? OrganizationId { get; set; }
36+
37+
/// <summary>
38+
/// Currently active organization the user is viewing/working with.
39+
/// Can differ from home organization for users with multi-org access.
40+
/// </summary>
41+
public Guid? ActiveOrganizationId { get; set; }
42+
43+
// Computed Properties
44+
45+
/// <summary>
46+
/// Full name combining first and last name.
47+
/// </summary>
48+
public string FullName => $"{FirstName} {LastName}".Trim();
49+
50+
/// <summary>
51+
/// Display name for UI - uses full name if available, falls back to email.
52+
/// </summary>
53+
public string DisplayName => string.IsNullOrWhiteSpace(FullName) ? Email : FullName;
54+
}

0 commit comments

Comments
 (0)