246 code cleanup

src/.editorconfig

@@ -0,0 +1,123 @@
+# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
+###############################
+# Core EditorConfig Options   #
+###############################
+# All files
+[*]
+indent_style = space
+# Code files
+[*.{cs,csx,vb,vbx}]
+indent_size = 4
+insert_final_newline = true
+charset = utf-8
+###############################
+# .NET Coding Conventions     #
+###############################
+[*.{cs,vb}]
+# Organize usings
+dotnet_sort_system_directives_first = false
+# this. preferences
+dotnet_style_qualification_for_field = false:silent
+dotnet_style_qualification_for_property = false:silent
+dotnet_style_qualification_for_method = false:silent
+dotnet_style_qualification_for_event = false:silent
+# Language keywords vs BCL types preferences
+dotnet_style_predefined_type_for_locals_parameters_members = true:silent
+dotnet_style_predefined_type_for_member_access = true:silent
+# Parentheses preferences
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+# Modifier preferences
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+dotnet_style_readonly_field = true:suggestion
+# Expression-level preferences
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+dotnet_prefer_inferred_tuple_names = true:suggestion
+dotnet_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+###############################
+# Naming Conventions          #
+###############################
+# Style Definitions
+dotnet_naming_style.pascal_case_style.capitalization             = pascal_case
+# Use PascalCase for constant fields  
+dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields
+dotnet_naming_rule.constant_fields_should_be_pascal_case.style    = pascal_case_style
+dotnet_naming_symbols.constant_fields.applicable_kinds            = field
+dotnet_naming_symbols.constant_fields.applicable_accessibilities  = *
+dotnet_naming_symbols.constant_fields.required_modifiers          = const
+###############################
+# C# Coding Conventions       #
+###############################
+[*.cs]
+# var preferences
+csharp_style_var_for_built_in_types = true:silent
+csharp_style_var_when_type_is_apparent = true:silent
+csharp_style_var_elsewhere = true:silent
+# Expression-bodied members
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
+# Pattern matching preferences
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+# Null-checking preferences
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
+# Modifier preferences
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
+# Expression-level preferences
+csharp_prefer_braces = true:silent
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_pattern_local_over_anonymous_function = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+###############################
+# C# Formatting Rules         #
+###############################
+# New line preferences
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+# Indentation preferences
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
+csharp_indent_labels = flush_left
+# Space preferences
+csharp_space_after_cast = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+# Wrapping preferences
+csharp_preserve_single_line_statements = true
+csharp_preserve_single_line_blocks = true
+###############################
+# VB Coding Conventions       #
+###############################
+[*.vb]
+# Modifier preferences
+visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion

src/VotingIrregularities.sln

@@ -43,6 +43,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoteMonitor.Api.PollingStat
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoteMonitor.Api.Ngo", "api\VoteMonitor.Api.Ngo\VoteMonitor.Api.Ngo.csproj", "{674C9094-58B8-4749-9EB1-2FFD054B8D7D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{03736909-BAD9-4B1F-B416-43B045B1D37C}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

src/api/VoteMonitor.Api.Answer/Commands/BulkAnswers.cs

@@ -1,19 +1,19 @@
-using MediatR;
+using MediatR;
 using System.Collections.Generic;
 using System.Linq;
 using VoteMonitor.Api.Answer.Models;
 
 namespace VoteMonitor.Api.Answer.Commands
 {
-    public class BulkAnswers : IRequest<CompleteazaRaspunsCommand>
+    public class BulkAnswers : IRequest<FillInAnswerCommand>
     {
-        public BulkAnswers(IEnumerable<BulkAnswerModel> raspunsuri)
+        public BulkAnswers(IEnumerable<BulkAnswerDto> answers)
         {
-            Answers = raspunsuri.ToList();
+            Answers = answers.ToList();
         }
 
         public int ObserverId { get; set; }
 
-        public List<BulkAnswerModel> Answers { get; set; }
+        public List<BulkAnswerDto> Answers { get; set; }
     }
-}
+}

src/api/VoteMonitor.Api.Answer/Commands/CompleteazaRaspunsCommand.cs → src/api/VoteMonitor.Api.Answer/Commands/FillInAnswerCommand.cs

