quartznet/pulsar
2
0
Fork 0
mirror of https://github.com/9ParsonsB/Pulsar.git synced 2025-04-05 17:39:39 -04:00
Code Actions

[Framework] Add a DateTime property for CarrierJumpRequest DepartureTime (#119)

Browse Source 
Refactored out the logic backing the JournalBase TimestampDateTime property so it can be used for any DateTime type property, providing a standardized json String -> DateTime conversion for any date-time property. Implemented as an `internal static` method on JournalBase so journal objects which inherit from JournalBase or don't inherit from it can use it.

Used this to provide a DepatureTimeDateTime on CarrierJumpRequest (this property was added in Update 14) and to implement the existing ExpiryDateTime on CurrentGoal.

From a quick search in the journal documentation, I don't see any other applications for this.
This commit is contained in:
F K 2023-08-14 08:05:00 -04:00 committed by GitHub
parent 639ad72fb4
commit ff784b31d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJumpRequest.cs
View File

@ -1,4 +1,6 @@
namespace Observatory.Framework.Files.Journal using System.Text.Json.Serialization;
namespace Observatory.Framework.Files.Journal
{ {
public class CarrierJumpRequest : JournalBase public class CarrierJumpRequest : JournalBase
{ {
@ -9,5 +11,10 @@
public string SystemName { get; init; } public string SystemName { get; init; }
public ulong SystemID { get; init; } public ulong SystemID { get; init; }
public string DepartureTime { get; init; } public string DepartureTime { get; init; }
[JsonIgnore]
public DateTime DepartureTimeDateTime {
get => ParseDateTime(DepartureTime);
}
} }
} }

17
ObservatoryFramework/Files/Journal/JournalBase.cs
View File

@ -12,10 +12,7 @@ namespace Observatory.Framework.Files.Journal
[JsonIgnore] [JsonIgnore]
public DateTime TimestampDateTime public DateTime TimestampDateTime
{ {
get get => ParseDateTime(Timestamp);
{
return DateTime.ParseExact(Timestamp, "yyyy-MM-ddTHH:mm:ssZ", null, System.Globalization.DateTimeStyles.AssumeUniversal);
}
} }
[JsonPropertyName("event")] [JsonPropertyName("event")]
@ -43,5 +40,17 @@ namespace Observatory.Framework.Files.Journal
private string json; private string json;
// For use by Journal object classes for .*DateTime properties, like TimestampeDateTime, above.
internal static DateTime ParseDateTime(string value)
{
if (DateTime.TryParseExact(value, "yyyy-MM-ddTHH:mm:ssZ", null, System.Globalization.DateTimeStyles.AssumeUniversal, out DateTime dateTimeValue))
{
return dateTimeValue;
}
else
{
return new DateTime();
}
}
} }
} }

13
ObservatoryFramework/Files/ParameterTypes/CurrentGoal.cs
View File

@ -1,4 +1,5 @@
using Microsoft.VisualBasic.CompilerServices; using Microsoft.VisualBasic.CompilerServices;
using Observatory.Framework.Files.Journal;
using System; using System;
using System.Numerics; using System.Numerics;
@ -13,17 +14,7 @@ namespace Observatory.Framework.Files.ParameterTypes
public string Expiry { get; init; } public string Expiry { get; init; }
public DateTime ExpiryDateTime public DateTime ExpiryDateTime
{ {
get get => JournalBase.ParseDateTime(Expiry);
{
if (DateTime.TryParseExact(Expiry, "yyyy-MM-ddTHH:mm:ssZ", null, System.Globalization.DateTimeStyles.AssumeUniversal, out DateTime expiryDateTime))
{
return expiryDateTime;
}
else
{
return new DateTime();
}
}
} }
public bool IsComplete { get; init; } public bool IsComplete { get; init; }
public long CurrentTotal { get; init; } public long CurrentTotal { get; init; }