Skip to content

Commit

Permalink
fix(ci): actually check formatting instead of formatting during workf…
Browse files Browse the repository at this point in the history
…low (#566)

* fix(ci): actually check formatting instead of formatting during workflow

* fix unformatted files

---------

Co-authored-by: Konstantin <[email protected]>
  • Loading branch information
hf-kklein and Konstantin authored Oct 31, 2024
1 parent d5e6a5d commit 4840042
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/formatter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:
- name: Restore .NET tools
run: dotnet tool restore
- name: Run CSharpier
run: dotnet csharpier --check BO4E-dotnet.sln
run: dotnet csharpier . --check
21 changes: 12 additions & 9 deletions BO4E/BO/Leistungskurvendefinition.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ public class Leistungskurvendefinition : BusinessObject
[ProtoMember(10)]
[JsonPropertyOrder(10)]
public bool? Ausgerollt { get; set; }



[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
[ProtoMember(11, Name = nameof(Aenderungszeitpunkt))]
Expand All @@ -34,7 +33,7 @@ private DateTime _Aenderungszeitpunkt
get => Aenderungszeitpunkt.UtcDateTime;
set => Aenderungszeitpunkt = DateTime.SpecifyKind(value, DateTimeKind.Utc);
}

/// <summary>
/// Leistungskurvenänderungszeitpunkt
/// </summary>
Expand All @@ -44,17 +43,21 @@ private DateTime _Aenderungszeitpunkt
[JsonPropertyOrder(12)]
[ProtoIgnore]
public DateTimeOffset Aenderungszeitpunkt { get; set; }

/// <summary>
/// Code der Leistungskurvendefinition
/// </summary>
[BoKey]
[JsonProperty(Required = Required.Default, Order = 13, PropertyName = "leistungskurvendefinitionscode")]
[JsonProperty(
Required = Required.Default,
Order = 13,
PropertyName = "leistungskurvendefinitionscode"
)]
[JsonPropertyName("leistungskurvendefinitionscode")]
[ProtoMember(13)]
[JsonPropertyOrder(13)]
public string? LeistungskurvendefinitionsCode { get; set; }

/// <summary>
/// Häufigkeit der Übermittlung
/// </summary>
Expand All @@ -63,7 +66,7 @@ private DateTime _Aenderungszeitpunkt
[ProtoMember(14)]
[JsonPropertyOrder(14)]
public HaeufigkeitZaehlzeit? Haeufigkeit { get; set; }

/// <summary>
/// Übermittelbarkeit der ausgerollten Leistungskurvendefinition
/// </summary>
Expand All @@ -72,7 +75,7 @@ private DateTime _Aenderungszeitpunkt
[ProtoMember(15)]
[JsonPropertyOrder(15)]
public UebermittelbarkeitZaehlzeit? Uebermittelbarkeit { get; set; }

/// <summary>
/// oberer Schwellwert
/// </summary>
Expand All @@ -81,4 +84,4 @@ private DateTime _Aenderungszeitpunkt
[ProtoMember(16)]
[JsonPropertyOrder(16)]
public string? ObererSchwellwert { get; set; }
}
}
21 changes: 12 additions & 9 deletions BO4E/BO/Schaltzeitdefinition.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ public class Schaltzeitdefinition : BusinessObject
[ProtoMember(10)]
[JsonPropertyOrder(10)]
public bool? Ausgerollt { get; set; }



[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
[ProtoMember(11, Name = nameof(Aenderungszeitpunkt))]
Expand All @@ -34,7 +33,7 @@ private DateTime _Aenderungszeitpunkt
get => Aenderungszeitpunkt.UtcDateTime;
set => Aenderungszeitpunkt = DateTime.SpecifyKind(value, DateTimeKind.Utc);
}

/// <summary>
/// Schaltzeitänderungszeitpunkt
/// </summary>
Expand All @@ -44,17 +43,21 @@ private DateTime _Aenderungszeitpunkt
[JsonPropertyOrder(12)]
[ProtoIgnore]
public DateTimeOffset Aenderungszeitpunkt { get; set; }

/// <summary>
/// Code der Schaltzeitdefinition
/// </summary>
[BoKey]
[JsonProperty(Required = Required.Default, Order = 13, PropertyName = "schaltzeitdefinitionscode")]
[JsonProperty(
Required = Required.Default,
Order = 13,
PropertyName = "schaltzeitdefinitionscode"
)]
[JsonPropertyName("schaltzeitdefinitionscode")]
[ProtoMember(13)]
[JsonPropertyOrder(13)]
public string? SchaltzeitdefinitionsCode { get; set; }

/// <summary>
/// Häufigkeit der Übermittlung
/// </summary>
Expand All @@ -63,7 +66,7 @@ private DateTime _Aenderungszeitpunkt
[ProtoMember(14)]
[JsonPropertyOrder(14)]
public HaeufigkeitZaehlzeit? Haeufigkeit { get; set; }

/// <summary>
/// Übermittelbarkeit der ausgerollten Schaltzeitdefinition
/// </summary>
Expand All @@ -72,7 +75,7 @@ private DateTime _Aenderungszeitpunkt
[ProtoMember(15)]
[JsonPropertyOrder(15)]
public UebermittelbarkeitZaehlzeit? Uebermittelbarkeit { get; set; }

/// <summary>
/// Schalthandlung an der Lokation
/// </summary>
Expand All @@ -81,4 +84,4 @@ private DateTime _Aenderungszeitpunkt
[ProtoMember(16)]
[JsonPropertyOrder(16)]
public Schalthandlung? Schalthandlung { get; set; }
}
}

0 comments on commit 4840042

Please sign in to comment.