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

Integration projections fixes #1143

Merged
merged 2 commits into from
Jan 16, 2024
Merged

Integration projections fixes #1143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afa31cd
fix: rename PuriId to Puri
jvandaal Jan 16, 2024
a4abb5f
fix: Integration database Oslo column values
jvandaal Jan 16, 2024
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
4 changes: 2 additions & 2 deletions src/BuildingRegistry.Projections.Integration/Building/LatestItem/BuildingLatestItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public sealed class BuildingLatestItem
public string? NisCode { get; set; }
public bool IsRemoved { get; set; }

public string PuriId { get; set; }
public string Puri { get; set; }
public string Namespace { get; set; }

public string VersionAsString { get; set; }
Expand Down Expand Up @@ -59,7 +59,7 @@ public void Configure(EntityTypeBuilder<BuildingLatestItem> builder)
builder.Property(x => x.Geometry).HasColumnName("geometry");
builder.Property(x => x.NisCode).HasColumnName("nis_code");
builder.Property(x => x.IsRemoved).HasColumnName("is_removed");
builder.Property(x => x.PuriId).HasColumnName("puri_id");
builder.Property(x => x.Puri).HasColumnName("puri");
builder.Property(x => x.Namespace).HasColumnName("namespace");
builder.Property(x => x.VersionAsString).HasColumnName("version_as_string");
builder.Property(BuildingLatestItem.VersionTimestampBackingPropertyName).HasColumnName("version_timestamp");
Expand Down
88 changes: 44 additions & 44 deletions ...dingRegistry.Projections.Integration/Building/LatestItem/BuildingLatestItemProjections.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ public BuildingLatestItemProjections(IOptions<IntegrationOptions> options)
var building = new BuildingLatestItem
{
BuildingPersistentLocalId = message.Message.BuildingPersistentLocalId,
Status = BuildingStatus.Parse(message.Message.BuildingStatus).Map(),
OsloStatus = message.Message.BuildingStatus,
GeometryMethod = BuildingGeometryMethod.Parse(message.Message.GeometryMethod).Map(),
OsloGeometryMethod = message.Message.GeometryMethod,
OsloStatus = BuildingStatus.Parse(message.Message.BuildingStatus).Map(),
Status = message.Message.BuildingStatus,
OsloGeometryMethod = BuildingGeometryMethod.Parse(message.Message.GeometryMethod).Map(),
GeometryMethod = message.Message.GeometryMethod,
Geometry = sysGeometry,
NisCode = nisCode,
IsRemoved = message.Message.IsRemoved,
VersionTimestamp = message.Message.Provenance.Timestamp,
Namespace = options.Value.BuildingNamespace,
PuriId = $"{options.Value.BuildingNamespace}/{message.Message.BuildingPersistentLocalId}"
Puri = $"{options.Value.BuildingNamespace}/{message.Message.BuildingPersistentLocalId}"
};

await context
Expand All @@ -55,16 +55,16 @@ await context
var building = new BuildingLatestItem
{
BuildingPersistentLocalId = message.Message.BuildingPersistentLocalId,
Status = BuildingStatus.Planned.Map(),
OsloStatus = BuildingStatus.Planned.Value,
GeometryMethod = BuildingGeometryMethod.Outlined.Map(),
OsloGeometryMethod = BuildingGeometryMethod.Outlined.Value,
OsloStatus = BuildingStatus.Planned.Map(),
Status = BuildingStatus.Planned.Value,
OsloGeometryMethod = BuildingGeometryMethod.Outlined.Map(),
GeometryMethod = BuildingGeometryMethod.Outlined.Value,
Geometry = sysGeometry,
NisCode = nisCode,
IsRemoved = false,
VersionTimestamp = message.Message.Provenance.Timestamp,
Namespace = options.Value.BuildingNamespace,
PuriId = $"{options.Value.BuildingNamespace}/{message.Message.BuildingPersistentLocalId}"
Puri = $"{options.Value.BuildingNamespace}/{message.Message.BuildingPersistentLocalId}"
};

