Skip to content

Commit 579146b

Browse files
author
Jani Giannoudis
committed
action value method names refactorings
renamed culture to user culture updated version to 0.5.0-pre-230706-5
1 parent 2e01550 commit 579146b

22 files changed

+515
-1032
lines changed

‎Client.Scripting.Tests/CheckDigitTests.cs‎

Lines changed: 0 additions & 547 deletions
This file was deleted.

‎Client.Scripting/Function/CaseAction.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ public abstract class ActionMethodBase<TContext, TFunc, TValue> : IActionMethod<
390390
public int ParameterCount => Parameters.Count;
391391

392392
/// <summary>The function culture</summary>
393-
public string Culture => Context.Function.Culture;
393+
public string UserCulture => Context.Function.UserCulture;
394394

395395
/// <summary>Constructor</summary>
396396
protected ActionMethodBase(TContext context, string expression, DateTime caseValueDate)
@@ -1819,7 +1819,7 @@ public override object EvaluateValue(object value)
18191819
// object value
18201820
if (!string.IsNullOrWhiteSpace(ObjectKey))
18211821
{
1822-
var lookupValue = Context.Function.GetLookup<string>(LookupName, LookupKey, Context.Function.Culture);
1822+
var lookupValue = Context.Function.GetLookup<string>(LookupName, LookupKey, Context.Function.UserCulture);
18231823
if (string.IsNullOrWhiteSpace(lookupValue))
18241824
{
18251825
return null;
@@ -1831,15 +1831,15 @@ public override object EvaluateValue(object value)
18311831
switch (ValueType)
18321832
{
18331833
case ActionValueType.String:
1834-
return Context.Function.GetLookup<string>(LookupName, LookupKey, Culture);
1834+
return Context.Function.GetLookup<string>(LookupName, LookupKey, UserCulture);
18351835
case ActionValueType.Boolean:
1836-
return Context.Function.GetLookup<bool>(LookupName, LookupKey, Culture);
1836+
return Context.Function.GetLookup<bool>(LookupName, LookupKey, UserCulture);
18371837
case ActionValueType.Integer:
1838-
return Context.Function.GetLookup<int>(LookupName, LookupKey, Culture);
1838+
return Context.Function.GetLookup<int>(LookupName, LookupKey, UserCulture);
18391839
case ActionValueType.Decimal:
1840-
return Context.Function.GetLookup<decimal>(LookupName, LookupKey, Culture);
1840+
return Context.Function.GetLookup<decimal>(LookupName, LookupKey, UserCulture);
18411841
case ActionValueType.DateTime:
1842-
return Context.Function.GetLookup<DateTime>(LookupName, LookupKey, Culture);
1842+
return Context.Function.GetLookup<DateTime>(LookupName, LookupKey, UserCulture);
18431843
default:
18441844
return null;
18451845
}
@@ -1883,7 +1883,7 @@ public override object EvaluateValue(object value)
18831883
// object value
18841884
if (!string.IsNullOrWhiteSpace(ObjectKey))
18851885
{
1886-
var lookupValue = Context.Function.GetRangeLookup<string>(LookupName, RangeValue, Culture);
1886+
var lookupValue = Context.Function.GetRangeLookup<string>(LookupName, RangeValue, UserCulture);
18871887
if (string.IsNullOrWhiteSpace(lookupValue))
18881888
{
18891889
return null;
@@ -1894,11 +1894,11 @@ public override object EvaluateValue(object value)
18941894
// type lookup value
18951895
return ValueType switch
18961896
{
1897-
ActionValueType.String => Context.Function.GetRangeLookup<string>(LookupName, RangeValue, Culture),
1898-
ActionValueType.Boolean => Context.Function.GetRangeLookup<bool>(LookupName, RangeValue, Culture),
1899-
ActionValueType.Integer => Context.Function.GetRangeLookup<int>(LookupName, RangeValue, Culture),
1900-
ActionValueType.Decimal => Context.Function.GetRangeLookup<decimal>(LookupName, RangeValue, Culture),
1901-
ActionValueType.DateTime => Context.Function.GetRangeLookup<DateTime>(LookupName, RangeValue, Culture),
1897+
ActionValueType.String => Context.Function.GetRangeLookup<string>(LookupName, RangeValue, UserCulture),
1898+
ActionValueType.Boolean => Context.Function.GetRangeLookup<bool>(LookupName, RangeValue, UserCulture),
1899+
ActionValueType.Integer => Context.Function.GetRangeLookup<int>(LookupName, RangeValue, UserCulture),
1900+
ActionValueType.Decimal => Context.Function.GetRangeLookup<decimal>(LookupName, RangeValue, UserCulture),
1901+
ActionValueType.DateTime => Context.Function.GetRangeLookup<DateTime>(LookupName, RangeValue, UserCulture),
19021902
_ => null
19031903
};
19041904
}
@@ -1909,7 +1909,7 @@ public override object EvaluateValue(object value)
19091909
#region Action Case Value
19101910

19111911
/// <summary>Action case value</summary>
1912-
public abstract class ActionCaseValue
1912+
public abstract class ActionCaseValueBase
19131913
{
19141914
/// <summary>Value mode postfix</summary>
19151915
protected static readonly string ValueModePostfix = ".Value";
@@ -2055,7 +2055,7 @@ protected static int GetMarkerIndex(string expression, string marker)
20552055
}
20562056

20572057
/// <summary>Action case value</summary>
2058-
public abstract class ActionCaseValue<TContext, TFunc, TValue> : ActionCaseValue
2058+
public abstract class ActionCaseValue<TContext, TFunc, TValue> : ActionCaseValueBase
20592059
where TContext : IActionCaseValueContext<TFunc>
20602060
where TFunc : PayrollFunction
20612061
{

‎Client.Scripting/Function/CaseAvailableActions.cs‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -54,40 +54,40 @@ public void CaseValueEqual(CaseAvailableActionContext context, string source, ob
5454
switch (sourceType)
5555
{
5656
case ActionValueType.String:
57-
var sourceString = NewActionValue<string>(context, source);
58-
var compareString = NewActionValue<string>(context, compare, valueDate);
57+
var sourceString = GetActionValue<string>(context, source);
58+
var compareString = GetActionValue<string>(context, compare, valueDate);
5959
if (sourceString.ResolvedValue != compareString.ResolvedValue)
6060
{
6161
context.AddIssue($"{sourceString} is not equal {compareString}");
6262
}
6363
break;
6464
case ActionValueType.Boolean:
65-
var sourceBool = NewActionValue<bool>(context, source);
66-
var compareBool = NewActionValue<bool?>(context, compare, valueDate);
65+
var sourceBool = GetActionValue<bool>(context, source);
66+
var compareBool = GetActionValue<bool?>(context, compare, valueDate);
6767
if (sourceBool.ResolvedValue != compareBool.ResolvedValue)
6868
{
6969
context.AddIssue($"{sourceBool} is not equal {compareBool}");
7070
}
7171
break;
7272
case ActionValueType.Integer:
73-
var sourceInteger = NewActionValue<int>(context, source);
74-
var compareInteger = NewActionValue<int?>(context, compare, valueDate);
73+
var sourceInteger = GetActionValue<int>(context, source);
74+
var compareInteger = GetActionValue<int?>(context, compare, valueDate);
7575
if (sourceInteger.ResolvedValue != compareInteger.ResolvedValue)
7676
{
7777
context.AddIssue($"{sourceInteger} is not equal {compareInteger}");
7878
}
7979
break;
8080
case ActionValueType.Decimal:
81-
var sourceDecimal = NewActionValue<decimal>(context, source);
82-
var compareDecimal = NewActionValue<decimal?>(context, compare, valueDate);
81+
var sourceDecimal = GetActionValue<decimal>(context, source);
82+
var compareDecimal = GetActionValue<decimal?>(context, compare, valueDate);
8383
if (sourceDecimal.ResolvedValue != compareDecimal.ResolvedValue)
8484
{
8585
context.AddIssue($"{sourceDecimal} is not equal {compareDecimal}");
8686
}
8787
break;
8888
case ActionValueType.DateTime:
89-
var sourceDateTime = NewActionValue<DateTime>(context, source);
90-
var compareDateTime = NewActionValue<DateTime?>(context, compare, valueDate);
89+
var sourceDateTime = GetActionValue<DateTime>(context, source);
90+
var compareDateTime = GetActionValue<DateTime?>(context, compare, valueDate);
9191
if (sourceDateTime.ResolvedValue != compareDateTime.ResolvedValue)
9292
{
9393
context.AddIssue($"{sourceDateTime} is not equal {compareDateTime}");
@@ -142,40 +142,40 @@ public void CaseValueNotEqual(CaseAvailableActionContext context, string source,
142142
switch (sourceType)
143143
{
144144
case ActionValueType.String:
145-
var sourceString = NewActionValue<string>(context, source);
146-
var compareString = NewActionValue<string>(context, compare, valueDate);
145+
var sourceString = GetActionValue<string>(context, source);
146+
var compareString = GetActionValue<string>(context, compare, valueDate);
147147
if (sourceString.ResolvedValue == compareString.ResolvedValue)
148148
{
149149
context.AddIssue($"{sourceString} is equal {compareString}");
150150
}
151151
break;
152152
case ActionValueType.Boolean:
153-
var sourceBool = NewActionValue<bool>(context, source);
154-
var compareBool = NewActionValue<bool?>(context, compare, valueDate);
153+
var sourceBool = GetActionValue<bool>(context, source);
154+
var compareBool = GetActionValue<bool?>(context, compare, valueDate);
155155
if (sourceBool.ResolvedValue == compareBool.ResolvedValue)
156156
{
157157
context.AddIssue($"{sourceBool} is equal {compareBool}");
158158
}
159159
break;
160160
case ActionValueType.Integer:
161-
var sourceInteger = NewActionValue<int>(context, source);
162-
var compareInteger = NewActionValue<int?>(context, compare, valueDate);
161+
var sourceInteger = GetActionValue<int>(context, source);
162+
var compareInteger = GetActionValue<int?>(context, compare, valueDate);
163163
if (sourceInteger.ResolvedValue == compareInteger.ResolvedValue)
164164
{
165165
context.AddIssue($"{sourceInteger} is equal {compareInteger}");
166166
}
167167
break;
168168
case ActionValueType.Decimal:
169-
var sourceDecimal = NewActionValue<decimal>(context, source);
170-
var compareDecimal = NewActionValue<decimal?>(context, compare, valueDate);
169+
var sourceDecimal = GetActionValue<decimal>(context, source);
170+
var compareDecimal = GetActionValue<decimal?>(context, compare, valueDate);
171171
if (sourceDecimal.ResolvedValue == compareDecimal.ResolvedValue)
172172
{
173173
context.AddIssue($"{sourceDecimal} is equal {compareDecimal}");
174174
}
175175
break;
176176
case ActionValueType.DateTime:
177-
var sourceDateTime = NewActionValue<DateTime>(context, source);
178-
var compareDateTime = NewActionValue<DateTime?>(context, compare, valueDate);
177+
var sourceDateTime = GetActionValue<DateTime>(context, source);
178+
var compareDateTime = GetActionValue<DateTime?>(context, compare, valueDate);
179179
if (sourceDateTime.ResolvedValue == compareDateTime.ResolvedValue)
180180
{
181181
context.AddIssue($"{sourceDateTime} is equal {compareDateTime}");
@@ -230,24 +230,24 @@ public void CaseValueGreaterThan(CaseAvailableActionContext context, string sour
230230
switch (sourceType)
231231
{
232232
case ActionValueType.Integer:
233-
var sourceInteger = NewActionValue<int>(context, source);
234-
var compareInteger = NewActionValue<int?>(context, compare, valueDate);
233+
var sourceInteger = GetActionValue<int>(context, source);
234+
var compareInteger = GetActionValue<int?>(context, compare, valueDate);
235235
if (sourceInteger.ResolvedValue <= compareInteger.ResolvedValue)
236236
{
237237
context.AddIssue($"{sourceInteger} is less/equal than {compareInteger}");
238238
}
239239
break;
240240
case ActionValueType.Decimal:
241-
var sourceDecimal = NewActionValue<decimal>(context, source);
242-
var compareDecimal = NewActionValue<decimal?>(context, compare, valueDate);
241+
var sourceDecimal = GetActionValue<decimal>(context, source);
242+
var compareDecimal = GetActionValue<decimal?>(context, compare, valueDate);
243243
if (sourceDecimal.ResolvedValue <= compareDecimal.ResolvedValue)
244244
{
245245
context.AddIssue($"{sourceDecimal} is less/equal than {compareDecimal}");
246246
}
247247
break;
248248
case ActionValueType.DateTime:
249-
var sourceDateTime = NewActionValue<DateTime>(context, source);
250-
var compareDateTime = NewActionValue<DateTime?>(context, compare, valueDate);
249+
var sourceDateTime = GetActionValue<DateTime>(context, source);
250+
var compareDateTime = GetActionValue<DateTime?>(context, compare, valueDate);
251251
if (sourceDateTime.ResolvedValue <= compareDateTime.ResolvedValue)
252252
{
253253
context.AddIssue($"{sourceDateTime} is less/equal than {compareDateTime}");
@@ -302,24 +302,24 @@ public void CaseValueGreaterEqualThan(CaseAvailableActionContext context, string
302302
switch (sourceType)
303303
{
304304
case ActionValueType.Integer:
305-
var sourceInteger = NewActionValue<int>(context, source);
306-
var compareInteger = NewActionValue<int?>(context, compare, valueDate);
305+
var sourceInteger = GetActionValue<int>(context, source);
306+
var compareInteger = GetActionValue<int?>(context, compare, valueDate);
307307
if (sourceInteger.ResolvedValue < compareInteger.ResolvedValue)
308308
{
309309
context.AddIssue($"{sourceInteger} is less than {compareInteger}");
310310
}
311311
break;
312312
case ActionValueType.Decimal:
313-
var sourceDecimal = NewActionValue<decimal>(context, source);
314-
var compareDecimal = NewActionValue<decimal?>(context, compare, valueDate);
313+
var sourceDecimal = GetActionValue<decimal>(context, source);
314+
var compareDecimal = GetActionValue<decimal?>(context, compare, valueDate);
315315
if (sourceDecimal.ResolvedValue < compareDecimal.ResolvedValue)
316316
{
317317
context.AddIssue($"{sourceDecimal} is less than {compareDecimal}");
318318
}
319319
break;
320320
case ActionValueType.DateTime:
321-
var sourceDateTime = NewActionValue<DateTime>(context, source);
322-
var compareDateTime = NewActionValue<DateTime?>(context, compare, valueDate);
321+
var sourceDateTime = GetActionValue<DateTime>(context, source);
322+
var compareDateTime = GetActionValue<DateTime?>(context, compare, valueDate);
323323
if (sourceDateTime.ResolvedValue < compareDateTime.ResolvedValue)
324324
{
325325
context.AddIssue($"{sourceDateTime} is less than {compareDateTime}");
@@ -374,24 +374,24 @@ public void CaseValueLessThan(CaseAvailableActionContext context, string source,
374374
switch (sourceType)
375375
{
376376
case ActionValueType.Integer:
377-
var sourceInteger = NewActionValue<int>(context, source);
378-
var compareInteger = NewActionValue<int?>(context, compare, valueDate);
377+
var sourceInteger = GetActionValue<int>(context, source);
378+
var compareInteger = GetActionValue<int?>(context, compare, valueDate);
379379
if (sourceInteger.ResolvedValue >= compareInteger.ResolvedValue)
380380
{
381381
context.AddIssue($"{sourceInteger} is greater/equal than {compareInteger}");
382382
}
383383
break;
384384
case ActionValueType.Decimal:
385-
var sourceDecimal = NewActionValue<decimal>(context, source);
386-
var compareDecimal = NewActionValue<decimal?>(context, compare, valueDate);
385+
var sourceDecimal = GetActionValue<decimal>(context, source);
386+
var compareDecimal = GetActionValue<decimal?>(context, compare, valueDate);
387387
if (sourceDecimal.ResolvedValue >= compareDecimal.ResolvedValue)
388388
{
389389
context.AddIssue($"{sourceDecimal} is greater/equal than {compareDecimal}");
390390
}
391391
break;
392392
case ActionValueType.DateTime:
393-
var sourceDateTime = NewActionValue<DateTime>(context, source);
394-
var compareDateTime = NewActionValue<DateTime?>(context, compare, valueDate);
393+
var sourceDateTime = GetActionValue<DateTime>(context, source);
394+
var compareDateTime = GetActionValue<DateTime?>(context, compare, valueDate);
395395
if (sourceDateTime.ResolvedValue >= compareDateTime.ResolvedValue)
396396
{
397397
context.AddIssue($"{sourceDateTime} is greater/equal than {compareDateTime}");
@@ -446,24 +446,24 @@ public void CaseValueLessEqualThan(CaseAvailableActionContext context, string so
446446
switch (sourceType)
447447
{
448448
case ActionValueType.Integer:
449-
var sourceInteger = NewActionValue<int>(context, source);
450-
var compareInteger = NewActionValue<int?>(context, compare, valueDate);
449+
var sourceInteger = GetActionValue<int>(context, source);
450+
var compareInteger = GetActionValue<int?>(context, compare, valueDate);
451451
if (sourceInteger.ResolvedValue > compareInteger.ResolvedValue)
452452
{
453453
context.AddIssue($"{sourceInteger} is greater than {compareInteger}");
454454
}
455455
break;
456456
case ActionValueType.Decimal:
457-
var sourceDecimal = NewActionValue<decimal>(context, source);
458-
var compareDecimal = NewActionValue<decimal?>(context, compare, valueDate);
457+
var sourceDecimal = GetActionValue<decimal>(context, source);
458+
var compareDecimal = GetActionValue<decimal?>(context, compare, valueDate);
459459
if (sourceDecimal.ResolvedValue > compareDecimal.ResolvedValue)
460460
{
461461
context.AddIssue($"{sourceDecimal} is greater than {compareDecimal}");
462462
}
463463
break;
464464
case ActionValueType.DateTime:
465-
var sourceDateTime = NewActionValue<DateTime>(context, source);
466-
var compareDateTime = NewActionValue<DateTime?>(context, compare, valueDate);
465+
var sourceDateTime = GetActionValue<DateTime>(context, source);
466+
var compareDateTime = GetActionValue<DateTime?>(context, compare, valueDate);
467467
if (sourceDateTime.ResolvedValue > compareDateTime.ResolvedValue)
468468
{
469469
context.AddIssue($"{sourceDateTime} is greater than {compareDateTime}");
@@ -504,7 +504,7 @@ public void CaseValueBetween(CaseAvailableActionContext context, string source,
504504

505505
private static ActionValueType? ResolveCaseValueType(CaseAvailableActionContext context, string source)
506506
{
507-
var caseValue = NewCaseActionValue<object>(context, source);
507+
var caseValue = GetSourceActionValue<object>(context, source);
508508
if (caseValue == null || !caseValue.IsCaseValueReference)
509509
{
510510
context.AddIssue($"Invalid compare source value: {source}");
@@ -525,7 +525,7 @@ public void CaseValueBetween(CaseAvailableActionContext context, string source,
525525

526526
private static ActionValueType? ResolveCompareValueType(CaseAvailableActionContext context, object compare)
527527
{
528-
var compareValue = NewActionValue<object>(context, compare);
528+
var compareValue = GetActionValue<object>(context, compare);
529529
if (compareValue == null || !compareValue.IsFulfilled ||
530530
compareValue.IsCaseChangeReference)
531531
{

0 commit comments

Comments
 (0)