Moved validation from core back to specific areas

khanjal · Dec 1, 2024 · 6c18838 · 6c18838
1 parent 0a0978a
commit 6c18838
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 30 deletions.
diff --git a/RLE.Core/Models/Google/SheetCellModel.cs b/RLE.Core/Models/Google/SheetCellModel.cs
@@ -11,6 +11,6 @@ public class SheetCellModel
     public string HeaderlessRange { get; set; } = "";
     public string Formula { get; set; } = "";
     public FormatEnum? Format { get; set; }
-    public ValidationEnum? Validation { get; set; }
+    public string Validation { get; set; } = "";
     public string Note { get; set; } = "";
 }
diff --git a/RLE.Core/Enums/ValidationEnum.cs → RLE.Gig/Enums/ValidationEnum.cs b/RLE.Core/Enums/ValidationEnum.cs → RLE.Gig/Enums/ValidationEnum.cs
@@ -1,4 +1,4 @@
-namespace RLE.Core.Enums;
+namespace RLE.Gig.Enums;
 
 public enum ValidationEnum
 {

diff --git a/RLE.Gig/Helpers/GenerateSheetsHelpers.cs b/RLE.Gig/Helpers/GenerateSheetsHelpers.cs
@@ -89,7 +89,7 @@ private static void GenerateHeadersFormatAndProtection(SheetModel sheet)
             }
 
             var cellFormat = (header.Format != null ? SheetHelpers.GetCellFormat((FormatEnum)header.Format) : null);
-            var dataValidation = (header.Validation != null ? GigSheetHelpers.GetDataValidation((ValidationEnum)header.Validation) : null);
+            var dataValidation = (header.Validation != null ? GigSheetHelpers.GetDataValidation(header.Validation.GetValueFromName<ValidationEnum>()) : null);
 
             _repeatCellRequests!.Add(GoogleRequestHelpers.GenerateRepeatCellRequest(range, cellFormat, dataValidation));
         });

