feat: able to update rules date end and disable (#117)

feat: able to update rules date end and disable

Author: carlosgoias

samples/Rules.Framework.WebUI.Sample/Rules/RulesRandomFactory.cs

@@ -33,18 +33,25 @@ public IEnumerable<RuleSpecification> GetRulesSpecifications()
                         RuleAddPriorityOption.ByPriorityNumber(i),
                         rulesSpecifications);
                 }
+
+                var deactiveDateBegin = CreateRandomDateBegin(currentYear);
+
+                Add(CreateMultipleRule((ContentTypes)contentType, finalNumber, deactiveDateBegin, CreateRandomDateEnd(deactiveDateBegin), isActive: false),
+                        RuleAddPriorityOption.ByPriorityNumber(finalNumber),
+                        rulesSpecifications);
             }
 
             return rulesSpecifications;
         }
 
         private static RuleBuilderResult<ContentTypes, ConditionTypes> CreateMultipleRule(ContentTypes contentTypes, int value, DateTime dateBegin,
-            DateTime? dateEnd) =>
+            DateTime? dateEnd, bool isActive = true) =>
                                      RuleBuilder
                              .NewRule<ContentTypes, ConditionTypes>()
                              .WithName($"Multi rule for test {contentTypes} {value}")
                              .WithContent(contentTypes, new { Value = value })
                              .WithDatesInterval(dateBegin, dateEnd)
+                             .WithActive(isActive)
                              .WithCondition(cnb => cnb.AsComposed()
                                     .WithLogicalOperator(LogicalOperators.Or)
                                         .AddCondition(condition => condition
@@ -53,9 +60,9 @@ private static RuleBuilderResult<ContentTypes, ConditionTypes> CreateMultipleRul
                                             .SetOperand(7)
                                             .Build())
                                         .AddCondition(condition => condition
-                                            .AsValued(ConditionTypes.SumAll).OfDataType<int>()
-                                            .WithComparisonOperator(Operators.Equal)
-                                            .SetOperand(9)
+                                            .AsValued(ConditionTypes.SumAll).OfDataType<IEnumerable<int>>()
+                                            .WithComparisonOperator(Operators.In)
+                                            .SetOperand(new int[] { 9, 8, 6 })
                                             .Build())
                                         .AddCondition(condition => condition.AsComposed()
                                             .WithLogicalOperator(LogicalOperators.And)
@@ -127,4 +134,4 @@ private DateTime CreateRandomDateBegin(int year)
             return dateBegin.AddMonths(months).AddDays(1);
         }
     }
-}
+}

src/Rules.Framework.Providers.MongoDb/DataModel/RuleDataModel.cs

@@ -5,6 +5,7 @@ namespace Rules.Framework.Providers.MongoDb.DataModel
 
     internal sealed class RuleDataModel
     {
+        public bool? Active { get; set; }
         public dynamic Content { get; set; }
 
         public string ContentType { get; set; }

src/Rules.Framework.Providers.MongoDb/MongoDbProviderRulesDataSource.cs

@@ -102,6 +102,7 @@ public async Task UpdateRuleAsync(Rule<TContentType, TConditionType> rule)
                 Builders<RuleDataModel>.Update.Set(r => r.DateEnd, ruleDataModel.DateEnd),
                 Builders<RuleDataModel>.Update.Set(r => r.Name, ruleDataModel.Name),
                 Builders<RuleDataModel>.Update.Set(r => r.Priority, ruleDataModel.Priority),
+                Builders<RuleDataModel>.Update.Set(r => r.Active, ruleDataModel.Active),
                 Builders<RuleDataModel>.Update.Set(r => r.RootCondition, ruleDataModel.RootCondition),
             };
 
@@ -157,4 +158,4 @@ private async Task<IEnumerable<Rule<TContentType, TConditionType>>> GetRulesAsyn
             return fetchedRules.Select(r => this.ruleFactory.CreateRule(r));
         }
     }
-}
+}

src/Rules.Framework.Providers.MongoDb/RuleFactory.cs

