Skip to content

Commit

Permalink
feat: add building oslo status
Browse files Browse the repository at this point in the history
  • Loading branch information
@jvandaal
jvandaal committed Jan 30, 2024
1 parent 5207708 commit 354724a
Show file tree
Hide file tree
Showing 4 changed files with 96 additions and 33 deletions.
4 changes: 4 additions & 0 deletions src/BuildingRegistry.Projections.Integration/Building/Version/BuildingVersion.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public sealed class BuildingVersion
public Guid? BuildingId { get; set; }
public int BuildingPersistentLocalId { get; set; }
public string? Status { get; set; }
public string? OsloStatus { get; set; }
public string? GeometryMethod { get; set; }
public Geometry? Geometry { get; set; }
public string? NisCode { get; set; }
Expand Down Expand Up @@ -68,6 +69,7 @@ public BuildingVersion CloneAndApplyEventInfo(
BuildingId = BuildingId,
BuildingPersistentLocalId = BuildingPersistentLocalId,
Status = Status,
OsloStatus = OsloStatus,
GeometryMethod = GeometryMethod,
Geometry = Geometry,
NisCode = NisCode,
Expand Down Expand Up @@ -102,6 +104,7 @@ public void Configure(EntityTypeBuilder<BuildingVersion> builder)
builder.Property(x => x.BuildingId).HasColumnName("building_id");
builder.Property(x => x.BuildingPersistentLocalId).HasColumnName("building_persistent_local_id");
builder.Property(x => x.Status).HasColumnName("status");
builder.Property(x => x.OsloStatus).HasColumnName("oslo_status");
builder.Property(x => x.GeometryMethod).HasColumnName("geometry_method");
builder.Property(x => x.Geometry).HasColumnName("geometry");
builder.Property(x => x.NisCode).HasColumnName("nis_code");
Expand All @@ -118,6 +121,7 @@ public void Configure(EntityTypeBuilder<BuildingVersion> builder)

builder.HasIndex(x => x.BuildingPersistentLocalId);
builder.HasIndex(x => x.Status);
builder.HasIndex(x => x.OsloStatus);
builder.HasIndex(x => x.IsRemoved);
builder.HasIndex(x => x.NisCode);
builder.HasIndex(x => x.Geometry).HasMethod("GIST");
Expand Down
32 changes: 22 additions & 10 deletions ...istry.Projections.Integration/Building/Version/BuildingVersionProjections-LegacyEvents.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ await context.CreateNewBuildingVersion(
message,
building =>
{
building.Status = BuildingStatus.UnderConstruction.Map();
building.Status = BuildingStatus.UnderConstruction.Value;
building.OsloStatus = BuildingStatus.UnderConstruction.Map();
},
ct);
});
Expand All @@ -108,7 +109,8 @@ await context.CreateNewBuildingVersion(
message,
building =>
{
building.Status = BuildingStatus.NotRealized.Map();
building.Status = BuildingStatus.NotRealized.Value;
building.OsloStatus = BuildingStatus.NotRealized.Map();
},
ct);
});
Expand All @@ -120,7 +122,8 @@ await context.CreateNewBuildingVersion(
message,
building =>
{
building.Status = BuildingStatus.Planned.Map();
building.Status = BuildingStatus.Planned.Value;
building.OsloStatus = BuildingStatus.Planned.Map();
},
ct);
});
Expand All @@ -132,7 +135,8 @@ await context.CreateNewBuildingVersion(
message,
building =>
{
building.Status = BuildingStatus.Realized.Map();
building.Status = BuildingStatus.Realized.Value;
building.OsloStatus = BuildingStatus.Realized.Map();
},
ct);
});
Expand All @@ -144,7 +148,8 @@ await context.CreateNewBuildingVersion(
message,
building =>
{
building.Status = BuildingStatus.Retired.Map();
building.Status = BuildingStatus.Retired.Value;
building.OsloStatus = BuildingStatus.Retired.Map();
},
ct);
});
Expand All @@ -156,7 +161,8 @@ await context.CreateNewBuildingVersion(
message,
building =>
{
building.Status = BuildingStatus.NotRealized.Map();
building.Status = BuildingStatus.NotRealized.Value;
building.OsloStatus = BuildingStatus.NotRealized.Map();
},
ct);
});
Expand All @@ -168,7 +174,8 @@ await context.CreateNewBuildingVersion(
message,
building =>
{
building.Status = BuildingStatus.Planned.Map();
building.Status = BuildingStatus.Planned.Value;
building.OsloStatus = BuildingStatus.Planned.Map();
},
ct);
});
Expand All @@ -180,7 +187,8 @@ await context.CreateNewBuildingVersion(
message,
building =>
{
building.Status = BuildingStatus.Retired.Map();
building.Status = BuildingStatus.Retired.Value;
building.OsloStatus = BuildingStatus.Retired.Map();
},
ct);
});
Expand All @@ -192,7 +200,8 @@ await context.CreateNewBuildingVersion(
message,
building =>
{
building.Status = BuildingStatus.Realized.Map();
building.Status = BuildingStatus.Realized.Value;
building.OsloStatus = BuildingStatus.Realized.Map();
},
ct);
});
Expand All @@ -204,7 +213,8 @@ await context.CreateNewBuildingVersion(
message,
building =>
{
building.Status = BuildingStatus.UnderConstruction.Map();
building.Status = BuildingStatus.UnderConstruction.Value;
building.OsloStatus = BuildingStatus.UnderConstruction.Map();
},
ct);
});
Expand All @@ -217,6 +227,7 @@ await context.CreateNewBuildingVersion(
building =>
{
building.Status = null;
building.OsloStatus = null;
},
ct);
});
Expand All @@ -229,6 +240,7 @@ await context.CreateNewBuildingVersion(
building =>
{
building.Status = null;
building.OsloStatus = null;
},
ct);
});
Expand Down
60 changes: 48 additions & 12 deletions src/BuildingRegistry.Projections.Integration/Building/Version/BuildingVersionProjections.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ await context.CreateNewBuildingVersion(
building =>
{
building.BuildingPersistentLocalId = message.Message.BuildingPersistentLocalId;
building.Status = BuildingStatus.Parse(message.Message.BuildingStatus).Map();
building.Status = BuildingStatus.Parse(message.Message.BuildingStatus).Value;
building.OsloStatus = BuildingStatus.Parse(message.Message.BuildingStatus).Map();
building.GeometryMethod = BuildingGeometryMethod.Parse(message.Message.GeometryMethod).Map();
building.Geometry = sysGeometry;
building.NisCode = nisCode;
Expand All @@ -58,7 +59,8 @@ await context.CreateNewBuildingVersion(
{
Position = message.Position,
BuildingPersistentLocalId = message.Message.BuildingPersistentLocalId,
Status = BuildingStatus.Planned.Map(),
Status = BuildingStatus.Planned.Value,
OsloStatus = BuildingStatus.Planned.Map(),
GeometryMethod = BuildingGeometryMethod.Outlined.Map(),
Geometry = sysGeometry,
NisCode = nisCode,
Expand All @@ -85,7 +87,8 @@ await context
{
Position = message.Position,
BuildingPersistentLocalId = message.Message.BuildingPersistentLocalId,
Status = BuildingStatus.Realized.Map(),
Status = BuildingStatus.Realized.Value,
OsloStatus = BuildingStatus.Realized.Map(),
GeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Map(),
Geometry = sysGeometry,
NisCode = nisCode,
Expand Down Expand Up @@ -144,7 +147,11 @@ await context.CreateNewBuildingVersion(
await context.CreateNewBuildingVersion(
message.Message.BuildingPersistentLocalId,
message,
building => { building.Status = BuildingStatus.UnderConstruction.Map(); },
building =>
{
building.Status = BuildingStatus.UnderConstruction.Value;
building.OsloStatus = BuildingStatus.UnderConstruction.Map();
},
ct);
});

Expand All @@ -153,7 +160,11 @@ await context.CreateNewBuildingVersion(
await context.CreateNewBuildingVersion(
message.Message.BuildingPersistentLocalId,
message,
building => { building.Status = BuildingStatus.Planned.Map(); },
building =>
{
building.Status = BuildingStatus.Planned.Value;
building.OsloStatus = BuildingStatus.Planned.Map();
},
ct);
});

Expand All @@ -162,7 +173,11 @@ await context.CreateNewBuildingVersion(
await context.CreateNewBuildingVersion(
message.Message.BuildingPersistentLocalId,
message,
building => { building.Status = BuildingStatus.Realized.Map(); },
building =>
{
building.Status = BuildingStatus.Realized.Value;
building.OsloStatus = BuildingStatus.Realized.Map();
},
ct);
});

Expand All @@ -171,7 +186,11 @@ await context.CreateNewBuildingVersion(
await context.CreateNewBuildingVersion(
message.Message.BuildingPersistentLocalId,
message,
building => { building.Status = BuildingStatus.UnderConstruction.Map(); },
building =>
{
building.Status = BuildingStatus.UnderConstruction.Value;
building.OsloStatus = BuildingStatus.UnderConstruction.Map();
},
ct);
});

Expand All @@ -180,7 +199,11 @@ await context.CreateNewBuildingVersion(
await context.CreateNewBuildingVersion(
message.Message.BuildingPersistentLocalId,
message,
building => { building.Status = BuildingStatus.NotRealized.Map(); },
building =>
{
building.Status = BuildingStatus.NotRealized.Value;
building.OsloStatus = BuildingStatus.NotRealized.Map();
},
ct);
});