diff --git a/RLE.Gig/Mappers/ShiftMapper.cs b/RLE.Gig/Mappers/ShiftMapper.cs
@@ -166,7 +166,7 @@ public static SheetModel GetSheet()
             sheet.Headers.AddColumn(new SheetCellModel
             {
                 Name = HeaderEnum.SERVICE.GetDescription(),
-                Validation = ValidationEnum.RANGE_SERVICE
+                Validation = ValidationEnum.RANGE_SERVICE.GetDescription()
             });
             // #
             sheet.Headers.AddColumn(new SheetCellModel
@@ -193,7 +193,7 @@ public static SheetModel GetSheet()
             {
                 Name = HeaderEnum.TIME_OMIT.GetDescription(),
                 Note = ColumnNotes.TimeOmit,
-                Validation = ValidationEnum.BOOLEAN
+                Validation = ValidationEnum.BOOLEAN.GetDescription()
             });
             // Trips
             sheet.Headers.AddColumn(new SheetCellModel
@@ -236,7 +236,7 @@ public static SheetModel GetSheet()
             sheet.Headers.AddColumn(new SheetCellModel
             {
                 Name = HeaderEnum.REGION.GetDescription(),
-                Validation = ValidationEnum.RANGE_REGION
+                Validation = ValidationEnum.RANGE_REGION.GetDescription()
             });
             // Note
             sheet.Headers.AddColumn(new SheetCellModel { Name = HeaderEnum.NOTE.GetDescription() });

diff --git a/RLE.Gig/Mappers/TripMapper.cs b/RLE.Gig/Mappers/TripMapper.cs
@@ -181,7 +181,7 @@ public static SheetModel GetSheet()
             sheet.Headers.AddColumn(new SheetCellModel
             {
                 Name = HeaderEnum.SERVICE.GetDescription(),
-                Validation = ValidationEnum.RANGE_SERVICE
+                Validation = ValidationEnum.RANGE_SERVICE.GetDescription()
             });
             // #
             sheet.Headers.AddColumn(new SheetCellModel
@@ -194,21 +194,21 @@ public static SheetModel GetSheet()
             {
                 Name = HeaderEnum.EXCLUDE.GetDescription(),
                 Note = ColumnNotes.Exclude,
-                Validation = ValidationEnum.BOOLEAN
+                Validation = ValidationEnum.BOOLEAN.GetDescription()
             });
             // Type
             sheet.Headers.AddColumn(new SheetCellModel
             {
                 Name = HeaderEnum.TYPE.GetDescription(),
                 Note = ColumnNotes.Types,
-                Validation = ValidationEnum.RANGE_TYPE
+                Validation = ValidationEnum.RANGE_TYPE.GetDescription()
             });
             // Place
             sheet.Headers.AddColumn(new SheetCellModel
             {
                 Name = HeaderEnum.PLACE.GetDescription(),
                 Note = ColumnNotes.Place,
-                Validation = ValidationEnum.RANGE_PLACE
+                Validation = ValidationEnum.RANGE_PLACE.GetDescription()
             });
             // Pickup
             sheet.Headers.AddColumn(new SheetCellModel
@@ -270,19 +270,19 @@ public static SheetModel GetSheet()
             sheet.Headers.AddColumn(new SheetCellModel
             {
                 Name = HeaderEnum.NAME.GetDescription(),
-                Validation = ValidationEnum.RANGE_NAME
+                Validation = ValidationEnum.RANGE_NAME.GetDescription()
             });
             // Start Address
             sheet.Headers.AddColumn(new SheetCellModel
             {
                 Name = HeaderEnum.ADDRESS_START.GetDescription(),
-                Validation = ValidationEnum.RANGE_ADDRESS
+                Validation = ValidationEnum.RANGE_ADDRESS.GetDescription()
             });
             // End Address
             sheet.Headers.AddColumn(new SheetCellModel
             {
                 Name = HeaderEnum.ADDRESS_END.GetDescription(),
-                Validation = ValidationEnum.RANGE_ADDRESS
+                Validation = ValidationEnum.RANGE_ADDRESS.GetDescription()
             });
             // End Unit
             sheet.Headers.AddColumn(new SheetCellModel
@@ -296,7 +296,7 @@ public static SheetModel GetSheet()
             sheet.Headers.AddColumn(new SheetCellModel
             {
                 Name = HeaderEnum.REGION.GetDescription(),
-                Validation = ValidationEnum.RANGE_REGION
+                Validation = ValidationEnum.RANGE_REGION.GetDescription()
             });
             // Note
             sheet.Headers.AddColumn(new SheetCellModel { Name = HeaderEnum.NOTE.GetDescription() });

diff --git a/RLE.Stock/Enums/ValidationEnum.cs b/RLE.Stock/Enums/ValidationEnum.cs
@@ -0,0 +1,8 @@
+namespace RLE.Stock.Enums;
+
+public enum ValidationEnum
+{
+    BOOLEAN,
+    RANGE_ACCOUNT,
+    RANGE_TICKER
+}
diff --git a/RLE.Stock/Helpers/GenerateSheetHelpers.cs b/RLE.Stock/Helpers/GenerateSheetHelpers.cs
@@ -5,6 +5,7 @@
 using RLE.Core.Helpers;
 using RLE.Stock.Enums;
 using RLE.Stock.Mappers;
+using RLE.Core.Extensions;
 
 namespace RLE.Stock.Helpers;
 
@@ -145,7 +146,7 @@ private static void GenerateHeadersFormatAndProtection()
 
             if (header.Validation != null)
             {
-                repeatCellRequest.Cell.DataValidation = StockSheetHelpers.GetDataValidation((ValidationEnum)header.Validation);
+                repeatCellRequest.Cell.DataValidation = StockSheetHelpers.GetDataValidation(header.Validation.GetValueFromName<ValidationEnum>());
             }
 
             _repeatCellRequests!.Add(repeatCellRequest);

diff --git a/RLE.Stock/Helpers/StockSheetHelpers.cs b/RLE.Stock/Helpers/StockSheetHelpers.cs
@@ -1,5 +1,4 @@
 using Google.Apis.Sheets.v4.Data;
-using RLE.Core.Enums;
 using RLE.Core.Extensions;
 using RLE.Core.Models.Google;
 using RLE.Core.Helpers;
@@ -16,8 +15,9 @@ public static List<SheetModel> GetSheets()
     {
         var sheets = new List<SheetModel>
         {
-            //AccountMapper.GetSheet(),
-            //TripMapper.GetSheet()
+            AccountMapper.GetSheet(),
+            StockMapper.GetSheet(),
+            TickerMapper.GetSheet()
         };
 
         return sheets;
@@ -67,12 +67,8 @@ public static DataValidationRule GetDataValidation(ValidationEnum validation)
             case ValidationEnum.BOOLEAN:
                 dataValidation.Condition = new BooleanCondition { Type = "BOOLEAN" };
                 break;
-            case ValidationEnum.RANGE_ADDRESS:
-            case ValidationEnum.RANGE_NAME:
-            case ValidationEnum.RANGE_PLACE:
-            case ValidationEnum.RANGE_REGION:
-            case ValidationEnum.RANGE_SERVICE:
-            case ValidationEnum.RANGE_TYPE:
+            case ValidationEnum.RANGE_ACCOUNT:
+            case ValidationEnum.RANGE_TICKER:
                 var values = new List<ConditionValue> { new() { UserEnteredValue = $"={GetSheetForRange(validation)?.GetDescription()}!A2:A" } };
                 dataValidation.Condition = new BooleanCondition { Type = "ONE_OF_RANGE", Values = values };
                 dataValidation.ShowCustomUi = true;
@@ -87,12 +83,8 @@ public static DataValidationRule GetDataValidation(ValidationEnum validation)
     {
         return validationEnum switch
         {
-            //ValidationEnum.RANGE_ADDRESS => SheetEnum.ADDRESSES,
-            //ValidationEnum.RANGE_NAME => SheetEnum.NAMES,
-            //ValidationEnum.RANGE_PLACE => SheetEnum.PLACES,
-            //ValidationEnum.RANGE_REGION => SheetEnum.REGIONS,
-            //ValidationEnum.RANGE_SERVICE => SheetEnum.SERVICES,
-            //ValidationEnum.RANGE_TYPE => SheetEnum.TYPES,
+            ValidationEnum.RANGE_ACCOUNT => SheetEnum.ACCOUNTS,
+            ValidationEnum.RANGE_TICKER => SheetEnum.TICKERS,
             _ => null
         };
     }