Added XrmFakedContext.FiscalYearSettings

FakeXrmEasy.Shared/FakeXrmEasy.Shared.projitems

@@ -66,6 +66,7 @@
  <Compile Include="$(MSBuildThisFileDirectory)FakeMessageExecutors\UpdateRequestExecutor.cs" />
  <Compile Include="$(MSBuildThisFileDirectory)FakeMessageExecutors\WhoAmIRequestExecutor.cs" />
  <Compile Include="$(MSBuildThisFileDirectory)FakeMessageExecutors\WinOpportunityRequestExecutor.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)FiscalYearSettings.cs" />
  <Compile Include="$(MSBuildThisFileDirectory)IXrmFakedContext.cs" />
  <Compile Include="$(MSBuildThisFileDirectory)Metadata\DateTimeAttributeBehavior.cs" />
  <Compile Include="$(MSBuildThisFileDirectory)Metadata\MetadataGenerator.cs" />

FakeXrmEasy.Shared/FiscalYearSettings.cs

@@ -0,0 +1,25 @@
+using Microsoft.Xrm.Sdk;
+using Microsoft.Xrm.Sdk.Client;
+using System;
+
+namespace FakeXrmEasy
+{
+ [EntityLogicalName("organization")]
+ public class FiscalYearSettings
+ {
+ [AttributeLogicalName("fiscalcalendarstart")]
+ public DateTime StartDate { get; set; }
+
+ [AttributeLogicalName("fiscalperiodtype")]
+ public Template FiscalPeriodTemplate { get; set; }
+
+ public enum Template
+ {
+ Annually = 2000,
+ SemiAnnually = 2001,
+ Quarterly = 2002,
+ Monthly = 2003,
+ FourWeek = 2004
+ }
+ }
+}

FakeXrmEasy.Shared/XrmFakedContext.DateTime.cs