Expand All @@ -189,7 +212,11 @@ await context.CreateNewBuildingVersion(
await context.CreateNewBuildingVersion(
message.Message.BuildingPersistentLocalId,
message,
building => { building.Status = BuildingStatus.Planned.Map(); },
building =>
{
building.Status = BuildingStatus.Planned.Value;
building.OsloStatus = BuildingStatus.Planned.Map();
},
ct);
});

Expand Down Expand Up @@ -236,7 +263,11 @@ await context.CreateNewBuildingVersion(
await context.CreateNewBuildingVersion(
message.Message.BuildingPersistentLocalId,
message,
building => { building.Status = BuildingStatus.Retired.Map(); },
building =>
{
building.Status = BuildingStatus.Retired.Value;
building.OsloStatus = BuildingStatus.Retired.Map();
},
ct);
});

Expand Down Expand Up @@ -296,7 +327,8 @@ await context.CreateNewBuildingVersion(
{
Position = message.Position,
BuildingPersistentLocalId = message.Message.BuildingPersistentLocalId,
Status = BuildingStatus.Realized.Map(),
Status = BuildingStatus.Realized.Value,
OsloStatus = BuildingStatus.Realized.Map(),
GeometryMethod = BuildingGeometryMethod.MeasuredByGrb.Map(),
Geometry = sysGeometry,
NisCode = nisCode,
Expand Down Expand Up @@ -335,7 +367,11 @@ await context.CreateNewBuildingVersion(
await context.CreateNewBuildingVersion(
message.Message.BuildingPersistentLocalId,
message,
building => { building.Status = BuildingStatus.Retired.Map(); },
building =>
{
building.Status = BuildingStatus.Retired.Value;
building.OsloStatus = BuildingStatus.Retired.Map();
},
ct);
});
}
Expand Down
Loading

0 comments on commit 354724a

Please sign in to comment.