@@ -4,14 +4,13 @@
 
 namespace VoteMonitor.Api.Answer.Commands
 {
-    public class CompleteazaRaspunsCommand : IRequest<int>
+    public class FillInAnswerCommand : IRequest<int>
     {
-        public CompleteazaRaspunsCommand()
+        public FillInAnswerCommand()
         {
-            Answers = new List<AnswerDTO>();
+            Answers = new List<AnswerDto>();
         }
         public int ObserverId { get; set; }
-        public List<AnswerDTO> Answers { get; set; }
-
+        public List<AnswerDto> Answers { get; set; }
     }
 }

src/api/VoteMonitor.Api.Answer/Controllers/AnswersController.cs

@@ -1,10 +1,8 @@
-using MediatR;
-using Microsoft.AspNetCore.Authorization;
+using MediatR;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using VoteMonitor.Api.Answer.Commands;
 using VoteMonitor.Api.Answer.Models;
 using VoteMonitor.Api.Answer.Queries;
 using VoteMonitor.Api.Core;
@@ -25,24 +23,23 @@ public AnswersController(IMediator mediator, IConfiguration configuration)
 
         /// <summary>
         /// Returns a list of polling stations where observers from the given NGO have submitted answers
-        /// to the questions marked as Flagged=Urgent, ordered by ModifiedDate descending
+        /// to the questions marked as IsFlagged=IsUrgent, ordered by ModifiedDate descending
         /// </summary>
-        /// <param name="model"> Pagination details(default Page=1, PageSize=20)
-        /// Urgent (Flagged)
-        /// </param>
+        /// <param name="model">SectionAnswersRequest</param>
+        /// <returns></returns>
         [HttpGet]
