mirror of
https://github.com/Sea-Haven-Industries/shoc-backend.git
synced 2026-09-30 10:43:13 +00:00
e5cf4cec09
Brings in dev's Phase 5 (PR #17) + vendor PRs (#25/#28/#29) atop the Phase 6/7 + flagColor base (PR #22). Preserves dev Phase 1-5 behavior and PR #22 Phase 6/7 + flagColor behavior. Conflict resolutions (16 files): - Migrations Phase4_SearchIndexes/.Designer + Phase5_DomainEvents/.Designer: take dev (Phase4 incl. SQL Server SiteCode/InternalWONumber index-compat shrink fix; Phase5 identical). ModelSnapshot union: Vendor CompanyId index + Phase7 ServiceNotes/ExternalWorkOrderId index. - ApplicationDbContext: keep dev SiteCode/InternalWONumber MaxLength (Phase1-5 + unguarded model test) + HEAD CompletionDocTemplate/ExternalWorkOrderId. - WorkOrderAuditService: unify on dev async staging API; convert Phase6 CompletionService 2 call sites to await StageFieldChangedAsync (drops HEAD sync duplicate; only callers, no test refs). - Hosted services: take HEAD (retry-on-failure, coherent with Phase7 WorkOrderJobRunStateAccessor/OpsHealth). Program.cs keeps dev vendor DI (ClamAV/VendorDocumentScanWorker/ArgumentExceptionFilter) + HEAD Phase7. - WorkOrderController: keep HEAD Phase6/7 service params + dev doc comment. - VendorController/WorkOrderBoardCreateService/QueryFilters/appsettings: union / dev-correct. - WorkOrderBoardUpdateServiceTests: union of HEAD (Phase6/7+flagColor) and dev (Phase1-5) test methods. Verified WorkOrderType.Other (enum 99) is a legit category, not an overdue sentinel; overdue uses dedicated OperationalFlags.PastDue + IsPastDue, and 'Overdue' is rejected as a WorkOrderType (no PR #23 import needed). Removed dev duplicate Api.Options.WorkOrderJobRunState (HEAD defines it in Services.Implementation alongside the Accessor; Services cannot reference Api). |
||
|---|---|---|
| .. | ||
| IAccountDataService.cs | ||
| IAssetDataService.cs | ||
| ICategoryDataService.cs | ||
| ICommentDataService.cs | ||
| IContactDataService.cs | ||
| IDispatchDataService.cs | ||
| IEmployeeDataService.cs | ||
| IFollowUpDataService.cs | ||
| ILocationDataService.cs | ||
| IPMScheduleDataService.cs | ||
| IQuotesDataService.cs | ||
| ITaskListTemplateDataService.cs | ||
| IUserDataService.cs | ||
| IVendorDataService.cs | ||
| IWorkOrderAdvancedSearchDataService.cs | ||
| IWorkOrderBoardDataService.cs | ||
| IWorkOrderDataService.cs | ||
| IWorkOrderDetailDataService.cs | ||
| IWorkOrderDomainJobDataService.cs | ||
| WorkOrderAdvancedSearchModels.cs | ||
| WorkOrderBoardModels.cs | ||
| WorkOrderDetailModels.cs | ||