forked from MDCPS/DamageAssessment_Backend
Merge with dev branch
This commit is contained in:
Santhosh S
@ -3,11 +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 Newtonsoft.Json;
|
||||
using System.Diagnostics;
|
||||
using System.Text;
|
||||
using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
{
|
||||
@ -44,13 +39,12 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
{
|
||||
if (!surveyResponseDbContext.SurveyResponses.Any())
|
||||
{
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 1, SurveyId = 1, EmployeeId = "Emp1", LocationId = "Loc1" });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 2, SurveyId = 1, EmployeeId = "Emp2", LocationId = "Loc2" });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 3, SurveyId = 3, EmployeeId = "Emp4", LocationId = "Loc1" });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 4, SurveyId = 4, EmployeeId = "Emp1", LocationId = "Loc2" });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 5, SurveyId = 1, EmployeeId = "Emp3", LocationId = "Loc3" });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 6, SurveyId = 1, EmployeeId = "Emp4", LocationId = "Loc2" });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 7, SurveyId = 1, EmployeeId = "Emp4", LocationId = "Loc3" });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 1, SurveyId = 1, EmployeeId = "Emp1", LocationId = "Loc1", ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "", CreatedDate = DateTime.Now });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 2, SurveyId = 1, EmployeeId = "Emp2", LocationId = "Loc2", ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "", CreatedDate = DateTime.Now });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 3, SurveyId = 3, EmployeeId = "Emp4", LocationId = "Loc1", ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "", CreatedDate = DateTime.Now });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 4, SurveyId = 4, EmployeeId = "Emp1", LocationId = "Loc2", ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "", CreatedDate = DateTime.Now });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 6, SurveyId = 1, EmployeeId = "Emp4", LocationId = "Loc2", ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "", CreatedDate = DateTime.Now });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 7, SurveyId = 1, EmployeeId = "Emp4", LocationId = "Loc3", ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "", CreatedDate = DateTime.Now });
|
||||
surveyResponseDbContext.SaveChanges();
|
||||
}
|
||||
}
|
||||
@ -214,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);
|
||||
@ -230,7 +224,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
else
|
||||
{
|
||||
return (false, null, "Not found");
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -300,6 +294,10 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
_SurveyResponse.SurveyId = SurveyResponse.SurveyId;
|
||||
_SurveyResponse.EmployeeId = SurveyResponse.EmployeeId;
|
||||
_SurveyResponse.LocationId = SurveyResponse.LocationId;
|
||||
_SurveyResponse.ClientDevice = SurveyResponse.ClientDevice;
|
||||
_SurveyResponse.KeyAnswerResult = SurveyResponse.KeyAnswerResult;
|
||||
_SurveyResponse.Longitute = SurveyResponse.Longitute;
|
||||
_SurveyResponse.Latitude = SurveyResponse.Latitude;
|
||||
await surveyResponseDbContext.SaveChangesAsync();
|
||||
return (true, mapper.Map<Db.SurveyResponse, Models.SurveyResponse>(_SurveyResponse), "Successful");
|
||||
}
|
||||
@ -340,7 +338,6 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
logger?.LogInformation($"SurveyReponseId = {Id} Not found");
|
||||
return (false, null, "Not Found");
|
||||
}
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -435,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.CategoryId, 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.Questions }).SingleOrDefault(),
|
||||
Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI }
|
||||
}
|
||||
};
|
||||
return result;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -495,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
|
||||
@ -531,6 +532,8 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
var questions = await questionServiceProvider.getQuestionsAsync();
|
||||
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
||||
|
||||
|
||||
|
||||
var result = from r in surveyResonses
|
||||
select new
|
||||
{
|
||||
@ -538,6 +541,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
|
||||
@ -641,6 +648,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
|
||||
@ -671,8 +682,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();
|
||||
@ -684,6 +693,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
|
||||
@ -714,23 +727,23 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
{
|
||||
if (answerRequest != null)
|
||||
{
|
||||
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 = answerRequest.PostedFiles });
|
||||
var attachments = attachmentServiceProvider.PostAttachmentsAsync(new AttachmentInfo { ResponseId = surveyResponseId, Answers = listAnswerInfo });
|
||||
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 = answerRequest.PostedFiles });
|
||||
var attachments = attachmentServiceProvider.PostAttachmentsAsync(new AttachmentInfo { ResponseId = surveyResponseId, Answers = listAnswerInfo });
|
||||
|
||||
string message = $"Answer for question {answerRequest.QuestionId} saved to the database";
|
||||
logger?.LogInformation(message);
|
||||
return (true);
|
||||
}
|
||||
else
|
||||
{
|
||||
string message = $"Answer for question {answerRequest.QuestionId} cannot be saved to the database";
|
||||
logger?.LogInformation(message);
|
||||
return (false);
|
||||
}
|
||||
string message = $"Answer for question {answerRequest.QuestionId} saved to the database";
|
||||
logger?.LogInformation(message);
|
||||
return (true);
|
||||
}
|
||||
else
|
||||
{
|
||||
string message = $"Answer for question {answerRequest.QuestionId} cannot be saved to the database";
|
||||
logger?.LogInformation(message);
|
||||
return (false);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -747,37 +760,12 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
{
|
||||
if (request != null)
|
||||
{
|
||||
var response = await PostSurveyResponseAsync(new Models.SurveyResponse {SurveyId = request.SurveyId, EmployeeId = request.EmployeeId, LocationId = request.LocationId });
|
||||
var response = await PostSurveyResponseAsync(new Models.SurveyResponse { SurveyId = request.SurveyId, EmployeeId = request.EmployeeId, LocationId = request.LocationId });
|
||||
|
||||
if (response.IsSuccess)
|
||||
{
|
||||
var surveyResponse = response.SurveyResponse;
|
||||
var tasks = request.Answers.Select(x => ProcessAnswers(x,surveyResponse.Id));
|
||||
|
||||
// foreach (AnswerRequest ans in request.Answers)
|
||||
// {
|
||||
// answer = new Models.Answer { QuestionId = ans.QuestionId, AnswerText = ans.AnswerText, Comment = ans.Comment, SurveyResponseId = surveyResponse.Id };
|
||||
|
||||
//var content = new StringContent(jsonObject.ToString(), Encoding.UTF8, "application/json");
|
||||
|
||||
//await Task.Delay(500);
|
||||
// var rep = await answerServiceProvider.PostAnswersAsync(answer);
|
||||
// var jsonObject = JsonConvert.SerializeObject(rep);
|
||||
//x = x + jsonObject.ToString() + " ";
|
||||
//i++;
|
||||
// answer = new Models.Answer { QuestionId = ans.QuestionId, AnswerText = ans.AnswerText, Comment = ans.Comment, SurveyResponseId = surveyResponse.Id };
|
||||
// await answerServiceProvider.PostAnswersAsync(answer);
|
||||
//ProcessAnswers(ans, surveyResponse.Id);
|
||||
//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));
|
||||
// }
|
||||
var tasks = request.Answers.Select(x => ProcessAnswers(x, surveyResponse.Id));
|
||||
await Task.WhenAll(tasks);
|
||||
return (true, surveyResponse, null);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user