-        public async Task<ApiListResponse<AnswerQueryDTO>> Get(SectionAnswersRequest model)
+        public async Task<ApiListResponse<AnswerQueryDto>> Get(SectionAnswersRequest model)
         {
-            var organizator = this.GetOrganizatorOrDefault(_configuration.GetValue<bool>("DefaultOrganizator"));
-            var idOng = this.GetIdOngOrDefault(_configuration.GetValue<int>("DefaultIdOng"));
+            var organizer = this.GetOrganizatorOrDefault(_configuration.GetValue<bool>("DefaultOrganizator"));
+            var ngoId = this.GetIdOngOrDefault(_configuration.GetValue<int>("DefaultIdOng"));
 
             return await _mediator.Send(new AnswersQuery
             {
-                IdONG = idOng,
-                Organizer = organizator,
+                NgoId = ngoId,
+                Organizer = organizer,
                 Page = model.Page,
                 PageSize = model.PageSize,
-                Urgent = model.Urgent,
+                Urgent = model.IsUrgent,
                 County = model.County,
                 PollingStationNumber = model.PollingStationNumber,
                 ObserverId = model.ObserverId,
@@ -54,32 +51,31 @@ public async Task<ApiListResponse<AnswerQueryDTO>> Get(SectionAnswersRequest mod
         /// Returns answers given by the specified observer at the specified polling station
         /// </summary>
         [HttpGet("filledIn")]
-        public async Task<List<QuestionDTO<FilledInAnswerDTO>>> Get(int idPollingStation, int idObserver)
+        public async Task<List<QuestionDto<FilledInAnswerDto>>> Get(int pollingStationId, int observerId)
         {
             return await _mediator.Send(new FilledInAnswersQuery
             {
-                ObserverId = idObserver,
-                PollingStationId = idPollingStation
+                ObserverId = observerId,
+                PollingStationId = pollingStationId
             });
         }
 
         /// <summary>
         /// Returns the polling station information filled in by the given observer at the given polling station
         /// </summary>
-        /// <param name="model"> "IdSectieDeVotare" - Id-ul sectiei unde s-au completat raspunsurile
-        /// "IdObservator" - Id-ul observatorului care a dat raspunsurile
+        /// <param name="model"> "PollingStationId" - Id of the given polling station
+        /// "ObserverId" - Id of the observer
         /// </param>
         [HttpGet("pollingStationInfo")]
-        public async Task<PollingStationInfosDTO> GetRaspunsuriFormular(ObserverAnswersRequest model)
+        public async Task<PollingStationInfoDto> GetObserverAnswers(ObserverAnswersRequest model)
         {
             return await _mediator.Send(new FormAnswersQuery
             {
                 ObserverId = model.ObserverId,
                 PollingStationId = model.PollingStationNumber
             });
         }
-
-
+
         /// <summary>
         /// Saves the answers to one or more questions, at a given polling station
         /// An answer can have multiple options (OptionId) and potentially a free text (Value).
@@ -88,16 +84,16 @@ public async Task<PollingStationInfosDTO> GetRaspunsuriFormular(ObserverAnswersR
         /// <code>IsFreeText = true</code></param>
         /// <returns></returns>
         [HttpPost]
-        [Authorize("Observer")]
-        public async Task<IActionResult> PostAnswer([FromBody] AnswerModelWrapper answerModel)
+        //[Authorize("Observer")]
+        public async Task<IActionResult> PostAnswer([FromBody] BulkAnswersRequest answerModel)
         {
             if (!ModelState.IsValid)
             {
                 return BadRequest(ModelState);
             }
 
             // TODO[DH] use a pipeline instead of separate Send commands
-            var command = await _mediator.Send(new BulkAnswers(answerModel.Answers));
+            var command = await _mediator.Send(new Commands.BulkAnswers(answerModel.Answers));
 
             command.ObserverId = this.GetIdObserver();
 
@@ -111,4 +107,4 @@ public async Task<IActionResult> PostAnswer([FromBody] AnswerModelWrapper answer
             return Ok();
         }
     }
-}
+}

src/api/VoteMonitor.Api.Answer/Handlers/AnswerQueryHandler.cs

@@ -1,16 +1,17 @@
-using MediatR;
+using MediatR;
 using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using VoteMonitor.Api.Answer.Commands;
 using VoteMonitor.Api.Answer.Models;
 using VoteMonitor.Entities;
+using BulkAnswers = VoteMonitor.Api.Answer.Commands.BulkAnswers;
 
 namespace VoteMonitor.Api.Answer.Handlers
 {
     public class AnswerQueryHandler :
-        IRequestHandler<BulkAnswers, CompleteazaRaspunsCommand>
+        IRequestHandler<BulkAnswers, FillInAnswerCommand>
     {
         private readonly VoteMonitorContext _context;
 
@@ -19,31 +20,29 @@ public AnswerQueryHandler(VoteMonitorContext context)
             _context = context;
         }
 
-        public async Task<CompleteazaRaspunsCommand> Handle(BulkAnswers message, CancellationToken cancellationToken)
+        public async Task<FillInAnswerCommand> Handle(BulkAnswers message, CancellationToken cancellationToken)
         {
-            // se identifica sectiile in care observatorul a raspuns
-            var sectii = message.Answers
+            var countyPollingStations = message.Answers
                 .Select(a => new { a.PollingStationNumber, a.CountyCode })
                 .Distinct()
                 .ToList();
 
-            var command = new CompleteazaRaspunsCommand { ObserverId = message.ObserverId };
+            var command = new FillInAnswerCommand { ObserverId = message.ObserverId };
 
 
-            foreach (var sectie in sectii)
+            foreach (var pollingStation in countyPollingStations)
             {
-                var idSectie = (await _context
+                var pollingStationId = (await _context
                     .PollingStations
-                    .FirstOrDefaultAsync(p => p.County.Code == sectie.CountyCode && p.Number == sectie.PollingStationNumber))
+                    .FirstOrDefaultAsync(p => p.County.Code == pollingStation.CountyCode && p.Number == pollingStation.PollingStationNumber))
                     .Id;
-                //(sectie.PollingStationNumber, sectie.CountyCode);
 
                 command.Answers.AddRange(message.Answers
-                    .Where(a => a.PollingStationNumber == sectie.PollingStationNumber && a.CountyCode == sectie.CountyCode)
-                    .Select(a => new AnswerDTO
+                    .Where(a => a.PollingStationNumber == pollingStation.PollingStationNumber && a.CountyCode == pollingStation.CountyCode)
+                    .Select(a => new AnswerDto
                     {
                         QuestionId = a.QuestionId,
-                        PollingSectionId = idSectie,
+                        PollingStationId = pollingStationId,
                         Options = a.Options,
                         PollingStationNumber = a.PollingStationNumber,
                         CountyCode = a.CountyCode