@@ -8,6 +8,8 @@ public partial class XrmFakedContext : IXrmContext
  {
  public TimeZoneInfo SystemTimeZone { get; set; }
 
+ public FiscalYearSettings FiscalYearSettings { get; set; }
+
  public Dictionary<string, Dictionary<string, DateTimeAttributeBehavior>> DateBehaviour { get; set; }
 
  private static Dictionary<string, Dictionary<string, DateTimeAttributeBehavior>> DefaultDateBehaviour()

FakeXrmEasy.Shared/XrmFakedContext.Queries.cs

@@ -758,7 +758,7 @@ protected static Expression TranslateConditionExpression(QueryExpression qe, Xrm
  case ConditionOperator.ThisWeek:
  case ConditionOperator.NextWeek:
  case ConditionOperator.InFiscalYear:
- operatorExpression = TranslateConditionExpressionBetweenDates(c, getNonBasicValueExpr, containsAttributeExpression);
+ operatorExpression = TranslateConditionExpressionBetweenDates(c, getNonBasicValueExpr, containsAttributeExpression, context);
  break;
 
  case ConditionOperator.Next7Days:
@@ -1577,7 +1577,7 @@ protected static Expression TranslateConditionExpressionLast(TypedConditionExpre
  /// <summary>
  /// Takes a condition expression which needs translating into a 'between two dates' expression and works out the relevant dates
  /// </summary> 
- protected static Expression TranslateConditionExpressionBetweenDates(TypedConditionExpression tc, Expression getAttributeValueExpr, Expression containsAttributeExpr)
+ protected static Expression TranslateConditionExpressionBetweenDates(TypedConditionExpression tc, Expression getAttributeValueExpr, Expression containsAttributeExpr, XrmFakedContext context)
  {
  var c = tc.CondExpression;
 
@@ -1633,8 +1633,9 @@ protected static Expression TranslateConditionExpressionBetweenDates(TypedCondit
  case ConditionOperator.InFiscalYear:
  var fiscalYear = (int)c.Values[0];
  c.Values.Clear();
- fromDate = new DateTime(fiscalYear, 4, 1);
- toDate = new DateTime(fiscalYear + 1, 3, 31);
+ var fiscalYearDate = context.FiscalYearSettings?.StartDate ?? new DateTime(fiscalYear, 4, 1);
+ fromDate = fiscalYearDate;
+ toDate = fiscalYearDate.AddYears(1).AddDays(-1);
  break;
  }
 

FakeXrmEasy.Tests.Shared/FakeContextTests/FetchXml/ConditionOperatorTests.cs

@@ -717,7 +717,7 @@ public void FetchXml_Operator_Last_Seven_Days_Translation()
  </filter>
  </entity>
  </fetch>";
- 
+
  var query = XrmFakedContext.TranslateFetchXmlToQueryExpression(ctx, fetchXml);
 
  Assert.True(query.Criteria != null);
@@ -1306,6 +1306,7 @@ public void FetchXml_Operator_InFiscalYear_Execution()
  var thisYear = today.Year;
 
  var ctx = new XrmFakedContext();
+ ctx.FiscalYearSettings = new FiscalYearSettings() { StartDate = new DateTime(thisYear, 1, 2), FiscalPeriodTemplate = FiscalYearSettings.Template.Annually };
  var fetchXml = $@"<fetch version='1.0' output-format='xml-platform' mapping='logical' distinct='false'>
  <entity name='contact'>
  <attribute name='anniversary' />
@@ -1314,19 +1315,19 @@ public void FetchXml_Operator_InFiscalYear_Execution()
  </filter>
  </entity>
  </fetch>";
- 
- var ct1 = new Contact() { Id = Guid.NewGuid(), Anniversary = new DateTime(thisYear, 1, 1) }; // First day of this year - should be returned
+
+ var ct1 = new Contact() { Id = Guid.NewGuid(), Anniversary = new DateTime(thisYear, 1, 2) }; // Second day of this year - should be returned
  var ct2 = new Contact() { Id = Guid.NewGuid(), Anniversary = new DateTime(thisYear, 12, 31) }; // Last day of this year - should be returned
- var ct3 = new Contact() { Id = Guid.NewGuid(), Anniversary = new DateTime(thisYear + 1, 1, 1) }; // First day of next year - should not be returned
- ctx.Initialize(new[] { ct1, ct2, ct3});
+ var ct3 = new Contact() { Id = Guid.NewGuid(), Anniversary = new DateTime(thisYear + 1, 1, 2) }; // Second day of next year - should not be returned
+ ctx.Initialize(new[] { ct1, ct2, ct3 });
  var service = ctx.GetOrganizationService();
 
  var collection = service.RetrieveMultiple(new FetchExpression(fetchXml));
 
  Assert.Equal(2, collection.Entities.Count);
 
  Assert.Equal(((DateTime)collection.Entities[0]["anniversary"]).Year, thisYear);
- Assert.Equal(((DateTime)collection.Entities[1]["anniversary"]).Year, thisYear+1);
+ Assert.Equal(((DateTime)collection.Entities[1]["anniversary"]).Year, thisYear);
  }
 
  [Fact]
@@ -1395,7 +1396,7 @@ public void FetchXml_Operator_LastMonth_Execution()
  Assert.Equal(2, collection.Entities.Count);
 
  Assert.Equal(((DateTime)collection.Entities[0]["anniversary"]).Month, lastMonth);
- Assert.Equal(((DateTime)collection.Entities[1]["anniversary"]).Month, lastMonth); 
+ Assert.Equal(((DateTime)collection.Entities[1]["anniversary"]).Month, lastMonth);
  }
 
  [Fact]
@@ -1413,7 +1414,7 @@ public void FetchXml_Operator_NextMonth_Execution()
 
  var today = DateTime.Today;
  var thisYear = today.Year;
- var thisMonth = today.Month; 
+ var thisMonth = today.Month;
  var nextMonth = new DateTime(thisYear, thisMonth, 1).AddMonths(1).Month;
  var ct1 = new Contact() { Id = Guid.NewGuid(), Anniversary = today }; // Today - Should not be returned
  var ct2 = new Contact() { Id = Guid.NewGuid(), Anniversary = new DateTime(thisYear, thisMonth, 1) }; // First day of this month - should not be returned
@@ -1422,7 +1423,7 @@ public void FetchXml_Operator_NextMonth_Execution()
  var ct5 = new Contact() { Id = Guid.NewGuid(), Anniversary = new DateTime(thisYear, thisMonth, 1).AddMonths(2).AddDays(-1) }; // Last day of next month - should be returned 
  var ct6 = new Contact() { Id = Guid.NewGuid(), Anniversary = new DateTime(thisYear, thisMonth, 1).AddDays(-1) }; // Last day of last month - should not be returned
  var ct7 = new Contact() { Id = Guid.NewGuid(), Anniversary = new DateTime(thisYear, thisMonth, 1).AddMonths(-1) }; // First day of last month - should not be returned
- 
+
  ctx.Initialize(new[] { ct1, ct2, ct3, ct4, ct5, ct6, ct7 });
  var service = ctx.GetFakedOrganizationService();
 
@@ -1609,9 +1610,9 @@ public void FetchXml_Operator_Next_X_Weeks_Execution()
  </fetch>";
 
  var date = DateTime.Now;
- var ct1 = new Contact() { Id = Guid.NewGuid(), Anniversary = date.AddDays(7*2) }; //Should be returned
- var ct2 = new Contact() { Id = Guid.NewGuid(), Anniversary = date.AddDays(7*4) }; //Shouldnt
- ctx.Initialize(new[] { ct1, ct2});
+ var ct1 = new Contact() { Id = Guid.NewGuid(), Anniversary = date.AddDays(7 * 2) }; //Should be returned
+ var ct2 = new Contact() { Id = Guid.NewGuid(), Anniversary = date.AddDays(7 * 4) }; //Shouldnt
+ ctx.Initialize(new[] { ct1, ct2 });
  var service = ctx.GetOrganizationService();
 
  var collection = service.RetrieveMultiple(new FetchExpression(fetchXml));
@@ -1818,7 +1819,7 @@ public void FetchXml_Operator_Next_Week_Execution()
  Assert.Equal(retrievedUser, ct1.Id);
  }
 
- 
+
 #if FAKE_XRM_EASY_9
  [Fact]
  public void FetchXml_Operator_ContainValues_Translation()