forked from MDCPS/DamageAssessment_Backend
Merged new dev changes
This commit is contained in:
@ -18,12 +18,11 @@ namespace DamageAssesment.Api.Answers.Providers
|
||||
this.answerDbContext = answerDbContext;
|
||||
this.logger = logger;
|
||||
this.mapper = mapper;
|
||||
SeedData();
|
||||
//SeedData();
|
||||
}
|
||||
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersAsync()
|
||||
{
|
||||
|
||||
try
|
||||
{
|
||||
logger?.LogInformation("Query Question");
|
||||
@ -108,16 +107,17 @@ namespace DamageAssesment.Api.Answers.Providers
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> PostAnswerAsync(Db.Answer Answer)
|
||||
public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> PostAnswerAsync(Models.Answer Answer)
|
||||
{
|
||||
try
|
||||
{
|
||||
logger?.LogInformation("Query Answer");
|
||||
if (!AnswerExists(Answer.Id))
|
||||
{
|
||||
answerDbContext.Answers.Add(Answer);
|
||||
answerDbContext.SaveChanges();
|
||||
var result = mapper.Map<Db.Answer, Models.Answer>(Answer);
|
||||
Db.Answer answer = mapper.Map<Models.Answer, Db.Answer>(Answer);
|
||||
answerDbContext.Answers.Add(answer);
|
||||
await answerDbContext.SaveChangesAsync();
|
||||
var result = mapper.Map<Db.Answer, Models.Answer>(answer);
|
||||
return (true, result, null);
|
||||
}
|
||||
return (false, null, "Answer is already exits");
|
||||
@ -128,7 +128,7 @@ namespace DamageAssesment.Api.Answers.Providers
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> UpdateAnswerAsync(Db.Answer Answer)
|
||||
public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> UpdateAnswerAsync(Models.Answer Answer)
|
||||
{
|
||||
try
|
||||
{
|
||||
@ -137,9 +137,10 @@ namespace DamageAssesment.Api.Answers.Providers
|
||||
var existing = answerDbContext.Answers.AsNoTracking().FirstOrDefault(x => x.Id == Answer.Id);
|
||||
if (existing != null)
|
||||
{
|
||||
answerDbContext.Answers.Update(Answer);
|
||||
answerDbContext.SaveChanges();
|
||||
return (true, mapper.Map<Db.Answer, Models.Answer>(Answer), "Successful");
|
||||
Db.Answer answer = mapper.Map<Models.Answer, Db.Answer>(Answer);
|
||||
answerDbContext.Answers.Update(answer);
|
||||
await answerDbContext.SaveChangesAsync();
|
||||
return (true, mapper.Map<Db.Answer, Models.Answer>(answer), "Successful");
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -152,7 +153,6 @@ namespace DamageAssesment.Api.Answers.Providers
|
||||
logger?.LogInformation($"{Answer} Bad Request");
|
||||
return (false, null, "Bad request");
|
||||
}
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -187,7 +187,7 @@ namespace DamageAssesment.Api.Answers.Providers
|
||||
return answerDbContext.Answers.AsNoTracking().Count(e => e.Id == id) > 0;
|
||||
}
|
||||
|
||||
private void SeedData()
|
||||
public void SeedData()
|
||||
{
|
||||
if (!answerDbContext.Answers.Any())
|
||||
{
|
||||
@ -199,10 +199,6 @@ namespace DamageAssesment.Api.Answers.Providers
|
||||
answerDbContext.Answers.Add(new Db.Answer() { AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 });
|
||||
answerDbContext.SaveChanges();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user