santhoshsnair/DamageAssessment_Backend
1
0
Fork 0
forked from MDCPS/DamageAssessment_Backend
Code Pull Requests Activity

Conflict resolved in Questions, Surveys

Browse Source
This commit is contained in:
Reginald Cherenfant Jasmin
2023-08-25 17:51:07 -04:00
parent fe1614fee3
commit 099055d088
5 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DamageAssesmentApi/DamageAssesment.Api.Surveys/Db/SurveysDbContext.cs
View File

@ -2,13 +2,25 @@
namespace DamageAssesment.Api.Surveys.Db
{
public class SurveysDbContext:DbContext
public class SurveysDbContext : DbContext
{
public DbSet<Db.Survey> Surveys { get; set; }
public DbSet<Db.SurveyTranslation> SurveysTranslation { get; set; }
public SurveysDbContext(DbContextOptions options) : base(options)
{
}
public DbSet<Db.Survey> Surveys { get; set; }
public DbSet<Db.SurveyTranslation> SurveysTranslation { get; set; }
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
base.OnModelCreating(modelBuilder);
modelBuilder.Entity<Survey>()
.Property(item => item.Id)
.ValueGeneratedOnAdd();
modelBuilder.Entity<SurveyTranslation>()
.Property(item => item.Id)
.ValueGeneratedOnAdd();
}
}
}

18
DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs
View File

@ -60,7 +60,6 @@ namespace DamageAssesment.Api.Surveys.Providers
if (surveys != null)
{
if (string.IsNullOrEmpty(Language))
{
surveysList = from s in surveys
@ -184,17 +183,20 @@ namespace DamageAssesment.Api.Surveys.Providers
{
var surveys = await surveyDbContext.Surveys.ToListAsync();
int Id = surveys.Count + 1;
surveyDbContext.Surveys.Add(new Db.Survey { Id = Id, IsEnabled = survey.IsEnabled, StartDate = survey.StartDate, EndDate = survey.EndDate, CreatedDate = DateTime.Now });
var surveyTranslations = await surveyDbContext.SurveysTranslation.ToListAsync();
int count = surveyTranslations.Count;
Db.Survey _survey = new Db.Survey { IsEnabled = survey.IsEnabled, StartDate = survey.StartDate, EndDate = survey.EndDate, CreatedDate = DateTime.Now };
surveyDbContext.Surveys.Add(_survey);
await surveyDbContext.SaveChangesAsync();
//var surveyTranslations = await surveyDbContext.SurveysTranslation.ToListAsync();
foreach (var title in survey.Titles)
{
count++;
surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { Id = count, SurveyId = Id, Language = title.Language, Title = title.Title });
surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation {SurveyId = _survey.Id, Language = title.Language, Title = title.Title });
}
await surveyDbContext.SaveChangesAsync();
return (true, survey, "Successful");
survey.Id = _survey.Id;
return (true,survey, "Successful");
}
else
{