forked from MDCPS/DamageAssessment_Backend
Compare commits
9 Commits
docker-sql
...
local-dock
Author | SHA1 | Date | |
---|---|---|---|
adadc32a34 | |||
3b9697cb75 | |||
101ed7ee04 | |||
a2b6e078e2 | |||
dbabc10e7c | |||
2c7d4e6138 | |||
f7ccc89d53 | |||
c80749e292 | |||
6f10e99627 |
Binary file not shown.
@ -1,7 +0,0 @@
|
||||
{
|
||||
"ExpandedNodes": [
|
||||
""
|
||||
],
|
||||
"SelectedNode": "\\DamageAssesment.sln",
|
||||
"PreviewInSolutionExplorer": false
|
||||
}
|
1
DamageAssesmentApi/.gitignore
vendored
1
DamageAssesmentApi/.gitignore
vendored
@ -396,4 +396,3 @@ FodyWeavers.xsd
|
||||
|
||||
# JetBrains Rider
|
||||
*.sln.iml
|
||||
**/migrations/
|
@ -13,12 +13,7 @@
|
||||
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
|
||||
</ItemGroup>
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Answers.Db
|
||||
{
|
||||
[Table("Answers")]
|
||||
public class Answer
|
||||
{
|
||||
[Key]
|
||||
|
@ -1,19 +1,13 @@
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
|
||||
namespace DamageAssesment.Api.Answers.Db
|
||||
{
|
||||
public class AnswerDbContext:DbContext
|
||||
{
|
||||
private IConfiguration _Configuration { get; set; }
|
||||
public AnswerDbContext(DbContextOptions options,IConfiguration configuration):base(options)
|
||||
|
||||
public AnswerDbContext(DbContextOptions options):base(options)
|
||||
{
|
||||
_Configuration= configuration;
|
||||
}
|
||||
protected override void OnConfiguring(DbContextOptionsBuilder options)
|
||||
{
|
||||
// connect to sql server with connection string from app settings
|
||||
options.UseSqlServer(_Configuration.GetConnectionString("AnswerConnection"));
|
||||
|
||||
}
|
||||
public DbSet<Db.Answer> Answers { get; set; }
|
||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
||||
|
@ -8,16 +8,10 @@ var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
// Add services to the container.
|
||||
|
||||
// CORS setup to allow requests from any origin.
|
||||
builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
|
||||
build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
|
||||
}));
|
||||
|
||||
builder.Services.AddControllers();
|
||||
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
//builder.Services.AddSwaggerGen();
|
||||
// Add Swagger/OpenAPI documentation support.
|
||||
builder.Services.AddSwaggerGen(c =>
|
||||
{
|
||||
// Include XML comments from your assembly
|
||||
@ -29,28 +23,21 @@ builder.Services.AddScoped<IAnswersProvider, AnswersProvider>();
|
||||
builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
|
||||
builder.Services.AddDbContext<AnswerDbContext>(option =>
|
||||
{
|
||||
option.UseSqlServer("AnswerConnection");
|
||||
option.UseInMemoryDatabase("Answers");
|
||||
});
|
||||
|
||||
builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
|
||||
build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
|
||||
}));
|
||||
|
||||
var app = builder.Build();
|
||||
|
||||
|
||||
// Configure the HTTP request pipeline.
|
||||
if (app.Environment.IsDevelopment())
|
||||
{
|
||||
app.UseSwagger();
|
||||
app.UseSwaggerUI();
|
||||
}
|
||||
app.UseCors("DamageAppCorsPolicy");
|
||||
|
||||
app.UseAuthorization();
|
||||
|
||||
// Enable CORS, authentication, and authorization middleware.
|
||||
app.UseCors("DamageAppCorsPolicy");
|
||||
app.UseAuthorization();
|
||||
// Map controllers to their respective routes.
|
||||
app.MapControllers();
|
||||
|
||||
app.Run();
|
||||
|
@ -198,12 +198,13 @@ namespace DamageAssesment.Api.Answers.Providers
|
||||
{
|
||||
if (!answerDbContext.Answers.Any())
|
||||
{
|
||||
answerDbContext.Answers.Add(new Db.Answer() { AnswerText = "Yes", Comment = "", QuestionId = 1, SurveyResponseId = 1 });
|
||||
answerDbContext.Answers.Add(new Db.Answer() { AnswerText = "No", Comment = "myComment", QuestionId = 2, SurveyResponseId = 1 });
|
||||
//answerDbContext.Answers.Add(new Db.Answer() { AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
|
||||
//answerDbContext.Answers.Add(new Db.Answer() { AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 });
|
||||
//answerDbContext.Answers.Add(new Db.Answer() { AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 });
|
||||
//answerDbContext.Answers.Add(new Db.Answer() { AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 });
|
||||
answerDbContext.Answers.Add(new Db.Answer() { Id = 1, AnswerText = "Yes", Comment = "Comment test 4", QuestionId = 1, SurveyResponseId = 1 });
|
||||
answerDbContext.Answers.Add(new Db.Answer() { Id = 2, AnswerText = "No", Comment = "Comment test 5", QuestionId = 2, SurveyResponseId = 1 });
|
||||
// Uncomment the lines below to add more initial data if needed
|
||||
//answerDbContext.Answers.Add(new Db.Answer() { Id = 3, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
|
||||
//answerDbContext.Answers.Add(new Db.Answer() { Id = 4, AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 });
|
||||
//answerDbContext.Answers.Add(new Db.Answer() { Id = 5, AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 });
|
||||
//answerDbContext.Answers.Add(new Db.Answer() { Id = 6, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 });
|
||||
answerDbContext.SaveChanges();
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,8 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
@ -8,11 +8,5 @@
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*",
|
||||
"ConnectionStrings": {
|
||||
//"AnswerConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
|
||||
// "AnswerConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;",
|
||||
"AnswerConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
|
||||
|
||||
}
|
||||
"AllowedHosts": "*"
|
||||
}
|
||||
|
@ -0,0 +1 @@
|
||||
sample
|
@ -14,19 +14,8 @@
|
||||
<PackageReference Include="Azure.Storage.Blobs" Version="12.16.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
|
||||
</ItemGroup>
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Attachments.Db
|
||||
{
|
||||
[Table("AnswerAttachments")]
|
||||
public class Attachment
|
||||
{
|
||||
[Key]
|
||||
|
@ -1,19 +1,11 @@
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
|
||||
namespace DamageAssesment.Api.Attachments.Db
|
||||
{
|
||||
public class AttachmentsDbContext:DbContext
|
||||
{
|
||||
private IConfiguration _Configuration { get; set; }
|
||||
public AttachmentsDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
|
||||
public AttachmentsDbContext(DbContextOptions options) : base(options)
|
||||
{
|
||||
_Configuration = configuration;
|
||||
}
|
||||
protected override void OnConfiguring(DbContextOptionsBuilder options)
|
||||
{
|
||||
// connect to sql server with connection string from app settings
|
||||
options.UseSqlServer(_Configuration.GetConnectionString("AttachmentConnection"));
|
||||
}
|
||||
public DbSet<Db.Attachment> Attachments { get; set; }
|
||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
||||
|
@ -8,18 +8,12 @@ using System.Reflection;
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
// CORS setup to allow requests from any origin.
|
||||
builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
|
||||
build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
|
||||
}));
|
||||
|
||||
// Add services to the container.
|
||||
|
||||
builder.Services.AddControllers();
|
||||
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
//builder.Services.AddSwaggerGen();
|
||||
// Add Swagger/OpenAPI documentation support.
|
||||
builder.Services.AddSwaggerGen(c =>
|
||||
{
|
||||
// Include XML comments from your assembly
|
||||
@ -34,7 +28,7 @@ builder.Services.AddScoped<IAzureBlobService,AzureBlobService>();
|
||||
builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
|
||||
builder.Services.AddDbContext<AttachmentsDbContext>(option =>
|
||||
{
|
||||
option.UseSqlServer("AttachmentConnection");
|
||||
option.UseInMemoryDatabase("Attachments");
|
||||
});
|
||||
builder.Services.Configure<FormOptions>(o =>
|
||||
{
|
||||
@ -42,9 +36,6 @@ builder.Services.Configure<FormOptions>(o =>
|
||||
o.MultipartBodyLengthLimit = int.MaxValue;
|
||||
o.MemoryBufferThreshold = int.MaxValue;
|
||||
});
|
||||
builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
|
||||
build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
|
||||
}));
|
||||
|
||||
var app = builder.Build();
|
||||
|
||||
@ -55,11 +46,9 @@ if (app.Environment.IsDevelopment())
|
||||
app.UseSwaggerUI();
|
||||
}
|
||||
|
||||
// Enable CORS, authentication, and authorization middleware.
|
||||
|
||||
app.UseCors("DamageAppCorsPolicy");
|
||||
app.UseAuthorization();
|
||||
app.UseHttpsRedirection();
|
||||
|
||||
app.MapControllers();
|
||||
app.UseStaticFiles();
|
||||
app.Run();
|
||||
|
@ -25,7 +25,7 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
this.httpContextAccessor = httpContextAccessor;
|
||||
baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}";
|
||||
baseUrl = baseUrl + "/attachments/download";
|
||||
//SeedData();
|
||||
SeedData();
|
||||
}
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync()
|
||||
{
|
||||
|
@ -0,0 +1,8 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
@ -12,11 +12,5 @@
|
||||
"Fileupload": {
|
||||
"folderpath": "DMS_Attachments/Active",
|
||||
"Deletepath": "DMS_Attachments/Deleted"
|
||||
},
|
||||
"ConnectionStrings": {
|
||||
//"AttachmentConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
|
||||
// "AttachmentConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;"
|
||||
"AttachmentConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1 @@
|
||||
sample
|
@ -0,0 +1 @@
|
||||
sample
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("Doculinks")]
|
||||
public class Doculink
|
||||
{
|
||||
[Key]
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("DoculinkAttachments")]
|
||||
public class DoculinkAttachments
|
||||
{
|
||||
|
||||
|
@ -7,15 +7,8 @@ namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
public class DoculinkDbContext : DbContext
|
||||
{
|
||||
private IConfiguration _Configuration { get; set; }
|
||||
public DoculinkDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
|
||||
public DoculinkDbContext(DbContextOptions options) : base(options)
|
||||
{
|
||||
_Configuration = configuration;
|
||||
}
|
||||
protected override void OnConfiguring(DbContextOptionsBuilder options)
|
||||
{
|
||||
// connect to sql server with connection string from app settings
|
||||
options.UseSqlServer(_Configuration.GetConnectionString("DoculinConnection"));
|
||||
}
|
||||
public DbSet<Db.Doculink> Documents { get; set; }
|
||||
public DbSet<Db.LinkType> LinkTypes { get; set; }
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("DoculinkTrans")]
|
||||
public class DoculinkTranslation
|
||||
{
|
||||
[Key]
|
||||
|
@ -1,9 +1,7 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("DoculinkTypes")]
|
||||
public class LinkType
|
||||
{
|
||||
[Key]
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("DoculinkTypeTrans")]
|
||||
public class LinksTranslation
|
||||
{
|
||||
[Key]
|
||||
|
@ -7,7 +7,6 @@ namespace DamageAssesment.Api.DocuLinks.Models
|
||||
public int Id { get; set; }
|
||||
public int linkTypeId { get; set; }
|
||||
public List<DoculinkTranslation> documentsTranslations { get; set; }
|
||||
public bool IsActive { get; set; }
|
||||
public int CustomOrder { get; set; }
|
||||
public List<FileModel>? Files { get; set; }
|
||||
}
|
||||
|
@ -6,11 +6,6 @@ using System.Reflection;
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
// CORS setup to allow requests from any origin.
|
||||
builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
|
||||
build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
|
||||
}));
|
||||
|
||||
// Add services to the container.
|
||||
|
||||
builder.Services.AddControllers();
|
||||
@ -31,11 +26,8 @@ builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
|
||||
builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
|
||||
builder.Services.AddDbContext<DoculinkDbContext>(option =>
|
||||
{
|
||||
option.UseSqlServer("DoculinConnection");
|
||||
option.UseInMemoryDatabase("DocumentConnection");
|
||||
});
|
||||
builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
|
||||
build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
|
||||
}));
|
||||
var app = builder.Build();
|
||||
|
||||
// Configure the HTTP request pipeline.
|
||||
@ -45,10 +37,6 @@ if (app.Environment.IsDevelopment())
|
||||
app.UseSwaggerUI();
|
||||
}
|
||||
|
||||
|
||||
// Enable CORS, authentication, and authorization middleware.
|
||||
|
||||
app.UseCors("DamageAppCorsPolicy");
|
||||
app.UseAuthorization();
|
||||
|
||||
app.MapControllers();
|
||||
|
@ -91,8 +91,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
}
|
||||
Documents=new Models.Doculink (){ linkTypeId = documentInfo.linkTypeId,
|
||||
documentsTranslations = documentInfo.documentsTranslations,doclinksAttachments=attachments,
|
||||
IsDeleted=false,CustomOrder=documentInfo.CustomOrder, IsActive =documentInfo.IsActive
|
||||
};
|
||||
IsDeleted=false,CustomOrder=documentInfo.CustomOrder, IsActive =true};
|
||||
|
||||
return Documents;
|
||||
}
|
||||
@ -135,7 +134,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
Id = documentInfo.Id,
|
||||
linkTypeId = documentInfo.linkTypeId,
|
||||
documentsTranslations=documentInfo.documentsTranslations,
|
||||
IsActive = documentInfo.IsActive,
|
||||
IsActive = true,
|
||||
IsDeleted=false,
|
||||
CustomOrder = documentInfo.CustomOrder,
|
||||
doclinksAttachments = attachments
|
||||
|
@ -0,0 +1,8 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
@ -6,12 +6,6 @@
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*",
|
||||
"ConnectionStrings": {
|
||||
//"DoculinConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;",
|
||||
//"DoculinConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;"
|
||||
"DoculinConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
|
||||
|
||||
},
|
||||
"Fileupload": {
|
||||
"folderpath": "DASA_Documents/Active",
|
||||
"Deletepath": "DASA_Documents/Deleted"
|
||||
|
@ -12,18 +12,8 @@
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
|
||||
</ItemGroup>
|
||||
|
@ -1,9 +1,7 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Employees.Db
|
||||
{
|
||||
[Table("Employees")]
|
||||
public class Employee
|
||||
{
|
||||
[Key]
|
||||
|
@ -4,23 +4,18 @@ namespace DamageAssesment.Api.Employees.Db
|
||||
{
|
||||
public class EmployeeDbContext: DbContext
|
||||
{
|
||||
private IConfiguration _Configuration { get; set; }
|
||||
public EmployeeDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
|
||||
public DbSet<Db.Employee> Employees { get; set; }
|
||||
public EmployeeDbContext(DbContextOptions options) : base(options)
|
||||
{
|
||||
_Configuration = configuration;
|
||||
}
|
||||
protected override void OnConfiguring(DbContextOptionsBuilder options)
|
||||
{
|
||||
// connect to sql server with connection string from app settings
|
||||
options.UseSqlServer(_Configuration.GetConnectionString("EmployeeConnection"));
|
||||
}
|
||||
|
||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
||||
{
|
||||
base.OnModelCreating(modelBuilder);
|
||||
|
||||
modelBuilder.Entity<Employee>()
|
||||
.Property(item => item.Id)
|
||||
.ValueGeneratedOnAdd();
|
||||
}
|
||||
public DbSet<Db.Employee> Employees { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -6,18 +6,12 @@ using System.Reflection;
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
|
||||
// CORS setup to allow requests from any origin.
|
||||
builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
|
||||
build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
|
||||
}));
|
||||
|
||||
|
||||
// Add services to the container.
|
||||
|
||||
builder.Services.AddControllers();
|
||||
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
// Add Swagger/OpenAPI documentation support.
|
||||
//builder.Services.AddSwaggerGen();
|
||||
builder.Services.AddSwaggerGen(c =>
|
||||
{
|
||||
// Include XML comments from your assembly
|
||||
@ -30,11 +24,9 @@ builder.Services.AddScoped<IEmployeesProvider, EmployeesProvider>();
|
||||
builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
|
||||
builder.Services.AddDbContext<EmployeeDbContext>(option =>
|
||||
{
|
||||
option.UseSqlServer("EmployeeConnection");
|
||||
option.UseInMemoryDatabase("Employees");
|
||||
});
|
||||
builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
|
||||
build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
|
||||
}));
|
||||
|
||||
var app = builder.Build();
|
||||
|
||||
// Configure the HTTP request pipeline.
|
||||
@ -51,11 +43,6 @@ if (app.Environment.IsDevelopment())
|
||||
}
|
||||
}
|
||||
|
||||
app.UseCors("DamageAppCorsPolicy");
|
||||
|
||||
// Enable CORS, authentication, and authorization middleware.
|
||||
app.UseCors("DamageAppCorsPolicy");
|
||||
|
||||
app.UseAuthorization();
|
||||
|
||||
app.MapControllers();
|
||||
|
@ -0,0 +1,8 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
@ -13,11 +13,5 @@
|
||||
"endpoint1": "xxx",
|
||||
"endpoint2": "xxx",
|
||||
"endpoint3": "xxx"
|
||||
},
|
||||
"ConnectionStrings": {
|
||||
//"EmployeeConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;",
|
||||
//"EmployeeConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;"
|
||||
"EmployeeConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -11,17 +11,6 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<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" />
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Locations.Db
|
||||
{
|
||||
[Table("Locations")]
|
||||
public class Location
|
||||
{
|
||||
[Key]
|
||||
|
@ -4,16 +4,6 @@ namespace DamageAssesment.Api.Locations.Db
|
||||
{
|
||||
public class LocationDbContext : DbContext
|
||||
{
|
||||
private IConfiguration _Configuration { get; set; }
|
||||
public LocationDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
|
||||
{
|
||||
_Configuration = configuration;
|
||||
}
|
||||
protected override void OnConfiguring(DbContextOptionsBuilder options)
|
||||
{
|
||||
// connect to sql server with connection string from app settings
|
||||
options.UseSqlServer(_Configuration.GetConnectionString("LocationConnection"));
|
||||
}
|
||||
public DbSet<Db.Location> Locations { get; set; }
|
||||
public DbSet<Db.Region> Regions { get; set; }
|
||||
public LocationDbContext(DbContextOptions options) : base(options)
|
||||
|
@ -1,9 +1,7 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Locations.Db
|
||||
{
|
||||
[Table("Regions")]
|
||||
public class Region
|
||||
{
|
||||
[Key]
|
||||
|
@ -5,18 +5,13 @@ using Microsoft.EntityFrameworkCore;
|
||||
using System.Reflection;
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
// CORS setup to allow requests from any origin.
|
||||
builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
|
||||
build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
|
||||
}));
|
||||
|
||||
|
||||
// Add services to the container.
|
||||
// Add controller services and API Explorer for endpoint discovery.
|
||||
|
||||
builder.Services.AddControllers();
|
||||
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
// Add Swagger/OpenAPI documentation support.
|
||||
//builder.Services.AddSwaggerGen();
|
||||
builder.Services.AddSwaggerGen(c =>
|
||||
{
|
||||
// Include XML comments from your assembly
|
||||
@ -29,11 +24,8 @@ builder.Services.AddScoped<IRegionsProvider, RegionsProvider>();
|
||||
builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
|
||||
builder.Services.AddDbContext<LocationDbContext>(option =>
|
||||
{
|
||||
option.UseSqlServer("LocationConnection");
|
||||
option.UseInMemoryDatabase("Locations");
|
||||
});
|
||||
builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
|
||||
build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
|
||||
}));
|
||||
var app = builder.Build();
|
||||
|
||||
// Configure the HTTP request pipeline.
|
||||
@ -52,11 +44,6 @@ if (app.Environment.IsDevelopment())
|
||||
}
|
||||
}
|
||||
|
||||
app.UseCors("DamageAppCorsPolicy");
|
||||
|
||||
// Enable CORS, authentication, and authorization middleware.
|
||||
app.UseCors("DamageAppCorsPolicy");
|
||||
|
||||
app.UseAuthorization();
|
||||
|
||||
app.MapControllers();
|
||||
|
@ -0,0 +1,8 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
@ -8,11 +8,5 @@
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*",
|
||||
"ConnectionStrings": {
|
||||
//"LocationConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;",
|
||||
// "LocationConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;"
|
||||
"LocationConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
|
||||
|
||||
}
|
||||
"AllowedHosts": "*"
|
||||
}
|
||||
|
@ -1,5 +1,4 @@
|
||||
using DamageAssesment.Api.Questions.Interfaces;
|
||||
using DamageAssesment.Api.Questions.Models;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace DamageAssesment.Api.Questions.Controllers
|
||||
@ -110,26 +109,6 @@ namespace DamageAssesment.Api.Questions.Controllers
|
||||
return CreatedAtRoute("DefaultApi",questions);
|
||||
}
|
||||
/// <summary>
|
||||
/// PUT request for update a multiple question (multilingual) for survey.
|
||||
/// </summary>
|
||||
[HttpPut("questions/multiple/{surveyid}")]
|
||||
public async Task<IActionResult> CreateQuestions(int surveyid, List<Models.Question> questions)
|
||||
{
|
||||
if (questions != null)
|
||||
{
|
||||
var result = await this.questionsProvider.PutQuestionsAsync(surveyid,questions);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.Question);
|
||||
}
|
||||
if (result.ErrorMessage == "Not Found")
|
||||
return NotFound(result.ErrorMessage);
|
||||
|
||||
return BadRequest(result.ErrorMessage);
|
||||
}
|
||||
return CreatedAtRoute("DefaultApi", questions);
|
||||
}
|
||||
/// <summary>
|
||||
/// POST request for creating a new question (multilingual).
|
||||
/// </summary>
|
||||
|
||||
|
@ -11,17 +11,6 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<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" />
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.Questions.Db
|
||||
{
|
||||
[Table("QuestionCategoryTrans")]
|
||||
public class CategoryTranslation
|
||||
{
|
||||
[Key]
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Questions.Db
|
||||
{
|
||||
[Table("Questions")]
|
||||
public class Question
|
||||
{
|
||||
[Key]
|
||||
|
@ -1,10 +1,8 @@
|
||||
using System.Buffers.Text;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Questions.Db
|
||||
{
|
||||
[Table("QuestionCategories")]
|
||||
public class QuestionCategory
|
||||
{
|
||||
[Key]
|
||||
|
@ -6,16 +6,6 @@ namespace DamageAssesment.Api.Questions.Db
|
||||
{
|
||||
public class QuestionDbContext : DbContext
|
||||
{
|
||||
private IConfiguration _Configuration { get; set; }
|
||||
public QuestionDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
|
||||
{
|
||||
_Configuration = configuration;
|
||||
}
|
||||
protected override void OnConfiguring(DbContextOptionsBuilder options)
|
||||
{
|
||||
// connect to sql server with connection string from app settings
|
||||
options.UseSqlServer(_Configuration.GetConnectionString("QuestionConnection"));
|
||||
}
|
||||
public DbSet<Db.Question> Questions { get; set; }
|
||||
public DbSet<Db.QuestionType> QuestionTypes { get; set; }
|
||||
public DbSet<Db.QuestionsTranslation> QuestionsTranslations { get; set; }
|
||||
|
@ -1,9 +1,7 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Questions.Db
|
||||
{
|
||||
[Table("QuestionTypes")]
|
||||
public class QuestionType
|
||||
{
|
||||
[Key]
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Questions.Db
|
||||
{
|
||||
[Table("QuestionTrans")]
|
||||
public class QuestionsTranslation
|
||||
{
|
||||
[Key]
|
||||
|
@ -9,7 +9,6 @@ namespace DamageAssesment.Api.Questions.Interfaces
|
||||
Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int surveyId,string language);
|
||||
Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question);
|
||||
Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PostQuestionsAsync(List<Models.Question> Questions);
|
||||
Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PutQuestionsAsync(int surveyId,List<Models.Question> Questions);
|
||||
Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question);
|
||||
Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> DeleteQuestionAsync(int id);
|
||||
|
||||
|
@ -5,7 +5,6 @@
|
||||
public int CategoryId { get; set; }
|
||||
public string IconName { get; set; }
|
||||
public string IconLibrary { get; set; }
|
||||
public object CategoryNames { get; set; }
|
||||
public List<MultiLanguage> QuestionsText { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -15,14 +15,8 @@ builder.Services.AddControllers();
|
||||
builder.Services.AddScoped<IQuestionsProvider, QuestionsProvider>();
|
||||
builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
|
||||
|
||||
// CORS setup to allow requests from any origin.
|
||||
builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
|
||||
build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
|
||||
}));
|
||||
|
||||
// Add controller services and API Explorer for endpoint discovery.
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
// Add Swagger/OpenAPI documentation support.
|
||||
//builder.Services.AddSwaggerGen();
|
||||
builder.Services.AddSwaggerGen(c =>
|
||||
{
|
||||
// Include XML comments from your assembly
|
||||
@ -32,11 +26,8 @@ builder.Services.AddSwaggerGen(c =>
|
||||
});
|
||||
builder.Services.AddDbContext<QuestionDbContext>(option =>
|
||||
{
|
||||
option.UseSqlServer("QuestionConnection");
|
||||
option.UseInMemoryDatabase("Questions");
|
||||
});
|
||||
builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
|
||||
build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
|
||||
}));
|
||||
var app = builder.Build();
|
||||
|
||||
// Configure the HTTP request pipeline.
|
||||
@ -53,9 +44,6 @@ if (app.Environment.IsDevelopment())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Enable CORS, authentication, and authorization middleware.
|
||||
app.UseCors("DamageAppCorsPolicy");
|
||||
app.UseAuthorization();
|
||||
|
||||
app.MapControllers();
|
||||
|
@ -31,7 +31,8 @@ namespace DamageAssesment.Api.Questions.Providers
|
||||
questionDbContext.QuestionTypes.Add(new Db.QuestionType() { TypeText = "TextBox" });
|
||||
questionDbContext.SaveChanges();
|
||||
}
|
||||
if (!questionDbContext.QuestionsTranslations.Any())
|
||||
|
||||
if (!questionDbContext.QuestionCategories.Any())
|
||||
{
|
||||
questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Flooding", IconLibrary = "https://example.com/images/img1.png" });
|
||||
questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Electrical", IconLibrary = "https://example.com/images/img2.png" });
|
||||
@ -64,51 +65,14 @@ namespace DamageAssesment.Api.Questions.Providers
|
||||
if (!questionDbContext.Questions.Any())
|
||||
{
|
||||
var question1 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
|
||||
var question2 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 };
|
||||
var question2 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 };
|
||||
var question3 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
|
||||
var question4 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 };
|
||||
var question5 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
|
||||
var question6 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 };
|
||||
var question7 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 3};
|
||||
var question8 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 4 };
|
||||
var question9 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = true, Key = true, CategoryId = 5 };
|
||||
var question10 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = false, Key = true, CategoryId = 1 };
|
||||
var question11 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 2 };
|
||||
var question12 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 3 };
|
||||
var question13 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 4 };
|
||||
var question14 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 5 };
|
||||
var question15 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 1 };
|
||||
var question16 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 2 };
|
||||
var question17 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 3 };
|
||||
var question18 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 4 };
|
||||
var question19 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 5 };
|
||||
var question20 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 };
|
||||
var question21 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 2 };
|
||||
var question22 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 3 };
|
||||
var question4 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 };
|
||||
|
||||
questionDbContext.Questions.Add(question1);
|
||||
questionDbContext.Questions.Add(question2);
|
||||
questionDbContext.Questions.Add(question3);
|
||||
questionDbContext.Questions.Add(question4);
|
||||
questionDbContext.Questions.Add(question5);
|
||||
questionDbContext.Questions.Add(question6);
|
||||
questionDbContext.Questions.Add(question7);
|
||||
questionDbContext.Questions.Add(question8);
|
||||
questionDbContext.Questions.Add(question9);
|
||||
questionDbContext.Questions.Add(question10);
|
||||
questionDbContext.Questions.Add(question11);
|
||||
questionDbContext.Questions.Add(question12);
|
||||
questionDbContext.Questions.Add(question13);
|
||||
questionDbContext.Questions.Add(question14);
|
||||
questionDbContext.Questions.Add(question15);
|
||||
questionDbContext.Questions.Add(question16);
|
||||
questionDbContext.Questions.Add(question17);
|
||||
questionDbContext.Questions.Add(question18);
|
||||
questionDbContext.Questions.Add(question19);
|
||||
questionDbContext.Questions.Add(question20);
|
||||
questionDbContext.Questions.Add(question21);
|
||||
questionDbContext.Questions.Add(question22);
|
||||
|
||||
questionDbContext.SaveChanges();
|
||||
}
|
||||
|
||||
@ -126,64 +90,6 @@ namespace DamageAssesment.Api.Questions.Providers
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Are the grounds flooded ?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "¿Están inundados los terrenos?", Language = "es" });
|
||||
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "Can you open?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "Is debris blocking access?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "Are the grounds flooded?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "Is the access blocked by flooding?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "Are any utility wires down?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "Do you have damage to windows, doors, or walls?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "Do you have roof damage?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "Do you have major water intrusion?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "Are any portable classrooms damaged and unusable?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "Does your facility need to be secured/boarded?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "Are you without commercial power?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "Are you without water pressure?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "Are you without telephones?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "Are traffic signals damaged/missing?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "Are you without an operable fire alarm?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "Are you without an operable public address?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "Do you have major debris?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "Are there any problems or issues not addressed above that would impede you from opening? If yes, please explain below?", Language = "en" });
|
||||
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "Pouvez-vous ouvrir ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "Est-ce que des débris bloquent l'accès ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "L'accès est-il bloqué par des inondations ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "Des câbles d'utilité sont-ils tombés ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "Avez-vous des dommages aux fenêtres, portes ou murs ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "Avez-vous des dommages au toit ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "Avez-vous une intrusion d'eau majeure ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "Les salles de classe portables sont-elles endommagées et inutilisables ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "Votre établissement a-t-il besoin d'être sécurisé/protégé ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "Êtes-vous sans alimentation électrique commerciale ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "Êtes-vous sans pression d'eau ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "Êtes-vous sans téléphones ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "Les feux de circulation sont-ils endommagés/absents ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "N'avez-vous pas d'alarme incendie fonctionnelle ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "N'avez-vous pas de système de sonorisation opérationnel ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "Avez-vous une grande quantité de débris ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "Y a-t-il des problèmes ou des problèmes non abordés ci-dessus qui vous empêcheraient d'ouvrir ? Si oui, veuillez expliquer ci-dessous.", Language = "fr" });
|
||||
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "¿Puedes abrir ?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "¿Los escombros bloquean el acceso?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "¿Están inundados los terrenos?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "¿Hay cables de utilidad caídos?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "¿Tienes daños en ventanas, puertas o paredes?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "¿Tienes daños en el techo?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "¿Tienes una gran intrusión de agua?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "¿Hay aulas portátiles dañadas e inutilizables?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "¿Tu instalación necesita ser asegurada/tabicada?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "¿No tienes energía comercial?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "¿No tienes presión de agua?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "¿No tienes teléfonos?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "¿Los semáforos están dañados/faltan?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "¿No tienes una alarma de incendios operativa?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "¿No tienes un sistema de megafonía operativo?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "¿Tienes una gran cantidad de escombros?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "¿Hay algún problema o asunto no abordado anteriormente que le impida abrir? Si es así, por favor explíquelo a continuación.", Language = "es" });
|
||||
|
||||
questionDbContext.SaveChanges();
|
||||
}
|
||||
}
|
||||
@ -313,7 +219,6 @@ namespace DamageAssesment.Api.Questions.Providers
|
||||
CategoryId = item.Id,
|
||||
IconLibrary = item.IconLibrary,
|
||||
IconName = item.IconName,
|
||||
CategoryNames= CreateCategoryMultiLanguageObject(GetCategoryTranslations(item.Id, language)),
|
||||
QuestionsText = GetSurveyQuestion(mapper.Map<List<Db.Question>, List<Models.MultiLanguage>>(questions.Where(a => a.CategoryId == item.Id).ToList()), language)
|
||||
});
|
||||
}
|
||||
@ -376,36 +281,6 @@ namespace DamageAssesment.Api.Questions.Providers
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PutQuestionsAsync(int surveyId, List<Models.Question> Questions)
|
||||
{
|
||||
try
|
||||
{
|
||||
var questions=await questionDbContext.Questions.AsNoTracking().Where(a=>a.SurveyId == surveyId).ToListAsync();
|
||||
if (questions != null)
|
||||
{
|
||||
List<int> questionids=questions.Select(a=>a.Id).ToList();
|
||||
var questiontrans = await questionDbContext.QuestionsTranslations.AsNoTracking().Where(x => questionids.Contains(x.QuestionId)).ToListAsync();
|
||||
if (questiontrans != null)
|
||||
questionDbContext.QuestionsTranslations.RemoveRange(questiontrans);
|
||||
questionDbContext.Questions.RemoveRange(questions);
|
||||
questionDbContext.SaveChanges();
|
||||
}
|
||||
List<Models.MultiLanguage> results = new List<MultiLanguage>();
|
||||
logger?.LogInformation("Query Question");
|
||||
foreach (Models.Question Question in Questions)
|
||||
{
|
||||
Question.SurveyId = surveyId;
|
||||
results.Add(InsertQuestion(Question));
|
||||
}
|
||||
return (true, results, null);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError(ex.ToString());
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
public async Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question)
|
||||
{
|
||||
try
|
||||
@ -439,11 +314,8 @@ namespace DamageAssesment.Api.Questions.Providers
|
||||
|
||||
if (question != null)
|
||||
{
|
||||
var questiontrans=await questionDbContext.QuestionsTranslations.AsNoTracking().Where(x=>x.QuestionId== id).ToListAsync();
|
||||
var result = mapper.Map<Db.Question, Models.MultiLanguage>(question);
|
||||
result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
|
||||
if(questiontrans!=null)
|
||||
questionDbContext.QuestionsTranslations.RemoveRange(questiontrans);
|
||||
questionDbContext.Questions.Remove(question);
|
||||
questionDbContext.SaveChanges();
|
||||
return (true, result, $"QuestionID {id} deleted Successfuly");
|
||||
|
@ -0,0 +1,8 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
@ -8,11 +8,5 @@
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*",
|
||||
"ConnectionStrings": {
|
||||
//"QuestionConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
|
||||
// "QuestionConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;"
|
||||
"QuestionConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
|
||||
|
||||
}
|
||||
"AllowedHosts": "*"
|
||||
}
|
||||
|
@ -10,7 +10,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
|
||||
<PackageReference Include="Moq" Version="4.18.4" />
|
||||
<PackageReference Include="xunit" Version="2.4.2" />
|
||||
|
@ -11,21 +11,7 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
|
||||
<PackageReference Include="ClosedXML" Version="0.102.1" />
|
||||
<PackageReference Include="EPPlus" Version="6.2.10" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.9" />
|
||||
<PackageReference Include="EPPlus" Version="7.0.0" />
|
||||
<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" />
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Db
|
||||
{
|
||||
[Table("SurveyResponses")]
|
||||
public class SurveyResponse
|
||||
{
|
||||
[Key]
|
||||
|
@ -4,18 +4,13 @@ namespace DamageAssesment.Api.Responses.Db
|
||||
{
|
||||
public class SurveyResponseDbContext:DbContext
|
||||
{
|
||||
private IConfiguration _Configuration { get; set; }
|
||||
public SurveyResponseDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
|
||||
{
|
||||
_Configuration = configuration;
|
||||
}
|
||||
protected override void OnConfiguring(DbContextOptionsBuilder options)
|
||||
{
|
||||
// connect to sql server with connection string from app settings
|
||||
options.UseSqlServer(_Configuration.GetConnectionString("ResponsesConnection"));
|
||||
}
|
||||
public DbSet<Db.SurveyResponse> SurveyResponses { get; set; }
|
||||
|
||||
public SurveyResponseDbContext(DbContextOptions options) : base(options)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
||||
{
|
||||
base.OnModelCreating(modelBuilder);
|
||||
|
@ -16,10 +16,6 @@ const int intervalForCircuitBraker = 5; //5 seconds
|
||||
// Add services to the container.
|
||||
|
||||
builder.Services.AddControllers();
|
||||
// CORS setup to allow requests from any origin.
|
||||
builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
|
||||
build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
|
||||
}));
|
||||
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
|
||||
|
||||
builder.Services.AddScoped<ISurveysResponse, SurveyResponsesProvider>();
|
||||
@ -40,7 +36,6 @@ builder.Services.AddHttpClient<IHttpUtil, HttpUtil>().
|
||||
builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
//builder.Services.AddSwaggerGen();
|
||||
// Add Swagger/OpenAPI documentation support.
|
||||
builder.Services.AddSwaggerGen(c =>
|
||||
{
|
||||
// Include XML comments from your assembly
|
||||
@ -50,11 +45,8 @@ builder.Services.AddSwaggerGen(c =>
|
||||
});
|
||||
builder.Services.AddDbContext<SurveyResponseDbContext>(option =>
|
||||
{
|
||||
option.UseSqlServer("ResponsesConnection");
|
||||
option.UseInMemoryDatabase("Responses");
|
||||
});
|
||||
builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
|
||||
build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
|
||||
}));
|
||||
var app = builder.Build();
|
||||
|
||||
// Configure the HTTP request pipeline.
|
||||
@ -64,7 +56,6 @@ if (app.Environment.IsDevelopment())
|
||||
app.UseSwaggerUI();
|
||||
}
|
||||
|
||||
app.UseCors("DamageAppCorsPolicy");
|
||||
app.UseAuthorization();
|
||||
|
||||
app.MapControllers();
|
||||
|
@ -1,16 +1,16 @@
|
||||
using ClosedXML.Excel;
|
||||
using DamageAssesment.Api.Responses.Interfaces;
|
||||
using DamageAssesment.Api.Responses.Interfaces;
|
||||
using DamageAssesment.Api.Responses.Models;
|
||||
using OfficeOpenXml;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Providers
|
||||
{
|
||||
public class ExcelExportService: IExcelExportService
|
||||
public class ExcelExportService : IExcelExportService
|
||||
{
|
||||
public byte[] ExportToExcel<T1>(List<object> responses)
|
||||
{
|
||||
ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
|
||||
ExcelPackage.LicenseContext = OfficeOpenXml.LicenseContext.NonCommercial;
|
||||
using (var package = new ExcelPackage())
|
||||
{
|
||||
// Create the first worksheet and populate it with responses
|
||||
@ -29,7 +29,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
for (int col = 1; col <= properties.Length; col++)
|
||||
{
|
||||
worksheet.Cells[1, col].Value = properties[col - 1].Name;
|
||||
if(properties[col - 1].Name.ToLower().Contains("attachment"))
|
||||
if (properties[col - 1].Name.ToLower().Contains("attachment"))
|
||||
IsAttchments.Add(col);
|
||||
}
|
||||
|
||||
@ -39,7 +39,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
for (int col = 1; col <= properties.Length; col++)
|
||||
{
|
||||
|
||||
string value = Convert.ToString(properties[col - 1].GetValue(data[row - 2]));
|
||||
string value = Convert.ToString(properties[col - 1].GetValue(data[row - 2]));
|
||||
if (IsAttchments.Where(a => a == col).Count() > 0 && !string.IsNullOrEmpty(value))
|
||||
{
|
||||
List<string> attachments = value.Split("##").ToList();
|
||||
|
@ -56,20 +56,16 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
try
|
||||
{
|
||||
logger?.LogInformation("Querying to get SurveyResponse object from DB");
|
||||
List<Db.SurveyResponse> listSurveyResponse = null;
|
||||
IQueryable<Db.SurveyResponse> listSurveyResponse = null;
|
||||
if (employeeid == 0)
|
||||
{
|
||||
listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId).ToList();
|
||||
listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId);
|
||||
}
|
||||
else
|
||||
{
|
||||
listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId && s.EmployeeId == employeeid).ToList();
|
||||
listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId && s.EmployeeId == employeeid);
|
||||
}
|
||||
listSurveyResponse = listSurveyResponse
|
||||
.OrderByDescending(obj => obj.Id)
|
||||
.GroupBy(obj => new { obj.SurveyId, obj.LocationId })//obj.EmployeeId,
|
||||
.Select(group => group.FirstOrDefault()) // or .FirstOrDefault() if you want to handle empty groups
|
||||
.ToList();
|
||||
|
||||
if (listSurveyResponse.Any())
|
||||
{
|
||||
var answers = await getAnswersByRegionAndSurveyIdAsync(listSurveyResponse);
|
||||
@ -421,13 +417,14 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
}
|
||||
|
||||
//Method to get Answers by region with surveyId as input parameter
|
||||
private async Task<dynamic> getAnswersByRegionAndSurveyIdAsync(List<Db.SurveyResponse> surveyResponses)
|
||||
private async Task<dynamic> getAnswersByRegionAndSurveyIdAsync(IQueryable<Db.SurveyResponse> surveyResponses)
|
||||
{
|
||||
try
|
||||
{
|
||||
var answersList = await answerServiceProvider.getAnswersAsync();
|
||||
if (answersList == null || !answersList.Any())
|
||||
return null;
|
||||
|
||||
//get all the answers for the particular survey
|
||||
var surveyAnswers = answersList.Join(
|
||||
surveyResponses,
|
||||
@ -568,11 +565,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid).ToListAsync();
|
||||
employee = await employeeServiceProvider.getEmployeeAsync(employeeid);
|
||||
}
|
||||
surveyResonses = surveyResonses
|
||||
.OrderByDescending(obj => obj.Id)
|
||||
.GroupBy(obj => new { obj.SurveyId, obj.LocationId })//obj.EmployeeId,
|
||||
.Select(group => group.FirstOrDefault()) // or .FirstOrDefault() if you want to handle empty groups
|
||||
.ToList();
|
||||
|
||||
var answers = await answerServiceProvider.getAnswersAsync();
|
||||
var questions = await questionServiceProvider.getQuestionsAsync(null);
|
||||
var Locations = await locationServiceProvider.getLocationsAsync();
|
||||
@ -593,18 +586,18 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
r.LocationId,
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
// r.KeyAnswerResult,
|
||||
r.KeyAnswerResult,
|
||||
loc.DataValue,
|
||||
loc.Enrollment,
|
||||
loc.Longitute,
|
||||
loc.Latitude,
|
||||
// Employee = (from e in employees where e.Id == r.EmployeeId select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
|
||||
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
|
||||
select new
|
||||
{
|
||||
ans.Id,
|
||||
// ans.QuestionId,
|
||||
ans.QuestionId,
|
||||
ans.AnswerText,
|
||||
ans.Comment,
|
||||
Questions = (from q in surveyQuestions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
|
||||
@ -630,18 +623,18 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
r.LocationId,
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
// r.KeyAnswerResult,
|
||||
r.KeyAnswerResult,
|
||||
loc.DataValue,
|
||||
loc.Enrollment,
|
||||
loc.Longitute,
|
||||
loc.Latitude,
|
||||
// Employee = _employee,
|
||||
Employee = _employee,
|
||||
answers = from ans in answers
|
||||
where ans.SurveyResponseId == r.Id
|
||||
select new
|
||||
{
|
||||
ans.Id,
|
||||
// ans.QuestionId,
|
||||
ans.QuestionId,
|
||||
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(),
|
||||
@ -700,18 +693,18 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
r.LocationId,
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
// r.KeyAnswerResult,
|
||||
r.KeyAnswerResult,
|
||||
loc.DataValue,
|
||||
loc.Enrollment,
|
||||
loc.Longitute,
|
||||
loc.Latitude,
|
||||
// Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
|
||||
Employee = employeeid != 0 ? _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
|
||||
select new
|
||||
{
|
||||
ans.Id,
|
||||
// ans.QuestionId,
|
||||
ans.QuestionId,
|
||||
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(),
|
||||
@ -952,11 +945,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
_employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
|
||||
}
|
||||
}
|
||||
surveyResonses = surveyResonses
|
||||
.OrderByDescending(obj => obj.Id)
|
||||
.GroupBy(obj => new { obj.SurveyId, obj.LocationId }) //obj.EmployeeId,
|
||||
.Select(group => group.FirstOrDefault()) // or .FirstOrDefault() if you want to handle empty groups
|
||||
.ToList();
|
||||
|
||||
var answers = await answerServiceProvider.getAnswersAsync();
|
||||
var questions = await questionServiceProvider.getQuestionsAsync(null);
|
||||
var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
|
||||
@ -972,18 +961,18 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
r.LocationId,
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
// r.KeyAnswerResult,
|
||||
r.KeyAnswerResult,
|
||||
loc.DataValue,
|
||||
loc.Enrollment,
|
||||
loc.Longitute,
|
||||
loc.Latitude,
|
||||
// Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
|
||||
Employee = employeeid != 0 ? _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
|
||||
|
||||
select new
|
||||
{
|
||||
// ans.QuestionId,
|
||||
ans.QuestionId,
|
||||
ans.Id,
|
||||
ans.AnswerText,
|
||||
ans.Comment,
|
||||
@ -1027,11 +1016,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
_employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
|
||||
}
|
||||
}
|
||||
surveyResponses = surveyResponses
|
||||
.OrderByDescending(obj => obj.Id)
|
||||
.GroupBy(obj => new { obj.SurveyId, obj.LocationId })//, obj.EmployeeId
|
||||
.Select(group => group.FirstOrDefault()) // or .FirstOrDefault() if you want to handle empty groups
|
||||
.ToList();
|
||||
|
||||
//var surveyResponses = await surveyResponseDbContext.Responses.Where(x => x.SurveyId == survey.Id).ToListAsync();
|
||||
// var employees = await employeeServiceProvider.getEmployeesAsync();
|
||||
var answers = await answerServiceProvider.getAnswersAsync();
|
||||
@ -1046,12 +1031,12 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
r.LocationId,
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
// r.KeyAnswerResult,
|
||||
r.KeyAnswerResult,
|
||||
loc.DataValue,
|
||||
loc.Enrollment,
|
||||
loc.Longitute,
|
||||
loc.Latitude,
|
||||
// Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
|
||||
Employee = employeeid != 0 ? _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
|
||||
&& ans.QuestionId == question.Id
|
||||
@ -1059,7 +1044,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
|
||||
select new
|
||||
{
|
||||
// ans.QuestionId,
|
||||
ans.QuestionId,
|
||||
AnswerId = ans.Id,
|
||||
ans.AnswerText,
|
||||
ans.Comment,
|
||||
|
@ -25,7 +25,6 @@
|
||||
"AttachmentUrlBase": "http://damageassesment.api.attachments:80",
|
||||
"SurveyUrlBase": "http://damageassesment.api.surveys:80"
|
||||
},
|
||||
|
||||
"RessourceSettings": {
|
||||
"Employee": "/employees",
|
||||
"EmployeeById": "/employees/{0}",
|
||||
@ -40,10 +39,5 @@
|
||||
"AnswerByResponse": "/answers/byresponse/{0}",
|
||||
"Location": "/locations",
|
||||
"Region": "/regions"
|
||||
},
|
||||
"ConnectionStrings": {
|
||||
//"SurveyResponseConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
|
||||
//"ResponsesConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
|
||||
"ResponsesConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
|
||||
}
|
||||
}
|
||||
|
@ -1,55 +0,0 @@
|
||||
// <auto-generated />
|
||||
using DamageAssesment.Api.SurveyResponses.Db;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Metadata;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Migrations
|
||||
{
|
||||
[DbContext(typeof(SurveyResponseDbContext))]
|
||||
[Migration("20230817221348_InitialSurveyResponse")]
|
||||
partial class InitialSurveyResponse
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||
{
|
||||
#pragma warning disable 612, 618
|
||||
modelBuilder
|
||||
.HasAnnotation("ProductVersion", "7.0.9")
|
||||
.HasAnnotation("Relational:MaxIdentifierLength", 128);
|
||||
|
||||
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
|
||||
|
||||
modelBuilder.Entity("DamageAssesment.Api.SurveyResponses.Db.SurveyResponse", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<string>("EmployeeId")
|
||||
.IsRequired()
|
||||
.HasMaxLength(6)
|
||||
.HasColumnType("nvarchar(6)");
|
||||
|
||||
b.Property<string>("LocationId")
|
||||
.IsRequired()
|
||||
.HasMaxLength(4)
|
||||
.HasColumnType("nvarchar(4)");
|
||||
|
||||
b.Property<int>("SurveyId")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("SurveyResponses");
|
||||
});
|
||||
#pragma warning restore 612, 618
|
||||
}
|
||||
}
|
||||
}
|
@ -1,36 +0,0 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class InitialSurveyResponse : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.CreateTable(
|
||||
name: "SurveyResponses",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<int>(type: "int", nullable: false)
|
||||
.Annotation("SqlServer:Identity", "1, 1"),
|
||||
SurveyId = table.Column<int>(type: "int", nullable: false),
|
||||
LocationId = table.Column<string>(type: "nvarchar(4)", maxLength: 4, nullable: false),
|
||||
EmployeeId = table.Column<string>(type: "nvarchar(6)", maxLength: 6, nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_SurveyResponses", x => x.Id);
|
||||
});
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropTable(
|
||||
name: "SurveyResponses");
|
||||
}
|
||||
}
|
||||
}
|
@ -1,52 +0,0 @@
|
||||
// <auto-generated />
|
||||
using DamageAssesment.Api.SurveyResponses.Db;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Metadata;
|
||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Migrations
|
||||
{
|
||||
[DbContext(typeof(SurveyResponseDbContext))]
|
||||
partial class SurveyResponseDbContextModelSnapshot : ModelSnapshot
|
||||
{
|
||||
protected override void BuildModel(ModelBuilder modelBuilder)
|
||||
{
|
||||
#pragma warning disable 612, 618
|
||||
modelBuilder
|
||||
.HasAnnotation("ProductVersion", "7.0.9")
|
||||
.HasAnnotation("Relational:MaxIdentifierLength", 128);
|
||||
|
||||
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
|
||||
|
||||
modelBuilder.Entity("DamageAssesment.Api.SurveyResponses.Db.SurveyResponse", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<string>("EmployeeId")
|
||||
.IsRequired()
|
||||
.HasMaxLength(6)
|
||||
.HasColumnType("nvarchar(6)");
|
||||
|
||||
b.Property<string>("LocationId")
|
||||
.IsRequired()
|
||||
.HasMaxLength(4)
|
||||
.HasColumnType("nvarchar(4)");
|
||||
|
||||
b.Property<int>("SurveyId")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("SurveyResponses");
|
||||
});
|
||||
#pragma warning restore 612, 618
|
||||
}
|
||||
}
|
||||
}
|
@ -34,55 +34,7 @@ namespace DamageAssesment.Api.Surveys.Test
|
||||
|
||||
Assert.Equal(204, result.StatusCode);
|
||||
}
|
||||
[Fact(DisplayName = "Get active Surveys - Ok case")]
|
||||
public async Task GetActiveSurveysAsync_ShouldReturnStatusCode200()
|
||||
{
|
||||
var mockSurveyService = new Mock<ISurveyProvider>();
|
||||
var mockResponse = await MockData.getOkResponse();
|
||||
mockSurveyService.Setup(service => service.GetActiveSurveysAsync(true,null)).ReturnsAsync(mockResponse);
|
||||
|
||||
var surveyProvider = new SurveysController(mockSurveyService.Object);
|
||||
var result = (OkObjectResult)await surveyProvider.GetActiveSurveysAsync(null);
|
||||
|
||||
Assert.Equal(200, result.StatusCode);
|
||||
}
|
||||
|
||||
[Fact(DisplayName = "Get active Surveys - NoContent Case")]
|
||||
public async Task GetActiveSurveysAsync_ShouldReturnStatusCode204()
|
||||
{
|
||||
var mockSurveyService = new Mock<ISurveyProvider>();
|
||||
var mockResponse = await MockData.getNoContentResponse();
|
||||
mockSurveyService.Setup(service => service.GetActiveSurveysAsync(true,null)).ReturnsAsync(mockResponse);
|
||||
|
||||
var surveyProvider = new SurveysController(mockSurveyService.Object);
|
||||
var result = (NoContentResult)await surveyProvider.GetActiveSurveysAsync(null);
|
||||
|
||||
Assert.Equal(204, result.StatusCode);
|
||||
}
|
||||
[Fact(DisplayName = "Get inactive Surveys - Ok case")]
|
||||
public async Task GetInActiveSurveysAsync_ShouldReturnStatusCode200()
|
||||
{
|
||||
var mockSurveyService = new Mock<ISurveyProvider>();
|
||||
var mockResponse = await MockData.getOkResponse();
|
||||
mockSurveyService.Setup(service => service.GetActiveSurveysAsync(false, null)).ReturnsAsync(mockResponse);
|
||||
|
||||
var surveyProvider = new SurveysController(mockSurveyService.Object);
|
||||
var result = (OkObjectResult)await surveyProvider.GetInActiveSurveysAsync(null);
|
||||
|
||||
Assert.Equal(200, result.StatusCode);
|
||||
}
|
||||
[Fact(DisplayName = "Get in active Surveys - NoContent Case")]
|
||||
public async Task GetInActiveSurveysAsync_ShouldReturnStatusCode204()
|
||||
{
|
||||
var mockSurveyService = new Mock<ISurveyProvider>();
|
||||
var mockResponse = await MockData.getNoContentResponse();
|
||||
mockSurveyService.Setup(service => service.GetActiveSurveysAsync(false, null)).ReturnsAsync(mockResponse);
|
||||
|
||||
var surveyProvider = new SurveysController(mockSurveyService.Object);
|
||||
var result = (NoContentResult)await surveyProvider.GetInActiveSurveysAsync(null);
|
||||
|
||||
Assert.Equal(204, result.StatusCode);
|
||||
}
|
||||
[Fact(DisplayName = "Get Survey by Id - Ok case")]
|
||||
public async Task GetSurveyAsync_ShouldReturnStatusCode200()
|
||||
{
|
||||
|
@ -27,36 +27,7 @@ namespace DamageAssesment.Api.Surveys.Controllers
|
||||
}
|
||||
return NoContent();
|
||||
}
|
||||
/// <summary>
|
||||
/// GET request for retrieving all active surveys.
|
||||
/// </summary>
|
||||
[Route("surveys/active")]
|
||||
[Route("surveys/active/{language:alpha}")]
|
||||
[HttpGet]
|
||||
public async Task<ActionResult> GetActiveSurveysAsync(string? language)
|
||||
{
|
||||
var result = await this.surveyProvider.GetActiveSurveysAsync(true,language);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.Surveys);
|
||||
}
|
||||
return NoContent();
|
||||
}
|
||||
/// <summary>
|
||||
/// GET request for retrieving all inactive surveys.
|
||||
/// </summary>
|
||||
[Route("surveys/inactive")]
|
||||
[Route("surveys/inactive/{language:alpha}")]
|
||||
[HttpGet]
|
||||
public async Task<ActionResult> GetInActiveSurveysAsync(string? language)
|
||||
{
|
||||
var result = await this.surveyProvider.GetActiveSurveysAsync(false, language);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.Surveys);
|
||||
}
|
||||
return NoContent();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// GET request for retrieving surveys by ID.
|
||||
/// </summary>
|
||||
|
@ -11,17 +11,6 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<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" />
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.Surveys.Db
|
||||
{
|
||||
[Table("SurveyTrans")]
|
||||
public class SurveyTranslation
|
||||
{
|
||||
[Key]
|
||||
|
@ -4,18 +4,11 @@ namespace DamageAssesment.Api.Surveys.Db
|
||||
{
|
||||
public class SurveysDbContext : DbContext
|
||||
{
|
||||
private IConfiguration _Configuration { get; set; }
|
||||
public SurveysDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
|
||||
{
|
||||
_Configuration = configuration;
|
||||
}
|
||||
|
||||
public DbSet<Db.Survey> Surveys { get; set; }
|
||||
public DbSet<Db.SurveyTranslation> SurveysTranslation { get; set; }
|
||||
protected override void OnConfiguring(DbContextOptionsBuilder options)
|
||||
public SurveysDbContext(DbContextOptions options) : base(options)
|
||||
{
|
||||
// connect to sql server with connection string from app settings
|
||||
options.UseSqlServer(_Configuration.GetConnectionString("SurveyConnection"));
|
||||
|
||||
}
|
||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
||||
{
|
||||
|
@ -3,7 +3,6 @@
|
||||
public interface ISurveyProvider
|
||||
{
|
||||
Task<(bool IsSuccess, IEnumerable< Models.MultiLanSurvey> Surveys, string ErrorMessage)> GetSurveysAsync(string language);
|
||||
Task<(bool IsSuccess, IEnumerable<Models.MultiLanSurvey> Surveys, string ErrorMessage)> GetActiveSurveysAsync(bool IsActive,string language);
|
||||
Task<(bool IsSuccess, Models.MultiLanSurvey Surveys, string ErrorMessage)> GetSurveysAsync(int id, string language);
|
||||
Task<(bool IsSuccess, Models.MultiLanSurvey Survey, string ErrorMessage)> PostSurveyAsync(Models.Survey Survey);
|
||||
Task<(bool IsSuccess, Models.MultiLanSurvey Survey, string ErrorMessage)> PutSurveyAsync(int id, Models.Survey Survey);
|
||||
|
@ -10,11 +10,7 @@ using System.Reflection;
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
// Add services to the container.
|
||||
|
||||
// Retrieve the security key for JWT token validation.
|
||||
var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
|
||||
|
||||
// Configure JWT authentication and validation.
|
||||
builder.Services.AddAuthentication(item =>
|
||||
{
|
||||
item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
|
||||
@ -33,21 +29,12 @@ builder.Services.AddAuthentication(item =>
|
||||
};
|
||||
});
|
||||
|
||||
//CORS setup to allow requests from any origin.
|
||||
builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
|
||||
build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
|
||||
}));
|
||||
|
||||
|
||||
|
||||
// Add controller services and API Explorer for endpoint discovery.
|
||||
builder.Services.AddControllers();
|
||||
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
|
||||
builder.Services.AddScoped<ISurveyProvider, SurveysProvider>();
|
||||
builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
|
||||
// Add Swagger/OpenAPI documentation support.
|
||||
//builder.Services.AddSwaggerGen();
|
||||
builder.Services.AddSwaggerGen(c =>
|
||||
{
|
||||
// Include XML comments from your assembly
|
||||
@ -55,13 +42,10 @@ builder.Services.AddSwaggerGen(c =>
|
||||
var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
|
||||
c.IncludeXmlComments(xmlPath);
|
||||
});
|
||||
|
||||
// Configure the database context for SurveysDbContext using SQL Server.
|
||||
builder.Services.AddDbContext<SurveysDbContext>(option =>
|
||||
{
|
||||
option.UseSqlServer("SurveyConnection");
|
||||
option.UseInMemoryDatabase("Surveys");
|
||||
});
|
||||
|
||||
var app = builder.Build();
|
||||
|
||||
// Configure the HTTP request pipeline.
|
||||
@ -69,7 +53,7 @@ if (app.Environment.IsDevelopment())
|
||||
{
|
||||
app.UseSwagger();
|
||||
app.UseSwaggerUI();
|
||||
// Seed initial data in the database when in development mode
|
||||
|
||||
using (var serviceScope = app.Services.CreateScope())
|
||||
{
|
||||
var services = serviceScope.ServiceProvider;
|
||||
@ -77,11 +61,10 @@ if (app.Environment.IsDevelopment())
|
||||
surveyProvider.seedData();
|
||||
}
|
||||
}
|
||||
// Enable CORS, authentication, and authorization middleware.
|
||||
app.UseCors("DamageAppCorsPolicy");
|
||||
|
||||
app.UseAuthentication();
|
||||
app.UseAuthorization();
|
||||
// Map controllers to their respective routes.
|
||||
|
||||
app.MapControllers();
|
||||
|
||||
app.Run();
|
||||
|
@ -85,7 +85,7 @@ namespace DamageAssesment.Api.Surveys.Providers
|
||||
MultiLanguage = dict;
|
||||
return MultiLanguage;
|
||||
}
|
||||
public string GetStatus(DateTime? StartDate,DateTime? EndDate)
|
||||
public string GetStatus(DateTime? StartDate, DateTime? EndDate)
|
||||
{
|
||||
try
|
||||
{
|
||||
@ -101,43 +101,6 @@ namespace DamageAssesment.Api.Surveys.Providers
|
||||
return SurveyStatus.INACTIVE.ToString();
|
||||
}
|
||||
}
|
||||
|
||||
// Method to get surveys asynchronously with multi-language support
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanSurvey> Surveys, string ErrorMessage)> GetActiveSurveysAsync(bool IsActive,string language)
|
||||
{
|
||||
IEnumerable<Models.MultiLanSurvey> surveysList = null;
|
||||
try
|
||||
{
|
||||
string status = SurveyStatus.ACTIVE.ToString();
|
||||
if(!IsActive) status = SurveyStatus.INACTIVE.ToString();
|
||||
logger?.LogInformation("Get all Surveys from DB");
|
||||
//checking is enabled in survey response
|
||||
var surveys = await surveyDbContext.Surveys.ToListAsync();//Where(s => s.IsEnabled == true)
|
||||
|
||||
if (surveys != null)
|
||||
{
|
||||
surveysList = from s in surveys
|
||||
select new Models.MultiLanSurvey
|
||||
{
|
||||
Id = s.Id,
|
||||
StartDate = s.StartDate,
|
||||
EndDate = s.EndDate,
|
||||
IsEnabled = s.IsEnabled,
|
||||
CreatedDate = s.CreatedDate,
|
||||
Status = GetStatus(s.StartDate, s.EndDate),
|
||||
Titles = CreateMultiLanguageObject(GetSurveyTranslations(s.Id, null, language))
|
||||
};
|
||||
logger?.LogInformation($"{surveys.Count} Items(s) found");
|
||||
return (true, surveysList.Where(a=>a.Status==status).OrderByDescending(a=>a.Id), null);
|
||||
}
|
||||
return (false, null, "Not found");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError(ex.ToString());
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
// Method to get surveys asynchronously with multi-language support
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanSurvey> Surveys, string ErrorMessage)> GetSurveysAsync(string language)
|
||||
{
|
||||
@ -158,7 +121,7 @@ namespace DamageAssesment.Api.Surveys.Providers
|
||||
EndDate = s.EndDate,
|
||||
IsEnabled = s.IsEnabled,
|
||||
CreatedDate = s.CreatedDate,
|
||||
Status= GetStatus(s.StartDate,s.EndDate),
|
||||
Status = GetStatus(s.StartDate, s.EndDate),
|
||||
Titles = CreateMultiLanguageObject(GetSurveyTranslations(s.Id, null, language))
|
||||
};
|
||||
|
||||
@ -216,11 +179,6 @@ namespace DamageAssesment.Api.Surveys.Providers
|
||||
{
|
||||
if (survey != null)
|
||||
{
|
||||
if (survey.StartDate != null && survey.EndDate != null)
|
||||
{
|
||||
if(survey.StartDate.Value>survey.EndDate.Value)
|
||||
return (false, null, $"Survey start date should be less than enddate");
|
||||
}
|
||||
survey.CreatedDate = DateTime.Now;
|
||||
Db.Survey _survey = mapper.Map<Models.Survey, Db.Survey>(survey);
|
||||
|
||||
@ -257,11 +215,6 @@ namespace DamageAssesment.Api.Surveys.Providers
|
||||
{
|
||||
if (survey != null)
|
||||
{
|
||||
if (survey.StartDate != null && survey.EndDate != null)
|
||||
{
|
||||
if (survey.StartDate.Value > survey.EndDate.Value)
|
||||
return (false, null, $"Survey start date should be less than enddate");
|
||||
}
|
||||
var _survey = await surveyDbContext.Surveys.AsNoTracking().Where(s => s.Id == Id).SingleOrDefaultAsync();
|
||||
|
||||
if (_survey != null)
|
||||
|
@ -0,0 +1,8 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
@ -8,10 +8,5 @@
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*",
|
||||
"ConnectionStrings": {
|
||||
//"SurveyConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
|
||||
//"SurveyConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;",
|
||||
"SurveyConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
|
||||
}
|
||||
"AllowedHosts": "*"
|
||||
}
|
||||
|
@ -1,147 +0,0 @@
|
||||
using DamageAssesment.Api.UsersAccess.Db;
|
||||
using DamageAssesment.Api.UsersAccess.Interfaces;
|
||||
using DamageAssesment.Api.UsersAccess.Providers;
|
||||
using DamageAssesment.Api.UsersAccess.Models;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.IdentityModel.Tokens;
|
||||
using System.Text;
|
||||
using Polly;
|
||||
using DamageAssesment.Api.UsersAccess.Services;
|
||||
using Microsoft.OpenApi.Models;
|
||||
using System.Reflection;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
|
||||
const int maxApiCallRetries = 3;
|
||||
const int intervalToRetry = 2; //2 seconds
|
||||
const int maxRetryForCircuitBraker = 5;
|
||||
const int intervalForCircuitBraker = 5; //5 seconds
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
// Add services to the container.
|
||||
var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
|
||||
|
||||
|
||||
builder.Services.AddAuthentication().
|
||||
AddJwtBearer("DamageApp", item =>
|
||||
{
|
||||
|
||||
item.RequireHttpsMetadata = true;
|
||||
item.SaveToken = true;
|
||||
item.TokenValidationParameters = new TokenValidationParameters()
|
||||
{
|
||||
ValidateIssuerSigningKey = true,
|
||||
IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(authkey)),
|
||||
ValidateIssuer = false,
|
||||
ValidateAudience = false,
|
||||
ClockSkew = TimeSpan.Zero
|
||||
};
|
||||
}).AddJwtBearer("Dadeschools", options =>
|
||||
{
|
||||
options.Authority = builder.Configuration["Dadeschools:Authority"];
|
||||
options.TokenValidationParameters.ValidTypes = new[] { "at+jwt" };
|
||||
options.TokenValidationParameters.ValidateAudience = false;
|
||||
});
|
||||
|
||||
|
||||
builder.Services.AddAuthorization(options =>
|
||||
{
|
||||
var DamageAppPolicy = new AuthorizationPolicyBuilder()
|
||||
.RequireAuthenticatedUser()
|
||||
.AddAuthenticationSchemes("DamageApp")
|
||||
.Build();
|
||||
var DadeschoolsPolicy = new AuthorizationPolicyBuilder()
|
||||
.RequireAuthenticatedUser()
|
||||
.AddAuthenticationSchemes("Dadeschools")
|
||||
.Build();
|
||||
|
||||
var allPolicy = new AuthorizationPolicyBuilder()
|
||||
.RequireAuthenticatedUser()
|
||||
.AddAuthenticationSchemes("DamageApp", "Dadeschools")
|
||||
.Build();
|
||||
options.AddPolicy("DamageApp", DamageAppPolicy);
|
||||
options.AddPolicy("Dadeschools", DadeschoolsPolicy);
|
||||
options.AddPolicy("AllPolicies", allPolicy);
|
||||
options.DefaultPolicy = options.GetPolicy("DamageApp")!;
|
||||
});
|
||||
|
||||
var _jwtsettings = builder.Configuration.GetSection("JwtSettings");
|
||||
builder.Services.Configure<JwtSettings>(_jwtsettings);
|
||||
|
||||
builder.Services.AddControllers();
|
||||
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
|
||||
builder.Services.AddScoped<IUsersAccessProvider, UsersAccessProvider>();
|
||||
builder.Services.AddScoped<ITokenServiceProvider, TokenServiceProvider>();
|
||||
builder.Services.AddScoped<IEmployeeServiceProvider, EmployeeServiceProvider>();
|
||||
|
||||
builder.Services.AddHttpClient<IHttpUtil, HttpUtil>().
|
||||
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(options =>
|
||||
{
|
||||
|
||||
// Include XML comments from your assembly
|
||||
var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
|
||||
var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
|
||||
//options.IncludeXmlComments(xmlPath);
|
||||
|
||||
OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme()
|
||||
{
|
||||
Name = "Bearer",
|
||||
BearerFormat = "JWT",
|
||||
Scheme = "bearer",
|
||||
Description = "Specify the authorization token.",
|
||||
In = ParameterLocation.Header,
|
||||
Type = SecuritySchemeType.Http,
|
||||
};
|
||||
|
||||
options.AddSecurityDefinition("jwt_auth", securityDefinition);
|
||||
|
||||
// Make sure swagger UI requires a Bearer token specified
|
||||
OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme()
|
||||
{
|
||||
Reference = new OpenApiReference()
|
||||
{
|
||||
Id = "jwt_auth",
|
||||
Type = ReferenceType.SecurityScheme
|
||||
}
|
||||
};
|
||||
|
||||
OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement()
|
||||
{
|
||||
{securityScheme, new string[] { }},
|
||||
};
|
||||
|
||||
options.AddSecurityRequirement(securityRequirements);
|
||||
});
|
||||
|
||||
builder.Services.AddDbContext<UsersAccessDbContext>(option =>
|
||||
{
|
||||
option.UseInMemoryDatabase("UsersAccess");
|
||||
});
|
||||
var app = builder.Build();
|
||||
|
||||
// Configure the HTTP request pipeline.
|
||||
if (app.Environment.IsDevelopment())
|
||||
{
|
||||
app.UseSwagger();
|
||||
app.UseSwaggerUI();
|
||||
|
||||
using (var serviceScope = app.Services.CreateScope())
|
||||
{
|
||||
var services = serviceScope.ServiceProvider;
|
||||
var usersAccessProvider = services.GetRequiredService<IUsersAccessProvider>();
|
||||
usersAccessProvider.seedData();
|
||||
}
|
||||
}
|
||||
|
||||
app.UseAuthentication();
|
||||
app.UseAuthorization();
|
||||
|
||||
app.MapControllers();
|
||||
app.Run();
|
@ -11,7 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Attachm
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4CB40DC2-D9D2-4384-A7A6-9968F5C777A2}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
..\..\..\..\Sample\Migrations.ps1 = ..\..\..\..\Sample\Migrations.ps1
|
||||
ReadMe.txt = ReadMe.txt
|
||||
ReadMe4Dev.txt = ReadMe4Dev.txt
|
||||
EndProjectSection
|
||||
|
18
DamageAssesmentApi/azure-pipelines.yml
Normal file
18
DamageAssesmentApi/azure-pipelines.yml
Normal file
@ -0,0 +1,18 @@
|
||||
trigger:
|
||||
- '*'
|
||||
|
||||
pr:
|
||||
- '*'
|
||||
|
||||
pool:
|
||||
vmImage: 'ubuntu-latest'
|
||||
|
||||
steps:
|
||||
- checkout: self
|
||||
|
||||
- script: |
|
||||
#!/bin/bash
|
||||
|
||||
chmod +x ./Scripts/build_and_push_services2acr.sh
|
||||
./Scripts/build_and_push_services2acr.sh
|
||||
displayName: 'Run build_and_push_services2acr.sh'
|
@ -1,75 +0,0 @@
|
||||
version: '3.4'
|
||||
|
||||
services:
|
||||
damageassesment.api.answers:
|
||||
image: dadeschoolscontainerregistry.azurecr.io/damageassesmentapianswers
|
||||
build:
|
||||
context: .
|
||||
dockerfile: DamageAssesment.Api.Answers/Dockerfile
|
||||
ports:
|
||||
- "6001:80"
|
||||
command: bash -c "docker push dadeschoolscontainerregistry.azurecr.io/damageassesmentapianswers"
|
||||
|
||||
damageassesment.api.attachments:
|
||||
image: dadeschoolscontainerregistry.azurecr.io/damageassesmentapiattachments
|
||||
build:
|
||||
context: .
|
||||
dockerfile: DamageAssesment.Api.Attachments/Dockerfile
|
||||
ports:
|
||||
- "6001:80"
|
||||
command: bash -c "docker push dadeschoolscontainerregistry.azurecr.io/damageassesmentapiattachments"
|
||||
|
||||
damageassesment.api.employees:
|
||||
image: dadeschoolscontainerregistry.azurecr.io/damageassesmentapiemployees
|
||||
build:
|
||||
context: .
|
||||
dockerfile: DamageAssesment.Api.Employees/Dockerfile
|
||||
ports:
|
||||
- "6003:80"
|
||||
command: bash -c "docker push dadeschoolscontainerregistry.azurecr.io/damageassesmentapiemployees"
|
||||
|
||||
damageassesment.api.locations:
|
||||
image: dadeschoolscontainerregistry.azurecr.io/damageassesmentapilocations
|
||||
build:
|
||||
context: .
|
||||
dockerfile: DamageAssesment.Api.Locations/Dockerfile
|
||||
ports:
|
||||
- "6004:80"
|
||||
command: bash -c "docker push dadeschoolscontainerregistry.azurecr.io/damageassesmentapilocations"
|
||||
|
||||
damageassesment.api.questions:
|
||||
image: dadeschoolscontainerregistry.azurecr.io/damageassesmentapiquestions
|
||||
build:
|
||||
context: .
|
||||
dockerfile: DamageAssesment.Api.Questions/Dockerfile
|
||||
ports:
|
||||
- "6005:80"
|
||||
command: bash -c "docker push dadeschoolscontainerregistry.azurecr.io/damageassesmentapiquestions"
|
||||
|
||||
damageassesment.api.surveys:
|
||||
image: dadeschoolscontainerregistry.azurecr.io/damageassesmentapisurveys
|
||||
build:
|
||||
context: .
|
||||
dockerfile: DamageAssesment.Api.Surveys/Dockerfile
|
||||
ports:
|
||||
- "6006:80"
|
||||
command: bash -c "docker push dadeschoolscontainerregistry.azurecr.io/damageassesmentapisurveys"
|
||||
|
||||
damageassesment.api.doculinks:
|
||||
image: dadeschoolscontainerregistry.azurecr.io/damageassesmentapidoculinks
|
||||
build:
|
||||
context: .
|
||||
dockerfile: DamageAssesment.Api.DocuLinks/Dockerfile
|
||||
ports:
|
||||
- "6008:80"
|
||||
command: bash -c "docker push dadeschoolscontainerregistry.azurecr.io/damageassesmentapidoculinks"
|
||||
|
||||
damageassesment.api.responses:
|
||||
image: dadeschoolscontainerregistry.azurecr.io/damageassesmentapiresponses
|
||||
build:
|
||||
context: .
|
||||
dockerfile: DamageAssesment.Api.Responses/Dockerfile
|
||||
ports:
|
||||
- "6007:80"
|
||||
command: bash -c "docker push dadeschoolscontainerregistry.azurecr.io/damageassesmentapiresponses"
|
||||
|
@ -9,7 +9,6 @@
|
||||
<DockerServiceName>damageassesment.api.answers</DockerServiceName>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<None Include="docker-compos.tst.yml" />
|
||||
<None Include="docker-compose.sql.yml" />
|
||||
<None Include="docker-compose.asf.yml" />
|
||||
<None Include="docker-compose.override.yml">
|
||||
|
@ -1,13 +1,78 @@
|
||||
version: '3.4'
|
||||
|
||||
services:
|
||||
answers:
|
||||
image: santhoshsnair/damageassesmentapianswers:latest
|
||||
environment:
|
||||
- ASPNETCORE_ENVIRONMENT=Development
|
||||
ports:
|
||||
- "6001:80"
|
||||
|
||||
attachments:
|
||||
image: santhoshsnair/damageassesmentapiattachments:latest
|
||||
environment:
|
||||
- ASPNETCORE_ENVIRONMENT=Development
|
||||
ports:
|
||||
- "6002:80"
|
||||
|
||||
|
||||
employees:
|
||||
image: santhoshsnair/damageassesmentapiemployees:latest
|
||||
environment:
|
||||
- ASPNETCORE_ENVIRONMENT=Development
|
||||
ports:
|
||||
- "6003:80"
|
||||
|
||||
|
||||
locations:
|
||||
image: santhoshsnair/damageassesmentapilocations:latest
|
||||
environment:
|
||||
- ASPNETCORE_ENVIRONMENT=Development
|
||||
ports:
|
||||
- "6004:80"
|
||||
|
||||
|
||||
questions:
|
||||
image: santhoshsnair/damageassesmentapiquestions:latest
|
||||
environment:
|
||||
- ASPNETCORE_ENVIRONMENT=Development
|
||||
ports:
|
||||
- "6005:80"
|
||||
|
||||
|
||||
responses:
|
||||
image: santhoshsnair/damageassesmentapisurveyresponses:latest
|
||||
environment:
|
||||
- ASPNETCORE_ENVIRONMENT=Development
|
||||
- services__Answers=http://10.0.0.4:19081/dasapp/answers/
|
||||
- services__Locations=http://10.0.0.4:19081/dasapp/locations/
|
||||
- services__Questions=http://10.0.0.4:19081/dasapp/questions/
|
||||
- services__Employees=http://10.0.0.4:19081/dasapp/employees/
|
||||
- services__Attachments=http://10.0.0.4:19081/dasapp/attachments/
|
||||
- services__Surveys=http://10.0.0.4:19081/dasapp/survey/
|
||||
|
||||
ports:
|
||||
- "6006:80"
|
||||
|
||||
|
||||
surveys:
|
||||
image: santhoshsnair/damageassesmentapisurveys:latest
|
||||
environment:
|
||||
- ASPNETCORE_ENVIRONMENT=Development
|
||||
ports:
|
||||
- "6007:80"
|
||||
|
||||
|
||||
doculinks:
|
||||
image: santhoshsnair/damageassesmentapidoculinks:latest
|
||||
environment:
|
||||
- ASPNETCORE_ENVIRONMENT=Development
|
||||
ports:
|
||||
- "6009:80"
|
||||
sqlserver:
|
||||
image: mcr.microsoft.com/mssql/server:2019-latest
|
||||
environment:
|
||||
- SA_PASSWORD=Test123
|
||||
- SA_PASSWORD=your_password
|
||||
- ACCEPT_EULA=Y
|
||||
ports:
|
||||
- "1433:1433"
|
||||
volumes:
|
||||
- ./data:/var/opt/mssql # Mount a volume to persist data
|
||||
|
30
Scripts/build_and_push_services2acr.ps1
Normal file
30
Scripts/build_and_push_services2acr.ps1
Normal file
@ -0,0 +1,30 @@
|
||||
# powershell -ExecutionPolicy Bypass -File .\build_and_push_services2acr.ps1
|
||||
# Specify the path to your docker-compose.yml
|
||||
$composeFile = "C:\Users\santh\OneDrive\Desktop\DOCKERS\ubuntu\Sprint6\C1011\Backend-API-Services\DamageAssesmentApi\docker-compose.yml"
|
||||
|
||||
# List of services to build, tag, and push
|
||||
$services = @(
|
||||
"damageassesmentapianswers",
|
||||
"damageassesmentapiattachments",
|
||||
"damageassesmentapiemployees",
|
||||
"damageassesmentapilocations",
|
||||
"damageassesmentapiquestions",
|
||||
"damageassesmentapisurveys",
|
||||
"damageassesmentapidoculinks",
|
||||
"damageassesmentapiresponses"
|
||||
)
|
||||
|
||||
# Log in to ACR (replace ACR_USERNAME and ACR_PASSWORD)
|
||||
docker login dadeschoolscontainerregistry.azurecr.io -u dadeSchoolsContainerRegistry -p k1f8hE0O5hj3tYCCR/5stNrkw5BZoTmAqid/hvaVo8+ACRDc2Arn
|
||||
|
||||
# Loop through the services and build, tag, and push
|
||||
foreach ($service in $services) {
|
||||
# Build the service
|
||||
docker-compose -f $composeFile build $service
|
||||
|
||||
# Tag the image for ACR
|
||||
docker tag "$service" "dadeschoolscontainerregistry.azurecr.io/$service"
|
||||
|
||||
# Push the image to ACR
|
||||
docker push "dadeschoolscontainerregistry.azurecr.io/$service"
|
||||
}
|
39
Scripts/build_and_push_services2acr.sh
Normal file
39
Scripts/build_and_push_services2acr.sh
Normal file
@ -0,0 +1,39 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Determine the current directory (where the script is located)
|
||||
script_directory="$( cd "$(dirname "$0")" ; pwd -P )"
|
||||
|
||||
# Use the 'find' command to locate the 'docker-compose.yml' file within the repository directory
|
||||
composeFile=$(find "$script_directory/.." -name "docker-compose.yml" -type f | head -n 1)
|
||||
|
||||
if [ -z "$composeFile" ]; then
|
||||
echo "docker-compose.yml not found."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# List of services to build, tag, and push
|
||||
services=(
|
||||
"damageassesmentapianswers"
|
||||
"damageassesmentapiattachments"
|
||||
"damageassesmentapiemployees"
|
||||
"damageassesmentapilocations"
|
||||
"damageassesmentapiquestions"
|
||||
"damageassesmentapisurveys"
|
||||
"damageassesmentapidoculinks"
|
||||
"damageassesmentapiresponses"
|
||||
)
|
||||
|
||||
# Log in to ACR (replace ACR_USERNAME and ACR_PASSWORD)
|
||||
docker login dadeschoolscontainerregistry.azurecr.io -u dadeSchoolsContainerRegistry -p k1f8hE0O5hj3tYCCR/5stNrkw5BZoTmAqid/hvaVo8+ACRDc2Arn
|
||||
|
||||
# Loop through the services and build, tag, and push
|
||||
for service in "${services[@]}"; do
|
||||
# Build the service
|
||||
docker-compose -f "$composeFile" build "$service"
|
||||
|
||||
# Tag the image for ACR
|
||||
docker tag "$service" "dadeschoolscontainerregistry.azurecr.io/$service"
|
||||
|
||||
# Push the image to ACR
|
||||
docker push "dadeschoolscontainerregistry.azurecr.io/$service"
|
||||
done
|
@ -1,39 +0,0 @@
|
||||
# Define the path to your application's root directory
|
||||
$applicationRoot = "C:\Users\santh\OneDrive\Desktop\DOCKERS\ubuntu\Sprint6\C1011\Backend-API-Services\DamageAssesmentApi\"
|
||||
#To execute: powershell -ExecutionPolicy Bypass -File .\migrate-sqldb.ps1
|
||||
# Define the list of microservice directories
|
||||
$microservices = @(
|
||||
"DamageAssesment.Api.Answers",
|
||||
"DamageAssesment.Api.Attachments",
|
||||
"DamageAssesment.Api.DocuLinks",
|
||||
"DamageAssesment.Api.Employees",
|
||||
"DamageAssesment.Api.Locations",
|
||||
"DamageAssesment.Api.Questions",
|
||||
"DamageAssesment.Api.Responses",
|
||||
"DamageAssesment.Api.Surveys"
|
||||
)
|
||||
|
||||
|
||||
# Define the migration name with the current date and time
|
||||
$migrationName = "Migration_" + (Get-Date -Format "yyyyMMdd_HHmmss")
|
||||
|
||||
# Function to run migrations for a microservice
|
||||
Function Run-Migrations {
|
||||
param (
|
||||
[string]$microservicePath
|
||||
)
|
||||
|
||||
Write-Host "Running Migrations for $microservicePath..."
|
||||
Set-Location -Path $microservicePath
|
||||
dotnet ef migrations add $migrationName
|
||||
dotnet ef database update
|
||||
Write-Host "Migrations for $microservicePath completed."
|
||||
}
|
||||
|
||||
# Run migrations for each microservice
|
||||
$microservices | ForEach-Object {
|
||||
$microservicePath = Join-Path -Path $applicationRoot -ChildPath $_
|
||||
Run-Migrations -microservicePath $microservicePath
|
||||
}
|
||||
|
||||
Write-Host "All Migrations Completed."
|
Reference in New Issue
Block a user