Code tidy up

DEFRA · Jan 14, 2025 · ee26939 · ee26939
1 parent 2af751e
commit ee26939
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 37 deletions.
diff --git a/Btms.Analytics/Dataset.cs b/Btms.Analytics/Dataset.cs
@@ -75,13 +75,9 @@ public override TType Read(
         {
             newOptions.Converters.Add(jsonConverter);
         }
-        // newOptions.Converters.Append<IEnumerable<JsonConverter>>(converters);
 
         TType result = JsonSerializer.Deserialize<TType>(ref reader, newOptions)!;
 
-        // TType result = JsonSerializer.Deserialize<TType>(ref reader, options)!;
-
-        // return new ByNumericDimensionResult() { Dimension = 1, Value = 1};
         return result;   
     }
 
@@ -107,11 +103,6 @@ public override void Write(Utf8JsonWriter writer, TType value, JsonSerializerOpt
         {
             JsonSerializer.Serialize(writer, value as SummarisedDataset<SingleSeriesDataset, StringBucketDimensionResult>, options);
         }
-        // else if (value is EntityDataset<(string scenario, string ched, string[] mrns)>)
-        // {
-        //     JsonSerializer.Serialize(writer, value as EntityDataset<(string scenario, string ched, string[] mrns)>, options);
-        // }
-
         else
         {
             throw new NotImplementedException();

diff --git a/Btms.Analytics/DatasetDimensions.cs b/Btms.Analytics/DatasetDimensions.cs
@@ -89,10 +89,9 @@ public override TType Read(
         {
             PropertyNamingPolicy = options.PropertyNamingPolicy
         };
-        // ByNumericDimensionResult byNumeric = JsonSerializer.Deserialize<ByNumericDimensionResult>(ref reader, newOptions)!;
-
+
         TType result = JsonSerializer.Deserialize<TType>(ref reader, newOptions)!;
-        // return new ByNumericDimensionResult() { Dimension = 1, Value = 1};
+
         return result;
     }
 

diff --git a/Btms.Analytics/Extensions/AnalyticsHelpers.cs b/Btms.Analytics/Extensions/AnalyticsHelpers.cs
@@ -55,7 +55,5 @@ public static string[] GetImportNotificationSegments()
     public static LinkStatusEnum[] GetMovementStatusSegments()
     {
         return Enum.GetValues<LinkStatusEnum>();
-        // .Select(e => e.AsString()).ToArray();
-        // return ["Linked", "Not Linked", "Investigate"];
     }
 }
diff --git a/Btms.Analytics/Extensions/MovementExtensions.cs b/Btms.Analytics/Extensions/MovementExtensions.cs
@@ -32,9 +32,6 @@ public static IQueryable<MovementWithLinkStatus> SelectLinkStatus(this IQueryabl
                 Movement = m,
                 CreatedSource = m.CreatedSource!.Value,
                 Status = m.BtmsStatus.LinkStatus
-                    // m.Relationships.Notifications.Data.Count > 0 ? "Linked" :
-                    // m.AlvsDecisionStatus!.Context!.AlvsCheckStatus!.AnyMatch ? "Investigate" :
-                    // "Not Linked"
             });
 
         return m;

diff --git a/Btms.Analytics/ImportNotificationsAggregationService.cs b/Btms.Analytics/ImportNotificationsAggregationService.cs
@@ -98,17 +98,6 @@ public EntityDataset<ScenarioItem> Scenarios(DateTime? from = null, DateTime? to
             .ToList();
 
         return new EntityDataset<ScenarioItem>(data);
-
-        //     new [] {
-        //     new ScenarioItem() { Scenario = "Sweet Peppers", Keys = new[] { "Test" }}
-        // }));
-        // return Task.FromResult(new EntityDataset<(string scenario, string ched, string[] mrns)>(
-        //     new (string scenario, string ched, string[] mrns)[]
-        //     {
-        //         ("Ched with sweet peppers commodity 07096010", "", [""])
-        //     })
-        // );
-
     }
 
     public Task<MultiSeriesDataset<ByNumericDimensionResult>> ByCommodityCount(DateTime from, DateTime to)

diff --git a/Btms.Business/Extensions/MovementExtensions.cs b/Btms.Business/Extensions/MovementExtensions.cs
@@ -40,10 +40,6 @@ public static void AddLinkStatus(this Movement movement)
             linkStatus = LinkStatusEnum.Linked;
             linked = true;
         }
-        // else if (movement.Relationships.Notifications.Data.Count == 0)
-        // {
-        //     linkStatus = LinkStatusEnum.NotLinked;
-        // }
 
         movement.BtmsStatus.LinkStatus = linkStatus;
         movement.BtmsStatus.Linked = linked;

diff --git a/Btms.Model/Cds/AlvsDecision.cs b/Btms.Model/Cds/AlvsDecision.cs
@@ -93,11 +93,7 @@ public class StatusChecker
 }
 
 public class MovementStatus
-{
-    // public const string NotLinkedStatus = "Not Linked";
-    // public const string LinkedStatus = "Linked";
-    // public const string InvestigateStatus = "Investigate";
-
+{   
     public static MovementStatus Default()
     {
         return new MovementStatus()