@@ -31,6 +31,7 @@ public Rule<TContentType, TConditionType> CreateRule(RuleDataModel ruleDataModel
             var ruleBuilderResult = RuleBuilder.NewRule<TContentType, TConditionType>()
                 .WithName(ruleDataModel.Name)
                 .WithDatesInterval(ruleDataModel.DateBegin, ruleDataModel.DateEnd)
+                .WithActive(ruleDataModel.Active ?? true)
                 .WithCondition(cnb => ruleDataModel.RootCondition is { } ? ConvertConditionNode(cnb, ruleDataModel.RootCondition) : null)
                 .WithSerializedContent(contentType, (object)ruleDataModel.Content, this.contentSerializationProvider)
                 .Build();
@@ -69,6 +70,7 @@ public RuleDataModel CreateRule(Rule<TContentType, TConditionType> rule)
                 DateEnd = rule.DateEnd,
                 Name = rule.Name,
                 Priority = rule.Priority,
+                Active = rule.Active,
                 RootCondition = rule.RootCondition is { } ? ConvertConditionNode(rule.RootCondition) : null,
             };
 
@@ -202,4 +204,4 @@ private ConditionNodeDataModel ConvertConditionNode(IConditionNode<TConditionTyp
             return ConvertComposedConditionNode(conditionNode as ComposedConditionNode<TConditionType>);
         }
     }
-}
+}

src/Rules.Framework.WebUI/Dto/RuleStatusDto.cs

@@ -4,6 +4,7 @@ internal enum RuleStatusDto : short
     {
         Inactive,
         Active,
-        Pending
+        Pending,
+        Deactivated
     }
-}
+}

src/Rules.Framework.WebUI/Dto/ValueConditionNodeDto.cs

@@ -6,8 +6,8 @@ internal sealed class ValueConditionNodeDto : ConditionNodeDto
 
         public string DataType { get; internal set; }
 
-        public string Operand { get; internal set; }
+        public dynamic Operand { get; internal set; }
 
         public string Operator { get; internal set; }
     }
-}
+}

src/Rules.Framework.WebUI/Extensions/RuleDtoExtensions.cs

@@ -20,8 +20,8 @@ public static ConditionNodeDto ToConditionNodeDto(this GenericConditionNode root
                 {
                     ConditionTypeName = condition.ConditionTypeName,
                     DataType = condition.DataType.ToString(),
-                    Operand = condition.Operand.ToString(),
-                    Operator = condition.Operator.ToString()
+                    Operand = condition.Operand,
+                    Operator = condition.Operator.ToString(),
                 };
             }
 
@@ -51,8 +51,8 @@ public static RuleDto ToRuleDto(this GenericRule rule, IRuleStatusDtoAnalyzer ru
                 Value = rule.Content,
                 DateEnd = !rule.DateEnd.HasValue ? null : rule.DateEnd.Value.ToString(dateFormat),
                 DateBegin = rule.DateBegin.ToString(dateFormat),
-                Status = ruleStatusDtoAnalyzer.Analyze(rule.DateBegin, rule.DateEnd).ToString(),
+                Status = !rule.Active ? RuleStatusDto.Deactivated.ToString() : ruleStatusDtoAnalyzer.Analyze(rule.DateBegin, rule.DateEnd).ToString(),
             };
         }
     }
-}
+}

src/Rules.Framework.WebUI/Handlers/GetContentTypeHandler.cs

@@ -67,4 +67,4 @@ private bool IsActive(GenericRule genericRule)
             return this.ruleStatusDtoAnalyzer.Analyze(genericRule.DateBegin, genericRule.DateEnd) == RuleStatusDto.Active;
         }
     }
-}
+}

src/Rules.Framework.WebUI/Handlers/GetRulesHandler.cs

@@ -68,4 +68,4 @@ protected override async Task HandleRequestAsync(HttpRequest httpRequest, HttpRe
             }
         }
     }
-}
+}

src/Rules.Framework.WebUI/index.html

@@ -185,6 +185,7 @@ <h5 class="mb-3">Content Types</h5>
                                             <option value="active">Active</option>
                                             <option value="inactive">Inactive</option>
                                             <option value="pending">Pending</option>
+                                            <option value="deactivated">Deactivated</option>
                                         </select>
                                     </div>
                                 </form>
@@ -316,6 +317,11 @@ <h5 class="mb-3">Rules</h5>
                         style = 'color: #bc3803 !important;background-color: #ffefca !important;'
                         icon = 'glyphicon glyphicon-time';
                         break;
+                    case 'deactivated':
+                        labelColor = 'badge text-bg-info';
+                        style = 'color: #494141 !important;background-color: #bdbbbb !important;'
+                        icon = 'glyphicon glyphicon-minus-sign';
+                        break;
                     default:
                         labelColor = 'badge text-bg-danger';
                         style = 'color: #AF0000 !important;background-color: #FFC8C8 !important;'