await context
Expand All @@ -82,16 +82,16 @@ await context
var building = new BuildingLatestItem
{
BuildingPersistentLocalId = message.Message.BuildingPersistentLocalId,
Status = BuildingStatus.Realized.Map(),
OsloStatus = BuildingStatus.Realized.Value,
GeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Map(),
OsloGeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Value,
OsloStatus = BuildingStatus.Realized.Map(),
Status = BuildingStatus.Realized.Value,
OsloGeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Map(),
GeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Value,
Geometry = sysGeometry,
NisCode = nisCode,
IsRemoved = false,
VersionTimestamp = message.Message.Provenance.Timestamp,
Namespace = options.Value.BuildingNamespace,
PuriId = $"{options.Value.BuildingNamespace}/{message.Message.BuildingPersistentLocalId}"
Puri = $"{options.Value.BuildingNamespace}/{message.Message.BuildingPersistentLocalId}"
};

await context
Expand All @@ -111,8 +111,8 @@ await context.FindAndUpdateBuilding(
building =>
{
building.Geometry = sysGeometry;
building.GeometryMethod = BuildingGeometryMethod.Outlined.Map();
building.OsloGeometryMethod = BuildingGeometryMethod.Outlined.Value;
building.OsloGeometryMethod = BuildingGeometryMethod.Outlined.Map();
building.GeometryMethod = BuildingGeometryMethod.Outlined.Value;
building.NisCode = nisCode;
UpdateVersionTimestamp(building, message.Message);
},
Expand All @@ -131,8 +131,8 @@ await context.FindAndUpdateBuilding(
building =>
{
building.Geometry = sysGeometry;
building.GeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Map();
building.OsloGeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Value;
building.OsloGeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Map();
building.GeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Value;
building.NisCode = nisCode;
UpdateVersionTimestamp(building, message.Message);
},
Expand All @@ -145,8 +145,8 @@ await context.FindAndUpdateBuilding(
message.Message.BuildingPersistentLocalId,
building =>
{
building.Status = BuildingStatus.UnderConstruction.Map();
building.OsloStatus = BuildingStatus.UnderConstruction.Value;
building.OsloStatus = BuildingStatus.UnderConstruction.Map();
building.Status = BuildingStatus.UnderConstruction.Value;
UpdateVersionTimestamp(building, message.Message);
},
ct);
Expand All @@ -158,8 +158,8 @@ await context.FindAndUpdateBuilding(
message.Message.BuildingPersistentLocalId,
building =>
{
building.Status = BuildingStatus.Planned.Map();
building.OsloStatus = BuildingStatus.Planned.Value;
building.OsloStatus = BuildingStatus.Planned.Map();
building.Status = BuildingStatus.Planned.Value;
UpdateVersionTimestamp(building, message.Message);
},
ct);
Expand All @@ -171,8 +171,8 @@ await context.FindAndUpdateBuilding(
message.Message.BuildingPersistentLocalId,
building =>
{
building.Status = BuildingStatus.Realized.Map();
building.OsloStatus = BuildingStatus.Realized.Value;
building.OsloStatus = BuildingStatus.Realized.Map();
building.Status = BuildingStatus.Realized.Value;
UpdateVersionTimestamp(building, message.Message);
},
ct);
Expand All @@ -184,8 +184,8 @@ await context.FindAndUpdateBuilding(
message.Message.BuildingPersistentLocalId,
building =>
{
building.Status = BuildingStatus.UnderConstruction.Map();
building.OsloStatus = BuildingStatus.UnderConstruction.Value;
building.OsloStatus = BuildingStatus.UnderConstruction.Map();
building.Status = BuildingStatus.UnderConstruction.Value;
UpdateVersionTimestamp(building, message.Message);
},
ct);
Expand All @@ -197,8 +197,8 @@ await context.FindAndUpdateBuilding(
message.Message.BuildingPersistentLocalId,
building =>
{
building.Status = BuildingStatus.NotRealized.Map();
building.OsloStatus = BuildingStatus.NotRealized.Value;
building.OsloStatus = BuildingStatus.NotRealized.Map();
building.Status = BuildingStatus.NotRealized.Value;
UpdateVersionTimestamp(building, message.Message);
},
ct);
Expand All @@ -210,8 +210,8 @@ await context.FindAndUpdateBuilding(
message.Message.BuildingPersistentLocalId,
building =>
{
building.Status = BuildingStatus.Planned.Map();
building.OsloStatus = BuildingStatus.Planned.Value;
building.OsloStatus = BuildingStatus.Planned.Map();
building.Status = BuildingStatus.Planned.Value;
UpdateVersionTimestamp(building, message.Message);
},
ct);
Expand All @@ -229,8 +229,8 @@ await context.FindAndUpdateBuilding(
building =>
{
building.Geometry = sysGeometry;
building.GeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Map();
building.OsloGeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Value;
building.OsloGeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Map();
building.GeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Value;
building.NisCode = nisCode;
UpdateVersionTimestamp(building, message.Message);
},
Expand All @@ -249,8 +249,8 @@ await context.FindAndUpdateBuilding(
building =>
{
building.Geometry = sysGeometry;
building.GeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Map();
building.OsloGeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Value;
building.OsloGeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Map();
building.GeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Value;
building.NisCode = nisCode;
UpdateVersionTimestamp(building, message.Message);
},
Expand All @@ -263,8 +263,8 @@ await context.FindAndUpdateBuilding(
message.Message.BuildingPersistentLocalId,
building =>
{
building.Status = BuildingStatus.Retired.Map();
building.OsloStatus = BuildingStatus.Retired.Value;
building.OsloStatus = BuildingStatus.Retired.Map();
building.Status = BuildingStatus.Retired.Value;
UpdateVersionTimestamp(building, message.Message);
},
ct);
Expand Down Expand Up @@ -327,16 +327,16 @@ await context.FindAndUpdateBuilding(
var building = new BuildingLatestItem
{
BuildingPersistentLocalId = message.Message.BuildingPersistentLocalId,
Status = BuildingStatus.Realized.Map(),
OsloStatus = BuildingStatus.Realized.Value,
GeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Map(),
OsloGeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Value,
OsloStatus = BuildingStatus.Realized.Map(),
Status = BuildingStatus.Realized.Value,
OsloGeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Map(),
GeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Value,
Geometry = sysGeometry,
NisCode = nisCode,
IsRemoved = false,
VersionTimestamp = message.Message.Provenance.Timestamp,
Namespace = options.Value.BuildingNamespace,
PuriId = $"{options.Value.BuildingNamespace}/{message.Message.BuildingPersistentLocalId}"
Puri = $"{options.Value.BuildingNamespace}/{message.Message.BuildingPersistentLocalId}"
};

await context
Expand Down Expand Up @@ -366,8 +366,8 @@ await context.FindAndUpdateBuilding(
message.Message.BuildingPersistentLocalId,
building =>
{
building.Status = BuildingStatus.Retired.Map();
building.OsloStatus = BuildingStatus.Retired.Value;
building.OsloStatus = BuildingStatus.Retired.Map();
building.Status = BuildingStatus.Retired.Value;
UpdateVersionTimestamp(building, message.Message);
},
ct);
Expand Down
4 changes: 2 additions & 2 deletions ...uildingRegistry.Projections.Integration/BuildingUnit/LatestItem/BuildingUnitLatestItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public sealed class BuildingUnitLatestItem
public bool HasDeviation { get; set; }
public bool IsRemoved { get; set; }

public string PuriId { get; set; }
public string Puri { get; set; }
public string Namespace { get; set; }

public string VersionAsString { get; set; }
Expand Down Expand Up @@ -65,7 +65,7 @@ public void Configure(EntityTypeBuilder<BuildingUnitLatestItem> builder)
builder.Property(x => x.Geometry).HasColumnName("geometry");
builder.Property(x => x.HasDeviation).HasColumnName("has_deviation");
builder.Property(x => x.IsRemoved).HasColumnName("is_removed");
builder.Property(x => x.PuriId).HasColumnName("puri_id");
builder.Property(x => x.Puri).HasColumnName("puri");
builder.Property(x => x.Namespace).HasColumnName("namespace");
builder.Property(x => x.VersionAsString).HasColumnName("version_as_string");
builder.Property(BuildingUnitLatestItem.VersionTimestampBackingPropertyName).HasColumnName("version_timestamp");
Expand Down
Loading
Loading