forked from MDCPS/DamageAssessment_Backend
Merged new dev changes
This commit is contained in:
@ -6,7 +6,6 @@ using Microsoft.Extensions.Configuration;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Controllers
|
||||
{
|
||||
[Route("api")]
|
||||
[ApiController]
|
||||
public class SurveyResponsesController : ControllerBase
|
||||
{
|
||||
@ -16,8 +15,11 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
|
||||
{
|
||||
this.surveyResponseProvider = surveyResponseProvider;
|
||||
}
|
||||
/// <summary>
|
||||
/// GET request for retrieving survey responses.
|
||||
/// </summary>
|
||||
|
||||
[HttpGet("SurveyResponses")]
|
||||
[HttpGet("Responses")]
|
||||
public async Task<ActionResult> GetSurveyResponsesAsync()
|
||||
{
|
||||
var result = await this.surveyResponseProvider.GetSurveyResponsesAsync();
|
||||
@ -31,22 +33,30 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
|
||||
|
||||
return BadRequest(result.ErrorMessage);
|
||||
}
|
||||
|
||||
[HttpGet("SurveyResponses/{surveyId}")]
|
||||
public async Task<ActionResult> GetSurveyResponsesAsync(int surveyId)
|
||||
/// <summary>
|
||||
/// GET request for retrieving survey responses by survey ID.
|
||||
/// </summary>
|
||||
|
||||
[HttpGet("Responses/BySurvey/{surveyid}")]
|
||||
public async Task<ActionResult> GetSurveyResponsesAsync(int surveyid)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAsync(surveyId);
|
||||
var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAsync(surveyid);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.SurveyResponses);
|
||||
}
|
||||
return NoContent();
|
||||
}
|
||||
/// <summary>
|
||||
/// GET request for retrieving survey responses by survey and location IDs.
|
||||
/// </summary>
|
||||
/// <param name="surveyid">The ID of the survey for which responses are to be retrieved.</param>
|
||||
/// <param name="locationid">The ID of the location for which responses are to be retrieved.</param>
|
||||
|
||||
[HttpGet("Responses/{surveyId}/{locationId}")]
|
||||
public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyId, string locationId)
|
||||
[HttpGet("Responses/{surveyid}/{locationid}")]
|
||||
public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyid, int locationid)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyId, locationId);
|
||||
var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyid, locationid);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.SurveyResponses);
|
||||
@ -54,11 +64,17 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
|
||||
|
||||
return NoContent();
|
||||
}
|
||||
/// <summary>
|
||||
/// GET request for retrieving survey responses by survey, question, and answer.
|
||||
/// </summary>
|
||||
/// <param name="surveyId">The ID of the survey for which responses are to be retrieved.</param>
|
||||
/// <param name="questionId">The ID of the question for which responses are to be retrieved.</param>
|
||||
/// <param name="answer">The answer for which responses are to be retrieved.</param>
|
||||
|
||||
[HttpGet("ResponsesByAnswer/{surveyId}/{questionId}/{answer}")]
|
||||
public async Task<ActionResult> GetSurveyResponsesByAnswerAsyncAsync(int surveyId, int questionId, string answer)
|
||||
[HttpGet("Responses/ByAnswer/{surveyid}/{questionid}/{answer}")]
|
||||
public async Task<ActionResult> GetSurveyResponsesByAnswerAsyncAsync(int surveyid, int questionid, string answer)
|
||||
{
|
||||
var result = await surveyResponseProvider.GetResponsesByAnswerAsync(surveyId, questionId, answer);
|
||||
var result = await surveyResponseProvider.GetResponsesByAnswerAsync(surveyid, questionid, answer);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.SurveyResponses);
|
||||
@ -66,33 +82,45 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
|
||||
|
||||
return NoContent();
|
||||
}
|
||||
/// <summary>
|
||||
/// GET request for retrieving answers from survey responses by survey ID and region.
|
||||
/// </summary>
|
||||
/// <param name="surveyId">The ID of the survey for which answers are to be retrieved.</param>
|
||||
|
||||
[HttpGet("AnswersByRegion/{surveyId}")]
|
||||
public async Task<ActionResult> GetAnswersByRegionAsync(int surveyId)
|
||||
[HttpGet("Responses/ByRegion/{surveyid}")]
|
||||
public async Task<ActionResult> GetAnswersByRegionAsync(int surveyid)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.GetAnswersByRegionAsync(surveyId);
|
||||
var result = await this.surveyResponseProvider.GetAnswersByRegionAsync(surveyid);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.Answers);
|
||||
}
|
||||
return NoContent();
|
||||
}
|
||||
/// <summary>
|
||||
/// GET request for retrieving survey responses by survey ID and maintenance center.
|
||||
/// </summary>
|
||||
/// <param name="surveyId">The ID of the survey for which responses are to be retrieved.</param>
|
||||
|
||||
[HttpGet("AnswersByMaintenanceCenter/{surveyId}")]
|
||||
public async Task<ActionResult> GetAnswersByMaintenaceCentersync(int surveyId)
|
||||
[HttpGet("Responses/ByMaintenanceCenter/{surveyid}")]
|
||||
public async Task<ActionResult> GetAnswersByMaintenaceCentersync(int surveyid)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.GetSurveyResponsesByMaintenanceCenterAsync(surveyId);
|
||||
var result = await this.surveyResponseProvider.GetSurveyResponsesByMaintenanceCenterAsync(surveyid);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.SurveyResponses);
|
||||
}
|
||||
return NoContent();
|
||||
}
|
||||
/// <summary>
|
||||
/// GET request for retrieving a survey response by response ID.
|
||||
/// </summary>
|
||||
/// <param name="responseId">The ID of the survey response to be retrieved.</param>
|
||||
|
||||
[HttpGet("SurveyResponse/{responseId}")]
|
||||
public async Task<ActionResult> GetSurveyResponseByIdAsync(int responseId)
|
||||
[HttpGet("Responses/{id}")]
|
||||
public async Task<ActionResult> GetSurveyResponseByIdAsync(int id)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.GetSurveyResponseByIdAsync(responseId);
|
||||
var result = await this.surveyResponseProvider.GetSurveyResponseByIdAsync(id);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.SurveyResponse);
|
||||
@ -100,8 +128,12 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
|
||||
return NoContent();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// POST request for creating a new survey response.
|
||||
/// </summary>
|
||||
/// <param name="surveyResponse">The survey response object to be created.</param>
|
||||
|
||||
[HttpPost("SurveyResponses")]
|
||||
[HttpPost("Responses")]
|
||||
public async Task<ActionResult> PostSurveysAsync(Models.SurveyResponse surveyResponse)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.PostSurveyResponseAsync(surveyResponse);
|
||||
@ -111,11 +143,16 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
|
||||
}
|
||||
return BadRequest(result.ErrorMessage);
|
||||
}
|
||||
/// <summary>
|
||||
/// PUT request for updating an existing survey response.
|
||||
/// </summary>
|
||||
/// <param name="Id">The ID of the survey response to be updated.</param>
|
||||
/// <param name="surveyResponse">The updated survey response object.</param>
|
||||
|
||||
[HttpPut("SurveyResponses/{Id}")]
|
||||
public async Task<ActionResult> PutSurveyResponseAsync(int Id, Models.SurveyResponse surveyResponse)
|
||||
[HttpPut("Responses/{id}")]
|
||||
public async Task<ActionResult> PutSurveyResponseAsync(int id, Models.SurveyResponse surveyResponse)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.PutSurveyResponseAsync(Id, surveyResponse);
|
||||
var result = await this.surveyResponseProvider.PutSurveyResponseAsync(id, surveyResponse);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.SurveyResponse);
|
||||
@ -125,28 +162,29 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
|
||||
|
||||
return BadRequest(result.ErrorMessage);
|
||||
}
|
||||
|
||||
[HttpDelete("SurveyResponses/{Id}")]
|
||||
public async Task<ActionResult> DeleteSurveyResponseAsync(int Id)
|
||||
/// <summary>
|
||||
/// DELETE request for deleting an existing survey response.
|
||||
/// </summary>
|
||||
|
||||
[HttpDelete("Responses/{id}")]
|
||||
public async Task<ActionResult> DeleteSurveyResponseAsync(int id)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.DeleteSurveyResponseAsync(Id);
|
||||
var result = await this.surveyResponseProvider.DeleteSurveyResponseAsync(id);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.SurveyResponse);
|
||||
}
|
||||
return NotFound();
|
||||
}
|
||||
/// <summary>
|
||||
/// POST request for submitting survey with multiple answers.
|
||||
/// </summary>
|
||||
/// <param name="request">The answers to be submitted for the survey.</param>
|
||||
|
||||
[HttpPost("SurveyResponses/Answers")]
|
||||
public async Task<ActionResult> PostSurveyAnswersAsync(AnswerRequest answers)
|
||||
[HttpPost("Responses/Answers")]
|
||||
public async Task<ActionResult> PostSurveyAnswersAsync(Request request)
|
||||
{
|
||||
/* var result = await this.surveyResponseProvider.PostSurveyAnswersAsync(surveyAnswers);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.SurveyResponse);
|
||||
}
|
||||
return BadRequest(result.ErrorMessage);*/
|
||||
var result = await this.surveyResponseProvider.PostSurveyAnswersAsync(answers);
|
||||
var result = await this.surveyResponseProvider.PostSurveyAnswersAsync(request);
|
||||
|
||||
if (result.IsSuccess)
|
||||
return Ok(result.SurveyResponse);
|
||||
|
@ -4,6 +4,7 @@
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<GenerateDocumentationFile>True</GenerateDocumentationFile>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@ -21,6 +22,10 @@
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.5" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
|
||||
</ItemGroup>
|
||||
|
@ -10,21 +10,22 @@ namespace DamageAssesment.Api.SurveyResponses.Db
|
||||
|
||||
[ForeignKey("Survey")]
|
||||
public int SurveyId { get; set; }
|
||||
|
||||
[StringLength(4)]
|
||||
[ForeignKey("Location")]
|
||||
public string LocationId { get; set; }
|
||||
public int LocationId { get; set; }
|
||||
|
||||
[StringLength(6)]
|
||||
[ForeignKey("Employee")]
|
||||
public string EmployeeId { get; set; }
|
||||
public int EmployeeId { get; set; }
|
||||
|
||||
//public DateTime? CreatedDate { get; set; }
|
||||
public DateTime? CreatedDate { get; set; } = DateTime.Now;
|
||||
|
||||
//[StringLength(50)]
|
||||
// public string ClientDevice { get; set; }
|
||||
[StringLength(50)]
|
||||
public string? ClientDevice { get; set; }
|
||||
|
||||
[StringLength(250)]
|
||||
public string? KeyAnswerResult { get; set; }
|
||||
public double? Longitute { get; set; }
|
||||
public double? Latitude { get; set; }
|
||||
|
||||
// [StringLength(250)]
|
||||
//public string KeyAnswerResult { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -15,5 +15,13 @@ namespace DamageAssesment.Api.SurveyResponses.Db
|
||||
options.UseSqlServer(_Configuration.GetConnectionString("SurveyResponseConnection"));
|
||||
}
|
||||
public DbSet<Db.SurveyResponse> SurveyResponses { get; set; }
|
||||
|
||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
||||
{
|
||||
base.OnModelCreating(modelBuilder);
|
||||
modelBuilder.Entity<SurveyResponse>()
|
||||
.Property(item => item.Id)
|
||||
.ValueGeneratedOnAdd();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -5,6 +5,6 @@ namespace DamageAssesment.Api.SurveyResponses.Interfaces
|
||||
public interface IEmployeeServiceProvider
|
||||
{
|
||||
Task<List<Employee>> getEmployeesAsync();
|
||||
Task<Employee> getEmployeeAsync(string employeeID);
|
||||
Task<Employee> getEmployeeAsync(int employeeId);
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,9 @@
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Interfaces
|
||||
{
|
||||
public interface IHttpUtil
|
||||
{
|
||||
Task<string> SendAsync(HttpMethod method, string url, string JsonInput);
|
||||
}
|
||||
}
|
@ -13,11 +13,11 @@ namespace DamageAssesment.Api.SurveyResponses.Interfaces
|
||||
Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> DeleteSurveyResponseAsync(int Id);
|
||||
Task<(bool IsSuccess, dynamic SurveyResponse, string ErrorMessage)> GetSurveyResponseByIdAsync(int responseId);
|
||||
Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAsync(int surveyId);
|
||||
Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAndLocationAsync(int surveyId, string location);
|
||||
Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAndLocationAsync(int surveyId, int locationId);
|
||||
Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesByMaintenanceCenterAsync(int surveyId);
|
||||
Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetResponsesByAnswerAsync(int surveyId, int questionId, string answer);
|
||||
|
||||
Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyAnswersAsync(Models.AnswerRequest answers);
|
||||
Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyAnswersAsync(Request request);
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -1,11 +0,0 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class AggregateAnswer
|
||||
{
|
||||
public string? Answer { get; set; }
|
||||
public int Counter { get; set; }
|
||||
|
||||
}
|
||||
}
|
@ -1,11 +0,0 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class AggregateResult
|
||||
{
|
||||
public string RegionId { get; set; }
|
||||
public AggregateAnswer Answers { get; set; }
|
||||
|
||||
}
|
||||
}
|
@ -6,11 +6,11 @@ namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public int QuestionId { get; set; }
|
||||
public string? LocationId { get; set; }
|
||||
public int LocationId { get; set; }
|
||||
public string AnswerText { get; set; }
|
||||
public string? Comment { get; set; }
|
||||
public string Comment { get; set; }
|
||||
public int SurveyResponseId { get; set; }
|
||||
public string? RegionId { get; set; }
|
||||
public int RegionId { get; set; }
|
||||
// public string? Name { get; set; }
|
||||
// public string? Abbreviation { get; set; }
|
||||
|
||||
|
@ -1,13 +0,0 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class AnswerData
|
||||
{
|
||||
public string RegionId { get; set; }
|
||||
public string Name { get; set; }
|
||||
public string Abbreviation { get; set; }
|
||||
public List<AggregateAnswer> Answers { get; set; }
|
||||
|
||||
}
|
||||
}
|
@ -2,9 +2,9 @@
|
||||
{
|
||||
public class AnswerRequest
|
||||
{
|
||||
public int SurveyId { get; set; }
|
||||
public string LocationId { get; set; }
|
||||
public string EmployeeId { get; set; }
|
||||
public List<QuestionRequest> Answers { get; set; }
|
||||
public int QuestionId { get; set; }
|
||||
public string AnswerText { get; set; }
|
||||
public string Comment { get; set; }
|
||||
public List<FileModel> PostedFiles { get; set; } = new List<FileModel>();
|
||||
}
|
||||
}
|
||||
|
@ -4,18 +4,13 @@ namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class Employee
|
||||
{
|
||||
public string Id { get; set; }
|
||||
|
||||
[StringLength(50)]
|
||||
public int Id { get; set; }
|
||||
public string EmployeeCode { get; set; }
|
||||
public string Name { get; set; }
|
||||
|
||||
public DateTime BirthDate { get; set; }
|
||||
|
||||
[StringLength(50)]
|
||||
public string OfficePhoneNumber { get; set; }
|
||||
|
||||
[StringLength(50)]
|
||||
public string Email { get; set; }
|
||||
public bool IsActive { get; set; }
|
||||
public string? PreferredLanguage { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -2,8 +2,8 @@
|
||||
{
|
||||
public class Location
|
||||
{
|
||||
public string Id { get; set; }
|
||||
public string RegionId { get; set; }
|
||||
public int Id { get; set; }
|
||||
public int RegionId { get; set; }
|
||||
public string Name { get; set; }
|
||||
public string MaintenanceCenter { get; set; }
|
||||
public string SchoolType { get; set; }
|
||||
|
@ -1,24 +1,17 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class Question
|
||||
public class Question
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public List<QuestionsTranslation> Questions { get; set; }
|
||||
|
||||
//public int QuestionTypeID { get; set; }
|
||||
|
||||
public string TypeText { get; set; } = string.Empty;
|
||||
|
||||
public string TypeText { get; set; }
|
||||
public int QuestionNumber { get; set; }
|
||||
public bool IsRequired { get; set; }
|
||||
public bool Comment { get; set; }
|
||||
|
||||
public bool Key { get; set; }
|
||||
public int? SurveyId { get; set; }
|
||||
public string QuestionGroup { get; set; }
|
||||
public int SurveyId { get; set; }
|
||||
public int CategoryId { get; set; }
|
||||
// public int? Survey_SurveyID { get; set; }
|
||||
public Dictionary<string, string> Text { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -1,10 +0,0 @@
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class QuestionRequest
|
||||
{
|
||||
public int QuestionId { get; set; }
|
||||
public string AnswerText { get; set; }
|
||||
public string Comment { get; set; }
|
||||
public List<FileModel> PostedFiles { get; set; } = new List<FileModel>();
|
||||
}
|
||||
}
|
@ -1,8 +0,0 @@
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class QuestionsTranslation
|
||||
{
|
||||
public string QuestionText { get; set; }
|
||||
public string Language { get; set; } = "En";
|
||||
}
|
||||
}
|
@ -4,7 +4,7 @@ namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class Region
|
||||
{
|
||||
public string Id { get; set; }
|
||||
public int Id { get; set; }
|
||||
public string Name { get; set; }
|
||||
public string Abbreviation { get; set; }
|
||||
}
|
||||
|
@ -0,0 +1,15 @@
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class Request
|
||||
{
|
||||
public int SurveyId { get; set; }
|
||||
public int LocationId { get; set; }
|
||||
public int EmployeeId { get; set; }
|
||||
public string? ClientDevice { get; set; }
|
||||
public string? KeyAnswerResult { get; set; }
|
||||
public double? Longitute { get; set; }
|
||||
public double? Latitude { get; set; }
|
||||
public DateTime? CreatedDate { get; set; } = DateTime.Now;
|
||||
public List<AnswerRequest> Answers { get; set; }
|
||||
}
|
||||
}
|
@ -1,10 +0,0 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class ResultData
|
||||
{
|
||||
public List<AnswerData> Regions { get; set; }
|
||||
|
||||
}
|
||||
}
|
@ -4,25 +4,11 @@ namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class Survey
|
||||
{
|
||||
[Key]
|
||||
public int Id { get; set; }
|
||||
|
||||
[StringLength(100)]
|
||||
public string Title { get; set; }
|
||||
|
||||
//[StringLength(1000)]
|
||||
//public string Description { get; set; }
|
||||
|
||||
public bool IsEnabled { get; set; }
|
||||
|
||||
public DateTime? StartDate { get; set; }
|
||||
|
||||
public DateTime? EndDate { get; set; }
|
||||
|
||||
//public DateTime CreatedDate { get; set; }
|
||||
|
||||
//[StringLength(6)]
|
||||
//public string EmployeeID { get; set; }
|
||||
|
||||
public DateTime StartDate { get; set; }
|
||||
public DateTime EndDate { get; set; }
|
||||
public DateTime CreatedDate { get; set; }
|
||||
public Dictionary<string, string> Titles { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -5,24 +5,14 @@ namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class SurveyResponse
|
||||
{
|
||||
[Key]
|
||||
public int Id { get; set; }
|
||||
|
||||
[ForeignKey("Survey")]
|
||||
public int SurveyId { get; set; }
|
||||
|
||||
[ForeignKey("Location")]
|
||||
public string LocationId { get; set; }
|
||||
|
||||
[ForeignKey("Employee")]
|
||||
public string EmployeeId { get; set; }
|
||||
|
||||
//public DateTime? CreatedDate { get; set; }
|
||||
|
||||
//[StringLength(50)]
|
||||
//public string ClientDevice { get; set; }
|
||||
|
||||
//[StringLength(250)]
|
||||
//public string KeyAnswerResult { get; set; }
|
||||
public int LocationId { get; set; }
|
||||
public int EmployeeId { get; set; }
|
||||
public DateTime CreatedDate { get; set; }
|
||||
public string ClientDevice { get; set; }
|
||||
public string KeyAnswerResult { get; set; }
|
||||
public double Longitute { get; set; }
|
||||
public double Latitude { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,13 @@
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class SurveyTranslation
|
||||
{
|
||||
public string Title { get; set; }
|
||||
public string Language { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
@ -1,9 +1,10 @@
|
||||
using DamageAssesment.Api.SurveyResponses.Db;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Services;
|
||||
using DamageAssesment.Api.SurveyResponses.Providers;
|
||||
using Microsoft.AspNetCore.DataProtection.XmlEncryption;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Polly;
|
||||
using System.Reflection;
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
const int maxApiCallRetries = 3;
|
||||
@ -18,39 +19,29 @@ builder.Services.AddControllers();
|
||||
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
|
||||
|
||||
builder.Services.AddScoped<ISurveysResponse, SurveyResponsesProvider>();
|
||||
//builder.Services.AddScoped<ILogger, Logger>();
|
||||
builder.Services.AddScoped<IAnswerServiceProvider, AnswerServiceProvider>();
|
||||
builder.Services.AddScoped<ILocationServiceProvider, LocationServiceProvider>();
|
||||
builder.Services.AddScoped<IRegionServiceProvider, RegionServiceProvider>();
|
||||
builder.Services.AddScoped<IQuestionServiceProvider, QuestionServiceProvider>();
|
||||
builder.Services.AddScoped<IEmployeeServiceProvider, EmployeeServiceProvider>();
|
||||
builder.Services.AddScoped<IAttachmentServiceProvider, AttachmentServiceProvider>();
|
||||
builder.Services.AddScoped<ISurveyServiceProvider, SurveyServiceProvider>();
|
||||
|
||||
builder.Services.AddHttpClient<IAnswerServiceProvider, AnswerServiceProvider>().
|
||||
AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
|
||||
AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker) ));
|
||||
|
||||
builder.Services.AddHttpClient<ILocationServiceProvider, LocationServiceProvider>().
|
||||
builder.Services.AddHttpClient<IHttpUtil, HttpUtil>().
|
||||
AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
|
||||
AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
|
||||
|
||||
builder.Services.AddHttpClient<IRegionServiceProvider, RegionServiceProvider>().
|
||||
AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
|
||||
AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
|
||||
|
||||
builder.Services.AddHttpClient<IQuestionServiceProvider, QuestionServiceProvider>().
|
||||
AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
|
||||
AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
|
||||
|
||||
builder.Services.AddHttpClient<IEmployeeServiceProvider, EmployeeServiceProvider>().
|
||||
AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
|
||||
AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
|
||||
|
||||
builder.Services.AddHttpClient<IAttachmentServiceProvider, AttachmentServiceProvider>().
|
||||
AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
|
||||
AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
|
||||
|
||||
builder.Services.AddHttpClient<ISurveyServiceProvider, SurveyServiceProvider>().
|
||||
AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
|
||||
AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
|
||||
|
||||
builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
builder.Services.AddSwaggerGen();
|
||||
//builder.Services.AddSwaggerGen();
|
||||
builder.Services.AddSwaggerGen(c =>
|
||||
{
|
||||
// Include XML comments from your assembly
|
||||
var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
|
||||
var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
|
||||
c.IncludeXmlComments(xmlPath);
|
||||
});
|
||||
builder.Services.AddDbContext<SurveyResponseDbContext>(option =>
|
||||
{
|
||||
option.UseSqlServer("SurveyResponseConnection");
|
||||
|
@ -1,87 +0,0 @@
|
||||
using DamageAssesment.Api.SurveyResponses.Bases;
|
||||
using DamageAssesment.Api.SurveyResponses.Db;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
using Newtonsoft.Json;
|
||||
using System.Data.Common;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text.Json.Nodes;
|
||||
using System.Text;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
{
|
||||
public class AnswerServiceProvider : ServiceProviderBase, IAnswerServiceProvider
|
||||
{
|
||||
|
||||
public AnswerServiceProvider(IConfiguration configuration, HttpClient httpClient, ILogger<AnswerServiceProvider> logger, IRegionServiceProvider regionServiceProvider, ILocationServiceProvider locationServiceProvider) : base(configuration, httpClient, logger, "/api/Answers", configuration.GetValue<string>("EndPointSettings:AnswerUrlBase"))
|
||||
{
|
||||
}
|
||||
public async Task<List<Answer>> getAnswersAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
httpClient.BaseAddress = new Uri(urlBase);
|
||||
var response = await httpClient.GetAsync(ressource);
|
||||
response.EnsureSuccessStatusCode();
|
||||
var responseString = await response.Content.ReadAsStringAsync();
|
||||
var answers = JsonConvert.DeserializeObject<List<Answer>>(responseString);
|
||||
|
||||
if (answers == null || !answers.Any())
|
||||
return null;
|
||||
else return answers;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError($"Exception Found : {ex.Message} - Ref: AnswerServiceProvider.getAnswersAsync()");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<List<Answer>> GetAnswersByResponseIdAsync(int responseId)
|
||||
{
|
||||
try
|
||||
{
|
||||
httpClient.BaseAddress = new Uri(urlBase);
|
||||
|
||||
var response = await httpClient.GetAsync("/api/AnswersByResponse/"+ responseId);
|
||||
response.EnsureSuccessStatusCode();
|
||||
var responseString = await response.Content.ReadAsStringAsync();
|
||||
var answers = JsonConvert.DeserializeObject<List<Answer>>(responseString);
|
||||
|
||||
if (answers == null || !answers.Any())
|
||||
return null;
|
||||
else return answers;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError($"Exception Found : {ex.Message} - Ref: AnswerServiceProvider.GetAnswersByResponseId()");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<Answer> PostAnswersAsync(Answer answer)
|
||||
{
|
||||
try
|
||||
{
|
||||
httpClient.BaseAddress = new Uri(urlBase);
|
||||
var jsonObject = JsonConvert.SerializeObject(answer);
|
||||
var content = new StringContent(jsonObject.ToString(), Encoding.UTF8, "application/json");
|
||||
var response = await httpClient.PostAsync(ressource,content);
|
||||
response.EnsureSuccessStatusCode();
|
||||
var responseString = await response.Content.ReadAsStringAsync();
|
||||
var answers = JsonConvert.DeserializeObject<Answer>(responseString);
|
||||
|
||||
if (answers == null) {
|
||||
logger?.LogError($"Answer cannot be added - Ref: AnswerServiceProvider.PostAnswersAsync()");
|
||||
return null;
|
||||
}
|
||||
else return answers;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError($"Exception Found : {ex.Message} - Ref: AnswerServiceProvider.PostAnswersAsync()");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,58 +0,0 @@
|
||||
using DamageAssesment.Api.SurveyResponses.Bases;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
using Newtonsoft.Json;
|
||||
using System.Reflection;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
{
|
||||
public class EmployeeServiceProvider :ServiceProviderBase, IEmployeeServiceProvider
|
||||
{
|
||||
public EmployeeServiceProvider(IConfiguration configuration, HttpClient httpClient, ILogger<EmployeeServiceProvider> logger) : base(configuration, httpClient, logger, "/api/Employees", configuration.GetValue<string>("EndPointSettings:EmployeeUrlBase"))
|
||||
{
|
||||
}
|
||||
|
||||
public async Task<List<Employee>> getEmployeesAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
httpClient.BaseAddress = new Uri(urlBase);
|
||||
var response = await httpClient.GetAsync(ressource);
|
||||
response.EnsureSuccessStatusCode();
|
||||
var responseString = await response.Content.ReadAsStringAsync();
|
||||
var employees = JsonConvert.DeserializeObject<List<Employee>>(responseString);
|
||||
|
||||
if (employees == null || !employees.Any())
|
||||
return null;
|
||||
else return employees;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError($"Exception Found : {ex.Message} - Ref: EmployeeServiceProvider.getEmployeesAsync()");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<Employee> getEmployeeAsync(string employeeID)
|
||||
{
|
||||
try
|
||||
{
|
||||
httpClient.BaseAddress = new Uri(urlBase);
|
||||
//ressource = ressource + "/" + employeeID;
|
||||
var response = await httpClient.GetAsync("/api/Employees/"+ employeeID);
|
||||
response.EnsureSuccessStatusCode();
|
||||
var responseString = await response.Content.ReadAsStringAsync();
|
||||
var employee = JsonConvert.DeserializeObject<Employee>(responseString);
|
||||
|
||||
if (employee == null )
|
||||
return null;
|
||||
else return employee;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError($"Exception Found : {ex.Message} - Ref: EmployeeServiceProvider.getEmployeeAsync()");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -3,9 +3,6 @@ using DamageAssesment.Api.SurveyResponses.Db;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Internal;
|
||||
using System.Diagnostics;
|
||||
using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
{
|
||||
@ -34,21 +31,20 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
this.questionServiceProvider = questionServiceProvider;
|
||||
this.surveyServiceProvider = surveyServiceProvider;
|
||||
this.mapper = mapper;
|
||||
|
||||
seedData();
|
||||
// seedData();
|
||||
}
|
||||
|
||||
private void seedData()
|
||||
{
|
||||
if (!surveyResponseDbContext.SurveyResponses.Any())
|
||||
{
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = "Emp1", LocationId = "Loc1" });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = "Emp2", LocationId = "Loc2" });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 3, EmployeeId = "Emp4", LocationId = "Loc1" });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 4, EmployeeId = "Emp1", LocationId = "Loc2" });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = "Emp3", LocationId = "Loc3" });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = "Emp4", LocationId = "Loc2" });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = "Emp4", LocationId = "Loc3" });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 1, LocationId = 1 });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 2, LocationId = 1 });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 3, EmployeeId = 3, LocationId = 2 });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 4, EmployeeId = 4, LocationId = 2 });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 5, LocationId = 3});
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 4, LocationId = 2 });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 3, LocationId = 1 });
|
||||
surveyResponseDbContext.SaveChanges();
|
||||
}
|
||||
}
|
||||
@ -141,7 +137,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAndLocationAsync(int surveyId, string locationId)
|
||||
public async Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAndLocationAsync(int surveyId, int locationId)
|
||||
{
|
||||
try
|
||||
{
|
||||
@ -212,7 +208,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
var question = await questionServiceProvider.getQuestionsAsync(questionId);
|
||||
bool IsCorrectAnswer = answer.ToLower().Equals("yes") || answer.ToLower().Equals("no") ? true : false;
|
||||
|
||||
|
||||
|
||||
if (survey != null && question != null && IsCorrectAnswer)
|
||||
{
|
||||
var answers = await getSurveyResponsesByAnswerAsync(survey, question, answer);
|
||||
@ -228,7 +224,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
else
|
||||
{
|
||||
return (false, null, "Not found");
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -251,7 +247,6 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
answers = new List<Models.SurveyResponse>();
|
||||
return (true, answers, "Empty object returned");
|
||||
}
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -266,16 +261,16 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
{
|
||||
if (surveyResponse != null)
|
||||
{
|
||||
var surveyResponses = await surveyResponseDbContext.SurveyResponses.ToListAsync();
|
||||
surveyResponse.Id = surveyResponses.Count + 1;
|
||||
surveyResponseDbContext.SurveyResponses.Add(mapper.Map<Models.SurveyResponse, Db.SurveyResponse>(surveyResponse));
|
||||
surveyResponseDbContext.SaveChanges();
|
||||
var _surveyResponse = mapper.Map<Models.SurveyResponse, Db.SurveyResponse>(surveyResponse);
|
||||
surveyResponseDbContext.SurveyResponses.Add(_surveyResponse);
|
||||
await surveyResponseDbContext.SaveChangesAsync();
|
||||
surveyResponse.Id = _surveyResponse.Id;
|
||||
return (true, surveyResponse, "Request Successful");
|
||||
}
|
||||
else
|
||||
{
|
||||
logger?.LogInformation($"SurveyResponseID={surveyResponse.Id} cannot be added");
|
||||
return (false, null, "Survey cannot be added");
|
||||
logger?.LogInformation($"SurveyResponse cannot be added");
|
||||
return (false, null, "SurveyResponse cannot be added");
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
@ -292,15 +287,14 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
{
|
||||
if (SurveyResponse != null)
|
||||
{
|
||||
var _SurveyResponse = await surveyResponseDbContext.SurveyResponses.Where(s => s.Id == Id).FirstOrDefaultAsync();
|
||||
var _SurveyResponse = await surveyResponseDbContext.SurveyResponses.AsNoTracking().Where(s => s.Id == Id).FirstOrDefaultAsync();
|
||||
|
||||
if (_SurveyResponse != null)
|
||||
{
|
||||
_SurveyResponse.SurveyId = SurveyResponse.SurveyId;
|
||||
_SurveyResponse.EmployeeId = SurveyResponse.EmployeeId;
|
||||
_SurveyResponse.LocationId = SurveyResponse.LocationId;
|
||||
surveyResponseDbContext.SaveChanges();
|
||||
return (true, mapper.Map<Db.SurveyResponse, Models.SurveyResponse>(_SurveyResponse), "Successful");
|
||||
var response = mapper.Map<Models.SurveyResponse, Db.SurveyResponse>(SurveyResponse);
|
||||
surveyResponseDbContext.Update(response);
|
||||
await surveyResponseDbContext.SaveChangesAsync();
|
||||
return (true, SurveyResponse, "Successful");
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -331,7 +325,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
if (_SurveyResponse != null)
|
||||
{
|
||||
surveyResponseDbContext.Remove(_SurveyResponse);
|
||||
surveyResponseDbContext.SaveChanges();
|
||||
await surveyResponseDbContext.SaveChangesAsync();
|
||||
return (true, mapper.Map<Db.SurveyResponse, Models.SurveyResponse>(_SurveyResponse), "Successful");
|
||||
}
|
||||
else
|
||||
@ -339,7 +333,6 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
logger?.LogInformation($"SurveyReponseId = {Id} Not found");
|
||||
return (false, null, "Not Found");
|
||||
}
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -363,13 +356,13 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
answer => answer.SurveyResponseId,
|
||||
surveyResponse => surveyResponse.Id,
|
||||
(answer, surveyResponse) => new
|
||||
Answer
|
||||
|
||||
{
|
||||
Id = answer.Id,
|
||||
QuestionId = answer.QuestionId,
|
||||
AnswerText = answer.AnswerText,
|
||||
Comment = answer.Comment,
|
||||
LocationId = surveyResponse.LocationId,
|
||||
answer.Id,
|
||||
answer.QuestionId,
|
||||
answer.AnswerText,
|
||||
answer.Comment,
|
||||
surveyResponse.LocationId,
|
||||
SurveyResponseId = surveyResponse.Id
|
||||
});
|
||||
|
||||
@ -386,41 +379,46 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
//get all the answers based on the locations
|
||||
var result = from answer in surveyAnswers
|
||||
from location in locations
|
||||
where answer.LocationId == location.Id
|
||||
select new Answer
|
||||
where answer.LocationId.Equals(location.Id)
|
||||
select new
|
||||
{
|
||||
Id = answer.Id,
|
||||
QuestionId = answer.QuestionId,
|
||||
AnswerText = answer.AnswerText,
|
||||
Comment = answer.Comment,
|
||||
RegionId = location.RegionId,
|
||||
LocationId = location.Id,
|
||||
SurveyResponseId = answer.SurveyResponseId
|
||||
answer.Id,
|
||||
answer.QuestionId,
|
||||
answer.AnswerText,
|
||||
answer.Comment,
|
||||
location.RegionId,
|
||||
LocationId = location.Id,
|
||||
answer.SurveyResponseId
|
||||
};
|
||||
|
||||
|
||||
|
||||
//group records by answer and region
|
||||
var q = from e in result
|
||||
group e by (e.RegionId, e.AnswerText) into g
|
||||
select new AggregateResult
|
||||
select new
|
||||
{
|
||||
RegionId = g.Key.RegionId,
|
||||
Answers = new AggregateAnswer
|
||||
g.Key.RegionId,
|
||||
Answers = new
|
||||
{
|
||||
Answer = g.Key.AnswerText,
|
||||
g.Key.AnswerText,
|
||||
Counter = g.Count()
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
//build the result
|
||||
List<AnswerData> resultList = new List<AnswerData>();
|
||||
|
||||
List<dynamic> resultList = new List<dynamic>();
|
||||
foreach (Region region in regions)
|
||||
{
|
||||
var answers = q.Where(x => x.RegionId.Equals(region.Id)).Select(x => x.Answers).ToList();
|
||||
resultList.Add(new AnswerData { RegionId = region.Id, Name = region.Name, Abbreviation = region.Abbreviation, Answers = answers });
|
||||
var answers = from u in q.ToList()
|
||||
where u.RegionId.Equals(region.Id)
|
||||
select u.Answers;
|
||||
|
||||
resultList.Add(new { RegionId = region.Id, region.Name, region.Abbreviation, Answers = answers});
|
||||
}
|
||||
|
||||
//return the object result
|
||||
return new ResultData { Regions = resultList };
|
||||
return new { Regions = resultList };
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -434,35 +432,35 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
{
|
||||
try
|
||||
{
|
||||
var surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.Id == surveyResponse.Id).ToListAsync();
|
||||
//var surveyResponse = surveyResonses.SingleOrDefault();
|
||||
var employee = await employeeServiceProvider.getEmployeeAsync(surveyResponse.EmployeeId);
|
||||
var answers = await answerServiceProvider.GetAnswersByResponseIdAsync(surveyResponse.Id);
|
||||
var allQuestions = await questionServiceProvider.getQuestionsAsync();
|
||||
var questions = allQuestions.Where(s=> s.SurveyId == surveyResponse.Id);
|
||||
var questions = allQuestions.Where(s => s.SurveyId == surveyResponse.SurveyId);
|
||||
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
||||
|
||||
|
||||
var result = from r in surveyResonses
|
||||
select new
|
||||
{
|
||||
r.Id,
|
||||
r.SurveyId,
|
||||
r.LocationId,
|
||||
r.EmployeeId,
|
||||
Employee = employee,
|
||||
answers = from ans in answers
|
||||
select new
|
||||
{
|
||||
ans.QuestionId,
|
||||
ans.Id,
|
||||
ans.AnswerText,
|
||||
ans.Comment,
|
||||
Questions = (from q in questions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.QuestionGroup, q.Questions }).SingleOrDefault(),
|
||||
Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI }
|
||||
}
|
||||
};
|
||||
return result.SingleOrDefault();
|
||||
var result = new
|
||||
{
|
||||
surveyResponse.Id,
|
||||
surveyResponse.SurveyId,
|
||||
surveyResponse.LocationId,
|
||||
surveyResponse.EmployeeId,
|
||||
surveyResponse.ClientDevice,
|
||||
surveyResponse.KeyAnswerResult,
|
||||
surveyResponse.Longitute,
|
||||
surveyResponse.Latitude,
|
||||
Employee = employee,
|
||||
answers = from ans in answers
|
||||
select new
|
||||
{
|
||||
ans.QuestionId,
|
||||
ans.Id,
|
||||
ans.AnswerText,
|
||||
ans.Comment,
|
||||
Questions = (from q in questions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
|
||||
Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI }
|
||||
}
|
||||
};
|
||||
return result;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -494,6 +492,10 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
r.SurveyId,
|
||||
r.LocationId,
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
r.KeyAnswerResult,
|
||||
r.Longitute,
|
||||
r.Latitude,
|
||||
Employee = (from e in employees where e.Id == r.EmployeeId select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
|
||||
answers = from ans in answers
|
||||
where ans.SurveyResponseId == r.Id
|
||||
@ -503,7 +505,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
ans.QuestionId,
|
||||
ans.AnswerText,
|
||||
ans.Comment,
|
||||
Questions = (from q in surveyQuestions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.QuestionGroup, q.Questions }).SingleOrDefault(),
|
||||
Questions = (from q in surveyQuestions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
|
||||
Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI }
|
||||
|
||||
}
|
||||
@ -537,6 +539,10 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
r.SurveyId,
|
||||
r.LocationId,
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
r.KeyAnswerResult,
|
||||
r.Longitute,
|
||||
r.Latitude,
|
||||
Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
|
||||
answers = from ans in answers
|
||||
where ans.SurveyResponseId == r.Id
|
||||
@ -546,7 +552,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
ans.QuestionId,
|
||||
ans.AnswerText,
|
||||
ans.Comment,
|
||||
Questions = (from q in questions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.QuestionGroup, q.Questions }).SingleOrDefault(),
|
||||
Questions = (from q in questions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
|
||||
Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI }
|
||||
}
|
||||
};
|
||||
@ -587,7 +593,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
//get all the answers with location
|
||||
var surveyAnswersLocations = from surveyAns in surveyAnswers
|
||||
from location in locations
|
||||
where surveyAns.LocationId == location.Id
|
||||
where surveyAns.LocationId.Equals(location.Id)
|
||||
select new { surveyAns, location.MaintenanceCenter };
|
||||
|
||||
//aggreting the answers
|
||||
@ -596,9 +602,9 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
select new
|
||||
{
|
||||
g.Key.MaintenanceCenter,
|
||||
Answers = new AggregateAnswer
|
||||
Answers = new
|
||||
{
|
||||
Answer = g.Key.AnswerText,
|
||||
g.Key.AnswerText,
|
||||
Counter = g.Count()
|
||||
}
|
||||
};
|
||||
@ -621,7 +627,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
}
|
||||
|
||||
//Method to get Survey Responses by surveyId and LocationId
|
||||
private async Task<dynamic> getSurveyResponsesBySurveyIdLocationIdAsync(int surveyId, string locationId)
|
||||
private async Task<dynamic> getSurveyResponsesBySurveyIdLocationIdAsync(int surveyId, int locationId)
|
||||
{
|
||||
try
|
||||
{
|
||||
@ -640,6 +646,10 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
r.SurveyId,
|
||||
r.LocationId,
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
r.KeyAnswerResult,
|
||||
r.Longitute,
|
||||
r.Latitude,
|
||||
Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
|
||||
answers = from ans in answers
|
||||
where ans.SurveyResponseId == r.Id
|
||||
@ -650,7 +660,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
ans.Id,
|
||||
ans.AnswerText,
|
||||
ans.Comment,
|
||||
Questions = (from q in surveyQuestions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.QuestionGroup, q.Questions }).SingleOrDefault(),
|
||||
Questions = (from q in surveyQuestions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
|
||||
Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI }
|
||||
}
|
||||
};
|
||||
@ -670,8 +680,6 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
try
|
||||
{
|
||||
var surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == survey.Id).ToListAsync();
|
||||
//var questions = await questionServiceProvider.getQuestionsAsync();
|
||||
|
||||
var answers = await answerServiceProvider.getAnswersAsync();
|
||||
var employees = await employeeServiceProvider.getEmployeesAsync();
|
||||
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
||||
@ -683,6 +691,10 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
r.SurveyId,
|
||||
r.LocationId,
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
r.KeyAnswerResult,
|
||||
r.Longitute,
|
||||
r.Latitude,
|
||||
Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
|
||||
answers = from ans in answers
|
||||
where ans.SurveyResponseId == r.Id
|
||||
@ -709,66 +721,49 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
}
|
||||
|
||||
|
||||
async Task<bool> ProcessAnswers(QuestionRequest questionRequest, int surveyResponseId)
|
||||
async Task<bool> ProcessAnswers(AnswerRequest answerRequest, int surveyResponseId)
|
||||
{
|
||||
if (questionRequest != null)
|
||||
if (answerRequest != null)
|
||||
{
|
||||
var answer = await answerServiceProvider.PostAnswersAsync(new Answer { Id = 0, QuestionId = questionRequest.QuestionId, AnswerText = questionRequest.AnswerText, Comment = questionRequest.Comment, SurveyResponseId = surveyResponseId });
|
||||
var answer = await answerServiceProvider.PostAnswersAsync(new Models.Answer { QuestionId = answerRequest.QuestionId, AnswerText = answerRequest.AnswerText, Comment = answerRequest.Comment, SurveyResponseId = surveyResponseId });
|
||||
if (answer != null)
|
||||
{
|
||||
List<AnswerInfo> listAnswerInfo = new List<AnswerInfo>();
|
||||
listAnswerInfo.Add(new AnswerInfo { AnswerId = answer.Id, postedFiles = questionRequest.PostedFiles });
|
||||
var attachments = await attachmentServiceProvider.PostAttachmentsAsync(new AttachmentInfo { ResponseId = surveyResponseId, Answers = listAnswerInfo });
|
||||
listAnswerInfo.Add(new AnswerInfo { AnswerId = answer.Id, postedFiles = answerRequest.PostedFiles });
|
||||
var attachments = attachmentServiceProvider.PostAttachmentsAsync(new AttachmentInfo { ResponseId = surveyResponseId, Answers = listAnswerInfo });
|
||||
|
||||
string message = $"Answer for question {questionRequest.QuestionId} saved to the database";
|
||||
string message = $"Answer for question {answerRequest.QuestionId} saved to the database";
|
||||
logger?.LogInformation(message);
|
||||
return (true);
|
||||
}
|
||||
else
|
||||
{
|
||||
string message = $"Answer for question {questionRequest.QuestionId} cannot be saved to the database";
|
||||
string message = $"Answer for question {answerRequest.QuestionId} cannot be saved to the database";
|
||||
logger?.LogInformation(message);
|
||||
return (false);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var message = $"Answer for question {questionRequest.QuestionId} cannot be saved to the database - questionRequest object is null";
|
||||
var message = $"Answer for question {answerRequest.QuestionId} cannot be saved to the database - answerRequest object is null";
|
||||
logger?.LogInformation(message);
|
||||
return (false);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public async Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyAnswersAsync(Models.AnswerRequest answers)
|
||||
public async Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyAnswersAsync(Models.Request request)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (answers != null)
|
||||
if (request != null)
|
||||
{
|
||||
var response = await PostSurveyResponseAsync(new Models.SurveyResponse { Id = 0, SurveyId = answers.SurveyId, EmployeeId = answers.EmployeeId, LocationId = answers.LocationId });
|
||||
|
||||
var response = await PostSurveyResponseAsync(new Models.SurveyResponse { SurveyId = request.SurveyId, EmployeeId = request.EmployeeId, LocationId = request.LocationId, ClientDevice = request.ClientDevice, KeyAnswerResult = request.KeyAnswerResult, Latitude = Convert.ToDouble(request.Latitude), Longitute = Convert.ToDouble(request.Longitute), CreatedDate=DateTime.Now });
|
||||
if (response.IsSuccess)
|
||||
{
|
||||
var surveyResponse = response.SurveyResponse;
|
||||
|
||||
var answerTasks = new List<Task>(); //new List<string>();
|
||||
|
||||
//var tasks = answers.Answers.Select(x => ProcessAnswers(x,surveyResponse.SurveyResponseID));
|
||||
foreach (QuestionRequest ans in answers.Answers)
|
||||
{
|
||||
//var stopwatch = new Stopwatch();
|
||||
//stopwatch.Start();
|
||||
var task = Task.Run(() => ProcessAnswers(ans, surveyResponse.Id));
|
||||
|
||||
//var task = await ProcessAnswers(ans, surveyResponse.Id);
|
||||
answerTasks.Add(task);
|
||||
|
||||
|
||||
//stopwatch.Stop();
|
||||
//answerTasks.Add(ProcessAnswers(ans, surveyResponse.Id));
|
||||
}
|
||||
await Task.WhenAll(answerTasks);
|
||||
var tasks = request.Answers.Select(x => ProcessAnswers(x, surveyResponse.Id));
|
||||
await Task.WhenAll(tasks);
|
||||
return (true, surveyResponse, null);
|
||||
}
|
||||
else
|
||||
|
@ -0,0 +1,72 @@
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Services
|
||||
{
|
||||
public class AnswerServiceProvider : ServiceProviderBase, IAnswerServiceProvider
|
||||
{
|
||||
public AnswerServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<AnswerServiceProvider> logger) : base(configuration, httpUtil, logger, configuration.GetValue<string>("RessourceSettings:Answer"), configuration.GetValue<string>("EndPointSettings:AnswerUrlBase"))
|
||||
{
|
||||
}
|
||||
public async Task<List<Answer>> getAnswersAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
|
||||
var answers = JsonConvert.DeserializeObject<List<Answer>>(responseJsonString);
|
||||
|
||||
if (answers == null || !answers.Any())
|
||||
return new List<Answer>();
|
||||
else return answers;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError($"Exception Found : {ex.Message} - Ref: AnswerServiceProvider.getAnswersAsync()");
|
||||
return new List<Answer>();
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<List<Answer>> GetAnswersByResponseIdAsync(int responseId)
|
||||
{
|
||||
try
|
||||
{
|
||||
url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:AnswerByResponse"), responseId);
|
||||
var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
|
||||
var answers = JsonConvert.DeserializeObject<List<Answer>>(responseJsonString);
|
||||
|
||||
if (answers == null || !answers.Any())
|
||||
return new List<Answer>();
|
||||
else return answers;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError($"Exception Found : {ex.Message} - Ref: AnswerServiceProvider.GetAnswersByResponseId()");
|
||||
return new List<Answer>();
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<Answer> PostAnswersAsync(Answer answer)
|
||||
{
|
||||
try
|
||||
{
|
||||
var requestJsonString = JsonConvert.SerializeObject(answer);
|
||||
var responseJsonString = await httpUtil.SendAsync(HttpMethod.Post, url, requestJsonString);
|
||||
var answers = JsonConvert.DeserializeObject<Answer>(responseJsonString);
|
||||
|
||||
if (answers == null)
|
||||
{
|
||||
logger?.LogError($"Answers cannot be added - Ref: AnswerServiceProvider.PostAnswersAsync()");
|
||||
return null;
|
||||
}
|
||||
else return answers;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError($"Exception Found : {ex.Message} - Ref: AnswerServiceProvider.PostAnswersAsync()");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,17 +1,12 @@
|
||||
using DamageAssesment.Api.SurveyResponses.Bases;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Newtonsoft.Json;
|
||||
using System.Net.Http;
|
||||
using System.Runtime.Intrinsics.Arm;
|
||||
using System.Text;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
namespace DamageAssesment.Api.SurveyResponses.Services
|
||||
{
|
||||
public class AttachmentServiceProvider : ServiceProviderBase, IAttachmentServiceProvider
|
||||
{
|
||||
public AttachmentServiceProvider(IConfiguration configuration, HttpClient httpClient, ILogger<AttachmentServiceProvider> logger) : base(configuration, httpClient, logger, "/api/Attachments", configuration.GetValue<string>("EndPointSettings:AttachmentUrlBase"))
|
||||
public AttachmentServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<AttachmentServiceProvider> logger) : base(configuration, httpUtil, logger, configuration.GetValue<string>("RessourceSettings:Attachment"), configuration.GetValue<string>("EndPointSettings:AttachmentUrlBase"))
|
||||
{
|
||||
}
|
||||
|
||||
@ -19,20 +14,17 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
{
|
||||
try
|
||||
{
|
||||
httpClient.BaseAddress = new Uri(urlBase);
|
||||
var response = await httpClient.GetAsync(ressource);
|
||||
response.EnsureSuccessStatusCode();
|
||||
var responseString = await response.Content.ReadAsStringAsync();
|
||||
var attachments = JsonConvert.DeserializeObject<List<Attachment>>(responseString);
|
||||
var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
|
||||
var attachments = JsonConvert.DeserializeObject<List<Attachment>>(responseJsonString);
|
||||
|
||||
if (attachments == null || !attachments.Any())
|
||||
return null;
|
||||
return new List<Attachment>();
|
||||
else return attachments;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError($"Exception Found : {ex.Message} - Ref: AttachmentServiceProvider.getAttachmentsAsync()");
|
||||
return null;
|
||||
return new List<Attachment>();
|
||||
}
|
||||
}
|
||||
|
||||
@ -40,13 +32,9 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
{
|
||||
try
|
||||
{
|
||||
httpClient.BaseAddress = new Uri(urlBase);
|
||||
var jsonObject = JsonConvert.SerializeObject(attachmentInfo);
|
||||
var content = new StringContent(jsonObject.ToString(), Encoding.UTF8, "application/json");
|
||||
var response = await httpClient.PostAsync(ressource, content);
|
||||
response.EnsureSuccessStatusCode();
|
||||
var responseString = await response.Content.ReadAsStringAsync();
|
||||
var attachments = JsonConvert.DeserializeObject<IEnumerable<Attachment>>(responseString);
|
||||
var requestJsonString = JsonConvert.SerializeObject(attachmentInfo);
|
||||
var responseJsonString = await httpUtil.SendAsync(HttpMethod.Post, url, requestJsonString);
|
||||
var attachments = JsonConvert.DeserializeObject<IEnumerable<Attachment>>(responseJsonString);
|
||||
|
||||
if (attachments == null)
|
||||
{
|
@ -0,0 +1,51 @@
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
using Microsoft.AspNetCore.Mvc.Routing;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Services
|
||||
{
|
||||
public class EmployeeServiceProvider : ServiceProviderBase, IEmployeeServiceProvider
|
||||
{
|
||||
public EmployeeServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<EmployeeServiceProvider> logger) : base(configuration, httpUtil, logger, configuration.GetValue<string>("RessourceSettings:Employee"), configuration.GetValue<string>("EndPointSettings:EmployeeUrlBase"))
|
||||
{
|
||||
}
|
||||
|
||||
public async Task<List<Employee>> getEmployeesAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
|
||||
var employees = JsonConvert.DeserializeObject<List<Employee>>(responseJsonString);
|
||||
|
||||
if (employees == null || !employees.Any())
|
||||
return new List<Employee>();
|
||||
else return employees;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError($"Exception Found : {ex.Message} - Ref: EmployeeServiceProvider.getEmployeesAsync()");
|
||||
return new List<Employee>();
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<Employee> getEmployeeAsync(int employeeId)
|
||||
{
|
||||
try
|
||||
{
|
||||
url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:EmployeeById"), employeeId);
|
||||
var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
|
||||
var employee = JsonConvert.DeserializeObject<Employee>(responseJsonString);
|
||||
|
||||
if (employee == null)
|
||||
return null;
|
||||
else return employee;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError($"Exception Found : {ex.Message} - Ref: EmployeeServiceProvider.getEmployeeAsync()");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,43 @@
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using System.Net.Http.Headers;
|
||||
using System.Text;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Services
|
||||
{
|
||||
public class HttpUtil : IHttpUtil
|
||||
{
|
||||
private readonly HttpClient httpClient;
|
||||
private readonly ILogger<HttpUtil> logger;
|
||||
|
||||
public HttpUtil(HttpClient httpClient, ILogger<HttpUtil> logger)
|
||||
{
|
||||
this.httpClient = httpClient;
|
||||
this.logger = logger;
|
||||
}
|
||||
public async Task<string> SendAsync(HttpMethod method, string url, string JsonInput)
|
||||
{
|
||||
try
|
||||
{
|
||||
var request = new HttpRequestMessage(method, url);
|
||||
request.Headers.Accept.Clear();
|
||||
request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
|
||||
|
||||
//request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
|
||||
if (method == HttpMethod.Post)
|
||||
{
|
||||
request.Content = new StringContent(JsonInput, Encoding.UTF8, "application/json");
|
||||
}
|
||||
|
||||
var response = await httpClient.SendAsync(request, CancellationToken.None);
|
||||
response.EnsureSuccessStatusCode();
|
||||
var responseString = await response.Content.ReadAsStringAsync();
|
||||
return responseString;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError($"Exception Message : {ex.Message} - Ref: HttpUtil.SendAsync()");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,13 +1,12 @@
|
||||
using DamageAssesment.Api.SurveyResponses.Bases;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
namespace DamageAssesment.Api.SurveyResponses.Services
|
||||
{
|
||||
public class LocationServiceProvider :ServiceProviderBase, ILocationServiceProvider
|
||||
{
|
||||
public LocationServiceProvider(IConfiguration configuration, HttpClient httpClient, ILogger<LocationServiceProvider> logger) : base(configuration, httpClient, logger, "/api/Locations", configuration.GetValue<string>("EndPointSettings:LocationUrlBase"))
|
||||
public LocationServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<LocationServiceProvider> logger) : base(configuration, httpUtil, logger, configuration.GetValue<string>("RessourceSettings:Location"), configuration.GetValue<string>("EndPointSettings:LocationUrlBase"))
|
||||
{
|
||||
}
|
||||
|
||||
@ -15,20 +14,17 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
{
|
||||
try
|
||||
{
|
||||
httpClient.BaseAddress = new Uri(urlBase);
|
||||
var response = await httpClient.GetAsync(ressource);
|
||||
response.EnsureSuccessStatusCode();
|
||||
var responseString = await response.Content.ReadAsStringAsync();
|
||||
var locations = JsonConvert.DeserializeObject<List<Location>>(responseString);
|
||||
var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
|
||||
var locations = JsonConvert.DeserializeObject<List<Location>>(responseJsonString);
|
||||
|
||||
if (locations == null || !locations.Any())
|
||||
return null;
|
||||
return new List<Location>();
|
||||
else return locations;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError($"Exception Found : {ex.Message} - Ref: LocationServiceProvider.getLocationsAsync()");
|
||||
return null;
|
||||
return new List<Location>();
|
||||
}
|
||||
}
|
||||
}
|
@ -1,15 +1,12 @@
|
||||
using DamageAssesment.Api.SurveyResponses.Bases;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
namespace DamageAssesment.Api.SurveyResponses.Services
|
||||
{
|
||||
public class QuestionServiceProvider : ServiceProviderBase, IQuestionServiceProvider
|
||||
{
|
||||
public QuestionServiceProvider(IConfiguration configuration, HttpClient httpClient, ILogger<QuestionServiceProvider> logger) : base(configuration, httpClient, logger, "/api/Questions", configuration.GetValue<string>("EndPointSettings:QuestionUrlBase"))
|
||||
public QuestionServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<QuestionServiceProvider> logger) : base(configuration, httpUtil, logger, configuration.GetValue<string>("RessourceSettings:Question"), configuration.GetValue<string>("EndPointSettings:QuestionUrlBase"))
|
||||
{
|
||||
}
|
||||
|
||||
@ -17,20 +14,17 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
{
|
||||
try
|
||||
{
|
||||
httpClient.BaseAddress = new Uri(urlBase);
|
||||
var response = await httpClient.GetAsync(ressource);
|
||||
response.EnsureSuccessStatusCode();
|
||||
var responseString = await response.Content.ReadAsStringAsync();
|
||||
var questions = JsonConvert.DeserializeObject<List<Question>>(responseString);
|
||||
var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
|
||||
var questions = JsonConvert.DeserializeObject<List<Question>>(responseJsonString);
|
||||
|
||||
if (questions == null || !questions.Any())
|
||||
return null;
|
||||
return new List<Question>();
|
||||
else return questions;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError($"Exception Found : {ex.Message} - Ref: QuestionServiceProvider.getQuestionsAsync()");
|
||||
return null;
|
||||
return new List<Question>();
|
||||
}
|
||||
}
|
||||
|
||||
@ -38,20 +32,18 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
{
|
||||
try
|
||||
{
|
||||
httpClient.BaseAddress = new Uri(urlBase);
|
||||
var response = await httpClient.GetAsync("/api/GetSurveyQuestions/" + surveyId);
|
||||
response.EnsureSuccessStatusCode();
|
||||
var responseString = await response.Content.ReadAsStringAsync();
|
||||
var questions = JsonConvert.DeserializeObject<List<SurveyQuestions>>(responseString);
|
||||
url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:SurveyQuestion"), surveyId);
|
||||
var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
|
||||
var questions = JsonConvert.DeserializeObject<List<SurveyQuestions>>(responseJsonString);
|
||||
|
||||
if (questions == null || !questions.Any())
|
||||
return null;
|
||||
return new List<SurveyQuestions>() ;
|
||||
else return questions;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError($"Exception Found : {ex.Message} - Ref: QuestionServiceProvider.getSurveyQuestionsAsync()");
|
||||
return null;
|
||||
return new List<SurveyQuestions>();
|
||||
}
|
||||
}
|
||||
|
||||
@ -60,11 +52,9 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
{
|
||||
try
|
||||
{
|
||||
httpClient.BaseAddress = new Uri(urlBase);
|
||||
var response = await httpClient.GetAsync("/api/Questions/" + questionId);
|
||||
response.EnsureSuccessStatusCode();
|
||||
var responseString = await response.Content.ReadAsStringAsync();
|
||||
var question = JsonConvert.DeserializeObject<Question>(responseString);
|
||||
url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:QuestionById"), questionId);
|
||||
var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
|
||||
var question = JsonConvert.DeserializeObject<Question>(responseJsonString);
|
||||
|
||||
if (question == null)
|
||||
return null;
|
@ -1,33 +1,29 @@
|
||||
using DamageAssesment.Api.SurveyResponses.Bases;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
namespace DamageAssesment.Api.SurveyResponses.Services
|
||||
{
|
||||
public class RegionServiceProvider : ServiceProviderBase, IRegionServiceProvider
|
||||
{
|
||||
public RegionServiceProvider(IConfiguration configuration, HttpClient httpClient, ILogger<RegionServiceProvider> logger) : base(configuration, httpClient, logger, "/api/Regions", configuration.GetValue<string>("EndPointSettings:LocationUrlBase"))
|
||||
public RegionServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<RegionServiceProvider> logger) : base(configuration, httpUtil, logger, configuration.GetValue<string>("RessourceSettings:Region"), configuration.GetValue<string>("EndPointSettings:LocationUrlBase"))
|
||||
{
|
||||
}
|
||||
public async Task<List<Region>> getRegionsAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
httpClient.BaseAddress = new Uri(urlBase);
|
||||
var response = await httpClient.GetAsync(ressource);
|
||||
response.EnsureSuccessStatusCode();
|
||||
var responseString = await response.Content.ReadAsStringAsync();
|
||||
var regions = JsonConvert.DeserializeObject<List<Region>>(responseString);
|
||||
var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
|
||||
var regions = JsonConvert.DeserializeObject<List<Region>>(responseJsonString);
|
||||
|
||||
if (regions == null || !regions.Any())
|
||||
return null;
|
||||
return new List<Region>();
|
||||
else return regions;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError($"Exception Found : {ex.Message} - Ref: RegionServiceProvider.getRegionsAsync()");
|
||||
return null;
|
||||
return new List<Region>();
|
||||
}
|
||||
}
|
||||
}
|
@ -1,21 +1,25 @@
|
||||
namespace DamageAssesment.Api.SurveyResponses.Bases
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Services
|
||||
{
|
||||
public class ServiceProviderBase
|
||||
{
|
||||
protected readonly IConfiguration configuration;
|
||||
protected readonly HttpClient httpClient;
|
||||
protected private readonly ILogger<ServiceProviderBase> logger;
|
||||
protected readonly IHttpUtil httpUtil;
|
||||
protected readonly ILogger<ServiceProviderBase> logger;
|
||||
protected string ressource;
|
||||
protected string urlBase;
|
||||
protected string url;
|
||||
|
||||
|
||||
public ServiceProviderBase(IConfiguration configuration, HttpClient httpClient, ILogger<ServiceProviderBase> logger, string ressource, string urlBase)
|
||||
public ServiceProviderBase(IConfiguration configuration, IHttpUtil httpUtil, ILogger<ServiceProviderBase> logger, string ressource, string urlBase)
|
||||
{
|
||||
this.configuration = configuration;
|
||||
this.httpClient = httpClient;
|
||||
this.httpUtil = httpUtil;
|
||||
this.logger = logger;
|
||||
this.ressource = ressource;
|
||||
this.urlBase = urlBase;
|
||||
url = urlBase + ressource;
|
||||
}
|
||||
}
|
||||
}
|
@ -1,14 +1,12 @@
|
||||
using DamageAssesment.Api.SurveyResponses.Bases;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
using Newtonsoft.Json;
|
||||
using System.Reflection;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
namespace DamageAssesment.Api.SurveyResponses.Services
|
||||
{
|
||||
public class SurveyServiceProvider :ServiceProviderBase, ISurveyServiceProvider
|
||||
{
|
||||
public SurveyServiceProvider(IConfiguration configuration, HttpClient httpClient, ILogger<EmployeeServiceProvider> logger) : base(configuration, httpClient, logger, "/api/Surveys", configuration.GetValue<string>("EndPointSettings:SurveyUrlBase"))
|
||||
public SurveyServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<EmployeeServiceProvider> logger) : base(configuration, httpUtil, logger, configuration.GetValue<string>("RessourceSettings:Survey"), configuration.GetValue<string>("EndPointSettings:SurveyUrlBase"))
|
||||
{
|
||||
}
|
||||
|
||||
@ -16,20 +14,17 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
{
|
||||
try
|
||||
{
|
||||
httpClient.BaseAddress = new Uri(urlBase);
|
||||
var response = await httpClient.GetAsync(ressource);
|
||||
response.EnsureSuccessStatusCode();
|
||||
var responseString = await response.Content.ReadAsStringAsync();
|
||||
var surveys = JsonConvert.DeserializeObject<List<Survey>>(responseString);
|
||||
var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
|
||||
var surveys = JsonConvert.DeserializeObject<List<Survey>>(responseJsonString);
|
||||
|
||||
if (surveys == null || !surveys.Any())
|
||||
return null;
|
||||
return new List<Survey>();
|
||||
else return surveys;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError($"Exception Found : {ex.Message} - Ref: SurveyServiceProvider.getSurveysAsync()");
|
||||
return null;
|
||||
return new List<Survey>();
|
||||
}
|
||||
}
|
||||
|
||||
@ -37,11 +32,9 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
{
|
||||
try
|
||||
{
|
||||
httpClient.BaseAddress = new Uri(urlBase);
|
||||
var response = await httpClient.GetAsync(ressource+"/"+ surveyId);
|
||||
response.EnsureSuccessStatusCode();
|
||||
var responseString = await response.Content.ReadAsStringAsync();
|
||||
var survey = JsonConvert.DeserializeObject<Survey>(responseString);
|
||||
url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:SurveyById"), surveyId);
|
||||
var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
|
||||
var survey = JsonConvert.DeserializeObject<Survey>(responseJsonString);
|
||||
|
||||
if (survey == null )
|
||||
return null;
|
||||
@ -53,7 +46,5 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
@ -3,6 +3,30 @@
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
},
|
||||
"EndPointSettings": {
|
||||
"AnswerUrlBase": "http://localhost:5200",
|
||||
"LocationUrlBase": "http://localhost:5213",
|
||||
"RegionUrlBase": "http://localhost:5211",
|
||||
"QuestionUrlBase": "http://localhost:5133",
|
||||
"EmployeeUrlBase": "http://localhost:5135",
|
||||
"AttachmentUrlBase": "http://localhost:5243",
|
||||
"SurveyUrlBase": "http://localhost:5009"
|
||||
},
|
||||
|
||||
"RessourceSettings": {
|
||||
"Employee": "/Employees",
|
||||
"EmployeeById": "/Employees/{0}",
|
||||
"Question": "/Questions",
|
||||
"QuestionById": "/Questions/{0}",
|
||||
"SurveyQuestion": "/Questions/BySurvey/{0}",
|
||||
"Survey": "/Surveys",
|
||||
"SurveyById": "/Surveys/{0}",
|
||||
"Attachment": "/Attachments",
|
||||
"Answer": "/Answers",
|
||||
"AnswerByResponse": "/Answers/ByResponse/{0}",
|
||||
"Location": "/Locations",
|
||||
"Region": "/Regions"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,5 @@
|
||||
{
|
||||
"ConnectionStrings": {
|
||||
"DefaultConnection": "Server=(localdb)\\MSSQLLocalDB;Database=_CHANGE_ME;Trusted_Connection=True;MultipleActiveResultSets=true"
|
||||
}
|
||||
}
|
@ -0,0 +1,5 @@
|
||||
{
|
||||
"ConnectionStrings": {
|
||||
"DefaultConnection": "Server=(localdb)\\MSSQLLocalDB;Database=_CHANGE_ME;Trusted_Connection=True;MultipleActiveResultSets=true"
|
||||
}
|
||||
}
|
@ -17,6 +17,20 @@
|
||||
"EmployeeUrlBase": "http://localhost:5135",
|
||||
"AttachmentUrlBase": "http://localhost:5243",
|
||||
"SurveyUrlBase": "http://localhost:5009"
|
||||
},
|
||||
|
||||
"RessourceSettings": {
|
||||
"Employee": "/Employees",
|
||||
"EmployeeById": "/Employees/{0}",
|
||||
"Question": "/Questions",
|
||||
"QuestionById": "/Questions/{0}",
|
||||
"SurveyQuestion": "/Questions/BySurvey/{0}",
|
||||
"Survey": "/Surveys",
|
||||
"SurveyById": "/Surveys/{0}",
|
||||
"Attachment": "/Attachments",
|
||||
"Answer": "/Answers",
|
||||
"AnswerByResponse": "/Answers/ByResponse/{0}",
|
||||
"Location": "/Locations",
|
||||
"Region": "/Regions"
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user