Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/trust v4 endpoint #409

Merged
merged 3 commits into from
Nov 7, 2023
+17 −17
Merged

Feature/trust v4 endpoint #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
000d1c9
Made all values null as dev data through an exception with missing va…
paullocknimble Nov 6, 2023
276def0
Merge branch 'main' into feature/trust-v4-endpoint
paullocknimble Nov 6, 2023
edc5f45
integration test settings revert
paullocknimble Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions Dfe.Academies.Domain/Trust/Trust.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@
public long? Region { get; set; }
public long? TrustBanding { get; set; }
public long? FK_TrustStatus { get; set; }
public string GroupUID { get; set; }
public string GroupID { get; set; }
public string? GroupUID { get; set; }
public string? GroupID { get; set; }
public string? RID { get; set; }
public string Name { get; set; }
public string CompaniesHouseNumber { get; set; }
public string? Name { get; set; }
public string? CompaniesHouseNumber { get; set; }
public DateTime? ClosedDate { get; set; }
public string TrustStatus { get; set; }
public string? TrustStatus { get; set; }
public DateTime? JoinedDate { get; set; }
public string? MainPhone { get; set; }
public string AddressLine1 { get; set; }
public string? AddressLine1 { get; set; }
public string? AddressLine2 { get; set; }
public string? AddressLine3 { get; set; }
public string Town { get; set; }
public string? Town { get; set; }
public string? County { get; set; }
public string Postcode { get; set; }
public string PrioritisedForReview { get; set; }
public string? Postcode { get; set; }
public string? PrioritisedForReview { get; set; }
public string? CurrentSingleListGrouping { get; set; }
public DateTime? DateOfGroupingDecision { get; set; }
public DateTime? DateEnteredOntoSingleList { get; set; }
Expand All @@ -34,19 +34,19 @@
public DateTime? DateActionPlannedFor { get; set; }
public string? WIPSummaryGoesToMinister { get; set; }
public DateTime? ExternalGovernanceReviewDate { get; set; }
public string EfficiencyICFPReviewCompleted { get; set; }
public string? EfficiencyICFPReviewCompleted { get; set; }
public string? EfficiencyICFPReviewOther { get; set; }
public string LinkToWorkplaceForEfficiencyICFPReview { get; set; }
public string? LinkToWorkplaceForEfficiencyICFPReview { get; set; }
public int? NumberInTrust { get; set; }
public DateTime? Modified { get; set; }
public string ModifiedBy { get; set; }
public string AMSDTerritory { get; set; }
public string LeadAMSDTerritory { get; set; }
public string UKPRN { get; set; }
public string? ModifiedBy { get; set; }
public string? AMSDTerritory { get; set; }
public string? LeadAMSDTerritory { get; set; }
public string? UKPRN { get; set; }
public DateTime? TrustPerformanceAndRiskDateOfMeeting { get; set; }
public string UPIN { get; set; }
public string? UPIN { get; set; }
public DateTime? IncorporatedOnOpenDate { get; set; }

public TrustType TrustType { get; set; }

Check warning on line 50 in Dfe.Academies.Domain/Trust/Trust.cs

View workflow job for this annotation

GitHub Actions / build-and-test 

Non-nullable property 'TrustType' must contain a non-null value when exiting constructor. Consider declaring the property as nullable.
}
}
2 changes: 1 addition & 1 deletion TramsDataApi.Test/integration_settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"AllowedHosts": "*",
"ApiKeys": ["{\"userName\": \"Test User\", \"apiKey\": \"testing-api-key\"}"],
"ConnectionStrings": {
"DefaultConnection": "Server=127.0.0.1,1434;Database=sip;User Id=sa;TrustServerCertificate=True;Password=StrongPassword905"
"DefaultConnection": "Server=127.0.0.1,1433;Database=sip;User Id=sa;TrustServerCertificate=True;Password=StrongPassword905"
}
}
Loading