updated latest changes from dev

DamageAssesmentApi/DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj

@@ -11,7 +11,12 @@
     <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="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

DamageAssesmentApi/DamageAssesment.Api.Answers/Db/AnswerDbContext.cs

@@ -1,13 +1,19 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 
 namespace DamageAssesment.Api.Answers.Db
 {
     public class AnswerDbContext:DbContext
     {
-
-        public AnswerDbContext(DbContextOptions options):base(options) 
+        private IConfiguration _Configuration { get; set; }
+        public AnswerDbContext(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("AnswerConnection"));
         }
         public DbSet<Db.Answer> Answers { get; set; }
         protected override void OnModelCreating(ModelBuilder modelBuilder)

DamageAssesmentApi/DamageAssesment.Api.Answers/Migrations/20230816214724_InitialCreate.Designer.cs

@@ -0,0 +1,58 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.Answers.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.Answers.Migrations
+{
+    [DbContext(typeof(AnswerDbContext))]
+    [Migration("20230816214724_InitialCreate")]
+    partial class InitialCreate
+    {
+        /// <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.Answers.Db.Answer", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AnswerText")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("nvarchar(250)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("QuestionId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("SurveyResponseId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Answers");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Answers/Migrations/20230816214724_InitialCreate.cs

@@ -0,0 +1,37 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Answers.Migrations
+{
+    /// <inheritdoc />
+    public partial class InitialCreate : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Answers",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    QuestionId = table.Column<int>(type: "int", nullable: false),
+                    AnswerText = table.Column<string>(type: "nvarchar(250)", maxLength: 250, nullable: false),
+                    Comment = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    SurveyResponseId = table.Column<int>(type: "int", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Answers", x => x.Id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Answers");
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Answers/Migrations/AnswerDbContextModelSnapshot.cs

@@ -0,0 +1,55 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.Answers.Db;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Answers.Migrations
+{
+    [DbContext(typeof(AnswerDbContext))]
+    partial class AnswerDbContextModelSnapshot : 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.Answers.Db.Answer", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AnswerText")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("nvarchar(250)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("QuestionId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("SurveyResponseId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Answers");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs

@@ -23,7 +23,7 @@ builder.Services.AddScoped<IAnswersProvider, AnswersProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<AnswerDbContext>(option =>
 {
-    option.UseInMemoryDatabase("Answers");
+    option.UseSqlServer("AnswerConnection");
 });
 
 var app = builder.Build();

DamageAssesmentApi/DamageAssesment.Api.Answers/appsettings.json

@@ -8,5 +8,8 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  "ConnectionStrings": {
+    "AnswerConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+  }
 }

DamageAssesmentApi/DamageAssesment.Api.Attachments/Controllers/AttachmentsController.cs

@@ -136,80 +136,6 @@ namespace DamageAssesment.Api.Attachments.Controllers
             }
         }
         /// <summary>
-        /// download an existing attachment.
-        /// </summary>
-        [HttpGet("attachments/download/{id}")]
-        public async Task<IActionResult> downloadfile(int id)
-        {
-            try
-            {
-                var result = await this.AttachmentProvider.GetDownloadAttachmentAsync(id);
-                if (!result.IsSuccess)
-                    return NotFound();
-                string path = await UploadService.GetFile(result.Attachment.URI);
-                if (path == null)
-                    return NotFound();
-                var contentType = GetContentType(result.Attachment.FileName);
-                if (contentType == "application/octet-stream")
-                    return PhysicalFile(path, contentType, result.Attachment.FileName);
-                return PhysicalFile(path, contentType, enableRangeProcessing: true);// result.Attachment.FileName);
-            }
-            catch (Exception ex)
-            {
-                // Handle the exception here or log it
-                return StatusCode(500, "An error occurred: " + ex.Message);
-            }
-            //try
-            //{
-            //    var result = await this.AttachmentProvider.GetDownloadAttachmentAsync(id);
-            //    if(!result.IsSuccess) 
-            //        return NotFound();
-            //    byte[] fileContent = await UploadService.DownloadFile(result.Attachment.URI);
-            //    if (fileContent == null || fileContent.Length == 0)
-            //        return NotFound();
-            //    var contentType = "application/octet-stream";
-            //    return File(fileContent, contentType, result.Attachment.FileName);
-            //}
-            //catch (Exception ex)
-            //{
-            //    // Handle the exception here or log it
-            //    return StatusCode(500, "An error occurred: " + ex.Message);
-            //}
-        }
-        private string GetContentType(string fileName)
-        {
-            // You can add more content types based on the file extensions
-            switch (Path.GetExtension(fileName).ToLower())
-            {
-                //case ".txt":
-                //    return "text/plain";
-                case ".jpg":
-                case ".jpeg":
-                    return "image/jpeg";
-                case ".png":
-                    return "image/png";
-                case ".gif":
-                    return "image/gif";
-                case ".bmp":
-                    return "image/bmp";
-                case ".webp":
-                    return "image/webp";
-                case ".csv":
-                    return "text/csv";
-                case ".pdf":
-                    return "application/pdf";
-                case ".docx":
-                case ".doc":
-                    return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
-                case ".xlsx":
-                case ".xls":
-                    return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-                // Add more cases as needed
-                default:
-                    return "application/octet-stream";
-            }
-        }
-        /// <summary>
         /// Delete an existing attachment.
         /// </summary>
         [HttpDelete("attachments/{id}")]

DamageAssesmentApi/DamageAssesment.Api.Attachments/DamageAssesment.Api.Attachments.csproj

@@ -12,8 +12,19 @@
     <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.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
     <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="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

DamageAssesmentApi/DamageAssesment.Api.Attachments/Db/AttachmentsDbContext.cs

@@ -1,11 +1,19 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 
 namespace DamageAssesment.Api.Attachments.Db
 {
     public class AttachmentsDbContext:DbContext
     {
-        public AttachmentsDbContext(DbContextOptions options) : base(options)
+        private IConfiguration _Configuration { get; set; }
+        public AttachmentsDbContext(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("AttachmentConnection"));
         }
         public DbSet<Db.Attachment> Attachments { get; set; }
         protected override void OnModelCreating(ModelBuilder modelBuilder)

DamageAssesmentApi/DamageAssesment.Api.Attachments/Interfaces/IAttachmentsProvider.cs

@@ -9,7 +9,6 @@ namespace DamageAssesment.Api.Attachments.Interfaces
         Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Models.Attachment> Attachments);
         Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Models.Attachment> Attachments);
         Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> DeleteAttachmentAsync(int Id);
-        Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> GetDownloadAttachmentAsync(int Id);
         Task<(bool IsSuccess, int counter, string Path)> DeleteAttachmentsAsync(int responseId, int answerId);
         Task<(bool IsSuccess, int counter, string Path)> DeleteBulkAttachmentsAsync(int responseId, List<int> answerIds);
         Task<(bool IsSuccess, int counter, string message)> GetAttachmentCounter();

DamageAssesmentApi/DamageAssesment.Api.Attachments/Interfaces/IUploadService.cs

@@ -7,8 +7,6 @@ namespace DamageAssesment.Api.Attachments.Interfaces
         List<Models.Attachment> UploadAttachment(int responseId,int answerId, int counter, List<IFormFile> postedFile);
         List<Models.Attachment> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers);
         public List<Models.Attachment> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments);
-        Task<byte[]> DownloadFile(string path);
-        Task<string> GetFile(string path);
         void Deletefile(string path);
         void Movefile(string path);
     }

DamageAssesmentApi/DamageAssesment.Api.Attachments/Migrations/20230817212256_InitialAttachment.Designer.cs

@@ -0,0 +1,60 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.Attachments.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.Attachments.Migrations
+{
+    [DbContext(typeof(AttachmentsDbContext))]
+    [Migration("20230817212256_InitialAttachment")]
+    partial class InitialAttachment
+    {
+        /// <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.Attachments.Db.Attachment", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int?>("AnswerId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit");
+
+                    b.Property<int>("ResponseId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("URI")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Attachments");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Attachments/Migrations/20230817212256_InitialAttachment.cs

@@ -0,0 +1,38 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Attachments.Migrations
+{
+    /// <inheritdoc />
+    public partial class InitialAttachment : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Attachments",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    URI = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    AnswerId = table.Column<int>(type: "int", nullable: true),
+                    ResponseId = table.Column<int>(type: "int", nullable: false),
+                    IsDeleted = table.Column<bool>(type: "bit", nullable: false),
+                    FileName = table.Column<string>(type: "nvarchar(max)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Attachments", x => x.Id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Attachments");
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Attachments/Migrations/AttachmentsDbContextModelSnapshot.cs

@@ -0,0 +1,57 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.Attachments.Db;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Attachments.Migrations
+{
+    [DbContext(typeof(AttachmentsDbContext))]
+    partial class AttachmentsDbContextModelSnapshot : 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.Attachments.Db.Attachment", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int?>("AnswerId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit");
+
+                    b.Property<int>("ResponseId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("URI")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Attachments");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Attachments/Program.cs

@@ -21,14 +21,13 @@ builder.Services.AddSwaggerGen(c =>
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
     c.IncludeXmlComments(xmlPath);
 });
-builder.Services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 builder.Services.AddScoped<IAttachmentsProvider, AttachmentsProvider>();
 builder.Services.AddScoped<IUploadService, UploadService>();
 builder.Services.AddScoped<IAzureBlobService,AzureBlobService>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<AttachmentsDbContext>(option =>
 {
-    option.UseInMemoryDatabase("Attachments");
+    option.UseSqlServer("AttachmentConnection");
 });
 builder.Services.Configure<FormOptions>(o =>
 {

DamageAssesmentApi/DamageAssesment.Api.Attachments/Providers/AttachmentsProvider.cs

@@ -13,33 +13,25 @@ namespace DamageAssesment.Api.Attachments.Providers
         private AttachmentsDbContext AttachmentDbContext;
         private ILogger<AttachmentsProvider> logger;
         private IUploadService uploadservice;
-        private IMapper mapper; 
-        private readonly IHttpContextAccessor httpContextAccessor;
-        private string baseUrl;
-        public AttachmentsProvider(AttachmentsDbContext AttachmentDbContext, ILogger<AttachmentsProvider> logger, IMapper mapper,IUploadService uploadservice, IHttpContextAccessor httpContextAccessor)
+        private IMapper mapper;
+
+        public AttachmentsProvider(AttachmentsDbContext AttachmentDbContext, ILogger<AttachmentsProvider> logger, IMapper mapper,IUploadService uploadservice)
         {
             this.AttachmentDbContext = AttachmentDbContext;
             this.logger = logger;
             this.mapper = mapper;
             this.uploadservice = uploadservice;
-            this.httpContextAccessor = httpContextAccessor;
-            baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}";
-            baseUrl = baseUrl + "/attachments/download";
             SeedData();
         }
         public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync()
         {
-            
+
             try
             {
                 logger?.LogInformation("Query Question");
                 var Attachment = await AttachmentDbContext.Attachments.AsNoTracking().Where(a => !a.IsDeleted).ToListAsync();
                 if (Attachment != null)
                 {
-                    foreach (var attachment in Attachment)
-                    {
-                        attachment.URI = $"{baseUrl}/{attachment.Id}";
-                    }
                     logger?.LogInformation($"{Attachment.Count} Attachments(s) found");
                     var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(Attachment);
                     return (true, result, null);
@@ -62,7 +54,6 @@ namespace DamageAssesment.Api.Attachments.Providers
                 if (Attachment != null)
                 {
                     logger?.LogInformation($"{Attachment} customer(s) found");
-                    Attachment.URI = $"{baseUrl}/{Attachment.Id}";
                     var result = mapper.Map<Db.Attachment, Models.Attachment>(Attachment);
                     return (true, result, null);
                 }
@@ -82,10 +73,6 @@ namespace DamageAssesment.Api.Attachments.Providers
                 List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
                 AttachmentDbContext.Attachments.AddRange(attachments);
                 await AttachmentDbContext.SaveChangesAsync();
-                foreach (var attachment in attachments)
-                {
-                    attachment.URI = $"{baseUrl}/{attachment.Id}";
-                }
                 var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
                 return (true, result, null);
             }
@@ -104,10 +91,6 @@ namespace DamageAssesment.Api.Attachments.Providers
                 List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
                 AttachmentDbContext.Attachments.UpdateRange(attachments);
                 await AttachmentDbContext.SaveChangesAsync();
-                foreach (var attachment in attachments)
-                {
-                    attachment.URI = $"{baseUrl}/{attachment.Id}";
-                }
                 var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
                 return (true, result, null);
             }
@@ -214,24 +197,6 @@ namespace DamageAssesment.Api.Attachments.Providers
         {
             return AttachmentDbContext.Attachments.AsNoTracking().Count(e => e.Id == id && !e.IsDeleted) > 0;
         }
-        public async Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> GetDownloadAttachmentAsync(int Id)
-        {
-            try
-            {
-                Db.Attachment Attachment = AttachmentDbContext.Attachments.Where(a => a.Id == Id).AsNoTracking().FirstOrDefault();
-                if (Attachment == null)
-                {
-                    return (false, null, "Not Found");
-                }
-                return (true, mapper.Map<Db.Attachment, Models.Attachment>(Attachment), $"Attachment {Id}");
-            }
-            catch (Exception ex)
-            {
-
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
 
         private void SeedData()
         {

DamageAssesmentApi/DamageAssesment.Api.Attachments/Providers/UploadService.cs

@@ -24,41 +24,6 @@ namespace DamageAssesment.Api.Attachments.Providers
             uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
             Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
         }
-        public async Task<string> GetFile(string path)
-        {
-            try
-            {
-                if (System.IO.File.Exists(path))
-                {
-                    return path;
-                }
-
-                return null; // File not found
-            }
-            catch (Exception ex)
-            {
-                // Handle or log the exception as needed
-                throw;
-            }
-
-        }
-        public async Task<byte[]> DownloadFile(string path)
-        {
-            try
-            {
-                if (System.IO.File.Exists(path))
-                {
-                    return await System.IO.File.ReadAllBytesAsync(path);
-                }
-
-                return null; // File not found
-            }
-            catch (Exception ex)
-            {
-                // Handle or log the exception as needed
-                throw;
-            }
-        }
         public List<Models.Attachment> UploadAttachment(int responseId,int answerId,int counter, List<IFormFile> postedFile)
         {
             var pathToSave = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
@@ -124,7 +89,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                     {
                         counter++;
 
-                        var UserfileName = Path.GetFileName(file.FileName+ file.FileExtension);
+                        var UserfileName = Path.GetFileName(file.FileName);
                         var fileName = String.Format("Attachment_{0}{1}", counter, file.FileExtension);
                         var dbPath = Path.Combine(fullDirectoryPath, fileName);
                         File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));
@@ -161,7 +126,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 foreach (var file in item.postedFiles)
                 {
                     Models.Attachment attachment= attachments.Where(a=>a.Id == file.AttachmentId).FirstOrDefault();
-                    var UserfileName = Path.GetFileName(file.FileName + file.FileExtension);
+                    var UserfileName = Path.GetFileName(file.FileName);
                     var fileName = String.Format("Attachment_{0}{1}", attachment?.Id, file.FileExtension);
                     var dbPath = Path.Combine(fullDirectoryPath, fileName);
                     File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));

DamageAssesmentApi/DamageAssesment.Api.Attachments/appsettings.json

@@ -12,5 +12,8 @@
   "Fileupload": {
     "folderpath": "DMS_Attachments/Active",
     "Deletepath": "DMS_Attachments/Deleted"
+  },
+  "ConnectionStrings": {
+    "AttachmentConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
   }
 }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DoculinkServiceTest.cs

@@ -16,7 +16,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
-            var mockResponse = await MockData.getNoContentResponse();
+            var mockResponse = await MockData.getNoContentResponses();
             mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en",null)).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
@@ -30,7 +30,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
-            var mockResponse = await MockData.getNoContentResponse();
+            var mockResponse = await MockData.getNoContentResponses();
             mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", true)).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
@@ -83,7 +83,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
-            var mockResponse = await MockData.getNoContentResponse();
+            var mockResponse = await MockData.getNoContentResponses();
             mockDocumentService.Setup(service => service.GetdocumentsByLinkTypeIdAsync(null, "en", true)).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
@@ -197,29 +197,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
             var result = (NotFoundResult)await DocumentProvider.DeleteDocument(1);
             Assert.Equal(404, result.StatusCode);
         }
-        [Fact(DisplayName = "Update Document IsActive- Ok case")]
-        public async Task UpdateDocumentAsync_ShouldReturnStatusCode200()
-        {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
-            var mockResponse = await MockData.getOkResponse(1);
-            mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,true)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.UpdateIsActiveDocument(1,true);
 
-            Assert.Equal(200, result.StatusCode);
-        }
-        [Fact(DisplayName = "Update Document IsActive - NotFound case")]
-        public async Task UpdateDocumentAsync_ShouldReturnStatusCode404()
-        {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
-            var mockResponse = await MockData.getNotFoundResponse();
-            mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,true)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NotFoundResult)await DocumentProvider.UpdateIsActiveDocument(1,true);
-            Assert.Equal(404, result.StatusCode);
-        }
 
         // Link Type Test cases
 

DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/MockData.cs

@@ -11,7 +11,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
     public class MockData
     {
 
-        public static async Task<(bool, List<DocuLinks.Models.ResDoculink>, string)> getOkResponses()
+        public static async Task<(bool, List<DocuLinks.Models.ResDoculinks>, string)> getOkResponses()
         {
             List<DocuLinks.Models.ResDoculink> list = new List<DocuLinks.Models.ResDoculink>();
             
@@ -32,8 +32,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
                 doclinksAttachments.Add(new DoculinkAttachments()
                 {
                     docName = "",Path="www.google.com",
-                    Language = "en",
-                    IsAttachments =false,CustomOrder=1
+                    IsAttachments=false,CustomOrder=1
                 });
                 list.Add(new DocuLinks.Models.ResDoculink()
                 {
@@ -47,8 +46,8 @@ namespace DamageAssesment.Api.DocuLinks.Test
                     doclinksAttachments= doclinksAttachments
                 });
             }
-           // List<ResDoculinks> doculinks = list.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
-            return (true, list, null);
+            List<ResDoculinks> doculinks = list.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
+            return (true, doculinks, null);
         }
 
 
@@ -75,7 +74,6 @@ namespace DamageAssesment.Api.DocuLinks.Test
                     docName = "",
                     Path = "www.google.com",
                     IsAttachments = false,
-                    Language = "en",
                     CustomOrder = 1
                 });
                 list.Add(new DocuLinks.Models.ResDoculink()
@@ -140,7 +138,6 @@ namespace DamageAssesment.Api.DocuLinks.Test
                 docName = "",
                 Path = "www.google.com",
                 IsAttachments = false,
-                Language = "en",
                 CustomOrder = 1
             });
             return new Models.Doculink
@@ -168,7 +165,6 @@ namespace DamageAssesment.Api.DocuLinks.Test
                 docName = "",
                 Path = "www.google.com",
                 IsAttachments = false,
-                Language = "en",
                 CustomOrder = 1
             });
             List<DocuLinks.Models.Doculink> DocuLinks = new List<Models.Doculink>();

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Controllers/DoculinkController.cs

@@ -13,11 +13,11 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         private readonly IDoculinkProvider documentsProvider;
         private readonly IUploadService uploadService;
 
-        public DoculinkController(IDoculinkProvider documentsProvider, IUploadService uploadService)
+        public DoculinkController(IDoculinkProvider documentsProvider,IUploadService uploadService)
         {
 
             this.documentsProvider = documentsProvider;
-            this.uploadService = uploadService;
+            this.uploadService = uploadService; 
 
         }
         /// <summary>
@@ -41,7 +41,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         [HttpGet]
         [Route("doculinks/types/{id}")]
         [Route("doculinks/types/{id}/{language:alpha}")]
-        public async Task<IActionResult> GetLinkTypeAsync(int id, string? language)
+        public async Task<IActionResult> GetLinkTypeAsync(int id,string? language)
         {
             var result = await this.documentsProvider.GetLinkTypeAsync(id, language);
             if (result.IsSuccess)
@@ -55,11 +55,11 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// </summary>
         [HttpPut]
         [Route("doculinks/types/{id}")]
-        public async Task<IActionResult> UpdateLinkType(int id, Models.LinkType linkType)
+        public async Task<IActionResult> UpdateLinkType(int id,Models.LinkType linkType)
         {
             if (linkType != null)
             {
-                var result = await this.documentsProvider.UpdateLinkTypeAsync(id, linkType);
+                var result = await this.documentsProvider.UpdateLinkTypeAsync(id,linkType);
                 if (result.IsSuccess)
                 {
                     return Ok(result.LinkType);
@@ -104,80 +104,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return NotFound();
         }
         /// <summary>
-        /// download an existing attachment.
-        /// </summary>
-        [HttpGet("doculinks/download/{id}")]
-        public async Task<IActionResult> downloadfile(int id)
-        {
-            try
-            {
-                var result = await this.documentsProvider.GetDownloadAttachmentAsync(id);
-                if (!result.IsSuccess)
-                    return NotFound();
-                string path = await uploadService.GetFile(result.DoculinkAttachments.Path);
-                if (path == null)
-                    return NotFound();
-                var contentType = GetContentType(result.DoculinkAttachments.docName);
-                if (contentType == "application/octet-stream")
-                    return PhysicalFile(path, contentType, result.DoculinkAttachments.docName);
-                return PhysicalFile(path, contentType, enableRangeProcessing: true);
-            }
-            catch (Exception ex)
-            {
-                // Handle the exception here or log it
-                return StatusCode(500, "An error occurred: " + ex.Message);
-            }
-            //try
-            //{
-            //    var result = await this.documentsProvider.GetDownloadAttachmentAsync(id);
-            //    if (!result.IsSuccess)
-            //        return NotFound();
-            //    byte[] fileContent = await uploadService.DownloadFile(result.DoculinkAttachments.Path);
-            //    if (fileContent == null || fileContent.Length == 0)
-            //        return NotFound();
-            //    var contentType = "application/octet-stream";
-            //    return File(fileContent, contentType, result.DoculinkAttachments.docName);
-            //}
-            //catch (Exception ex)
-            //{
-            //    // Handle the exception here or log it
-            //    return StatusCode(500, "An error occurred: " + ex.Message);
-            //}
-        }
-        private string GetContentType(string fileName)
-        {
-            // You can add more content types based on the file extensions
-            switch (Path.GetExtension(fileName).ToLower())
-            {
-                //case ".txt":
-                //    return "text/plain";
-                case ".jpg":
-                case ".jpeg":
-                    return "image/jpeg";
-                case ".png":
-                    return "image/png";
-                case ".gif":
-                    return "image/gif";
-                case ".bmp":
-                    return "image/bmp";
-                case ".webp":
-                    return "image/webp";
-                case ".csv":
-                    return "text/csv";
-                case ".pdf":
-                    return "application/pdf";
-                case ".docx":
-                case ".doc":
-                    return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
-                case ".xlsx":
-                case ".xls":
-                    return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-                // Add more cases as needed
-                default:
-                    return "application/octet-stream";
-            }
-        }
-        /// <summary>
         /// Get all Doculink.
         /// </summary>
         /// 
@@ -185,7 +111,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         [Route("doculinks/{linktype:alpha}")]
         [Route("doculinks/{linktype:alpha}/{language:alpha}")]
         [HttpGet]
-        public async Task<IActionResult> GetDocumentsAsync(string? linktype, string? language, bool? isactive)
+        public async Task<IActionResult> GetDocumentsAsync(string? linktype, string? language,bool? isactive)
         {
             var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, isactive);
             if (result.IsSuccess)
@@ -203,7 +129,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         [HttpGet]
         public async Task<IActionResult> GetDocumentsByActiveAsync(string? linktype, string? language)
         {
-            var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, true);
+            var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language,true);
             if (result.IsSuccess)
             {
                 return Ok(result.documents);
@@ -232,7 +158,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         [Route("doculinks/{id}")]
         [Route("doculinks/{id}/{linktype:alpha}")]
         [Route("doculinks/{id}/{linktype:alpha}/{language:alpha}")]
-        public async Task<IActionResult> GetDocumentAsync(int id, string? linktype, string? language)
+        public async Task<IActionResult> GetDocumentAsync(int id,string? linktype, string? language)
         {
             var result = await this.documentsProvider.GetDocumentAsync(id, linktype, language);
             if (result.IsSuccess)
@@ -246,7 +172,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// </summary>
         [HttpPut]
         [Route("doculinks/{id}")]
-        public async Task<IActionResult> UpdateDocument(int id, ReqDoculink documentInfo)
+        public async Task<IActionResult> UpdateDocument(int id,ReqDoculink documentInfo)
         {
             if (documentInfo != null)
             {
@@ -254,7 +180,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
                 if (dbdoc.IsSuccess)
                 {
                     var documents = await this.documentsProvider.GetDocumentCounter();
-                    Models.Doculink DocuLink = uploadService.UpdateDocuments(documents.counter, dbdoc.Document, documentInfo);
+                    Models.Doculink DocuLink= uploadService.UpdateDocuments(documents.counter,dbdoc.Document, documentInfo);
                     var result = await this.documentsProvider.UpdateDocumentAsync(id, DocuLink);
                     if (result.IsSuccess)
                     {
@@ -267,20 +193,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return BadRequest(documentInfo);
         }
         /// <summary>
-        /// update existing doclink isactive field.
-        /// </summary>
-        [HttpPut]
-        [Route("doculinks/{id}/{isactive}")]
-        public async Task<IActionResult> UpdateIsActiveDocument(int id, bool isactive)
-        {
-            var result = await this.documentsProvider.UpdateDocumentAsync(id, isactive);
-            if (result.IsSuccess)
-            {
-                return Ok(result.Document);
-            }
-            return NotFound();
-        }
-        /// <summary>
         /// Create new doclink.
         /// </summary>
         [HttpPost]
@@ -292,7 +204,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
                 if (documentInfo != null)
                 {
                     var documents = await this.documentsProvider.GetDocumentCounter();
-                    Models.Doculink DocuLink = uploadService.UploadDocument(documents.counter, documentInfo);
+                    Models.Doculink DocuLink= uploadService.UploadDocument(documents.counter, documentInfo);
                     var result = await this.documentsProvider.PostDocumentAsync(DocuLink);
                     if (result.IsSuccess)
                     {
@@ -327,6 +239,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             }
             return NotFound();
         }
-
+        
     }
 }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Db/DoculinkAttachments.cs

@@ -15,6 +15,5 @@ namespace DamageAssesment.Api.DocuLinks.Db
         public string Path { get; set; }
         public bool IsAttachments { get; set; }
         public int CustomOrder { get; set; }
-        public string Language { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Db/DoculinkDbContext.cs

@@ -7,8 +7,15 @@ namespace DamageAssesment.Api.DocuLinks.Db
 {
     public class DoculinkDbContext : DbContext
     {
-        public DoculinkDbContext(DbContextOptions options) : base(options)
+        private IConfiguration _Configuration { get; set; }
+        public DoculinkDbContext(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("DoculinConnection"));
         }
         public DbSet<Db.Doculink> Documents { get; set; }
         public DbSet<Db.LinkType> LinkTypes { get; set; }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Interfaces/IDoculinkProvider.cs

@@ -6,14 +6,12 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces
     {
         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> GetDocumentAsync(int id, string? linktype, string? language);
         Task<(bool IsSuccess, Models.Doculink Document, string ErrorMessage)> GetDocumentByidAsync(int id);
-        // Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetDocumnetsAsync(string? language);
-        Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive);
-        Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive);
+       // Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetDocumnetsAsync(string? language);
+        Task<(bool IsSuccess, IEnumerable<Models.ResDoculinks> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive);
+        Task<(bool IsSuccess, IEnumerable<Models.ResDoculinks> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive);
         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> PostDocumentAsync(Models.Doculink Document);
-        Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, Models.Doculink Document);
-        Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, bool isactive);
+        Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id,Models.Doculink Document);
         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id);
-        Task<(bool IsSuccess, Models.DoculinkAttachments DoculinkAttachments, string Path)> GetDownloadAttachmentAsync(int id);
         Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter();
 
 

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Interfaces/IUploadService.cs

@@ -7,8 +7,6 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces
         Models.Doculink UploadDocument( int counter, ReqDoculink documentInfo);
         public Models.Doculink UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo);
         void Deletefile(string path);
-        Task<byte[]> DownloadFile(string path);
-        Task<string> GetFile(string path);
         void Movefile(string path);
     }
 }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Migrations/20230828165655_InitialDocumentCreate.Designer.cs

@@ -0,0 +1,95 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.DocuLinks.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.DocuLinks.Migrations
+{
+    [DbContext(typeof(DoculinkDbContext))]
+    [Migration("20230828165655_InitialDocumentCreate")]
+    partial class InitialDocumentCreate
+    {
+        /// <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.DocuLinks.Db.Document", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("dateCreated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("dateUpdated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("description")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("docName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("linkTypeId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("title")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("url")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.LinkType", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("TypeText")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LinkTypes");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Migrations/20230828165655_InitialDocumentCreate.cs

@@ -0,0 +1,60 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DamageAssesment.Api.DocuLinks.Migrations
+{
+    /// <inheritdoc />
+    public partial class InitialDocumentCreate : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Documents",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    title = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    linkTypeId = table.Column<int>(type: "int", nullable: false),
+                    description = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    docName = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    url = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Path = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    IsActive = table.Column<bool>(type: "bit", nullable: false),
+                    dateCreated = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    dateUpdated = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Documents", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "LinkTypes",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    TypeText = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    IsActive = table.Column<bool>(type: "bit", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_LinkTypes", x => x.Id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Documents");
+
+            migrationBuilder.DropTable(
+                name: "LinkTypes");
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Migrations/20230830200432_DocumentTranslation.Designer.cs

@@ -0,0 +1,118 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.DocuLinks.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.DocuLinks.Migrations
+{
+    [DbContext(typeof(DoculinkDbContext))]
+    [Migration("20230830200432_DocumentTranslation")]
+    partial class DocumentTranslation
+    {
+        /// <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.DocuLinks.Db.Document", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("dateCreated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("dateUpdated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("docName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("linkTypeId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("url")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.DocumentsTranslation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("DocumentId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Language")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("description")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("title")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DocumentsTranslations");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.LinkType", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsAttachment")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("TypeText")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LinkTypes");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Migrations/20230830200432_DocumentTranslation.cs

@@ -0,0 +1,70 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DamageAssesment.Api.DocuLinks.Migrations
+{
+    /// <inheritdoc />
+    public partial class DocumentTranslation : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "description",
+                table: "Documents");
+
+            migrationBuilder.DropColumn(
+                name: "title",
+                table: "Documents");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsAttachment",
+                table: "LinkTypes",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.CreateTable(
+                name: "DocumentsTranslations",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    DocumentId = table.Column<int>(type: "int", nullable: false),
+                    title = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    description = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Language = table.Column<string>(type: "nvarchar(max)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_DocumentsTranslations", x => x.Id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "DocumentsTranslations");
+
+            migrationBuilder.DropColumn(
+                name: "IsAttachment",
+                table: "LinkTypes");
+
+            migrationBuilder.AddColumn<string>(
+                name: "description",
+                table: "Documents",
+                type: "nvarchar(max)",
+                nullable: false,
+                defaultValue: "");
+
+            migrationBuilder.AddColumn<string>(
+                name: "title",
+                table: "Documents",
+                type: "nvarchar(max)",
+                nullable: false,
+                defaultValue: "");
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Migrations/20230926163717_doculinkUpdate.Designer.cs

@@ -0,0 +1,162 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.DocuLinks.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.DocuLinks.Migrations
+{
+    [DbContext(typeof(DoculinkDbContext))]
+    [Migration("20230926163717_doculinkUpdate")]
+    partial class doculinkUpdate
+    {
+        /// <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.DocuLinks.Db.Doculink", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CustomOrder")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit");
+
+                    b.Property<DateTime>("dateCreated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("dateUpdated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("linkTypeId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.DoculinkAttachments", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CustomOrder")
+                        .HasColumnType("int");
+
+                    b.Property<int>("DocumentId")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsAttachments")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("docName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DoclinksAttachments");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.DoculinkTranslation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("DocumentId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Language")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("description")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("title")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DocumentsTranslations");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.LinkType", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CustomOrder")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LinkTypes");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.LinksTranslation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Language")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("LinkTypeId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("TypeText")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LinksTranslations");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Migrations/20230926163717_doculinkUpdate.cs

@@ -0,0 +1,144 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DamageAssesment.Api.DocuLinks.Migrations
+{
+    /// <inheritdoc />
+    public partial class doculinkUpdate : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsAttachment",
+                table: "LinkTypes");
+
+            migrationBuilder.DropColumn(
+                name: "TypeText",
+                table: "LinkTypes");
+
+            migrationBuilder.DropColumn(
+                name: "Path",
+                table: "Documents");
+
+            migrationBuilder.DropColumn(
+                name: "docName",
+                table: "Documents");
+
+            migrationBuilder.DropColumn(
+                name: "url",
+                table: "Documents");
+
+            migrationBuilder.AddColumn<int>(
+                name: "CustomOrder",
+                table: "LinkTypes",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "CustomOrder",
+                table: "Documents",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsDeleted",
+                table: "Documents",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.CreateTable(
+                name: "DoclinksAttachments",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    DocumentId = table.Column<int>(type: "int", nullable: false),
+                    docName = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Path = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    IsAttachments = table.Column<bool>(type: "bit", nullable: false),
+                    CustomOrder = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_DoclinksAttachments", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "LinksTranslations",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    LinkTypeId = table.Column<int>(type: "int", nullable: false),
+                    TypeText = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Language = table.Column<string>(type: "nvarchar(max)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_LinksTranslations", x => x.Id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "DoclinksAttachments");
+
+            migrationBuilder.DropTable(
+                name: "LinksTranslations");
+
+            migrationBuilder.DropColumn(
+                name: "CustomOrder",
+                table: "LinkTypes");
+
+            migrationBuilder.DropColumn(
+                name: "CustomOrder",
+                table: "Documents");
+
+            migrationBuilder.DropColumn(
+                name: "IsDeleted",
+                table: "Documents");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsAttachment",
+                table: "LinkTypes",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<string>(
+                name: "TypeText",
+                table: "LinkTypes",
+                type: "nvarchar(max)",
+                nullable: false,
+                defaultValue: "");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Path",
+                table: "Documents",
+                type: "nvarchar(max)",
+                nullable: false,
+                defaultValue: "");
+
+            migrationBuilder.AddColumn<string>(
+                name: "docName",
+                table: "Documents",
+                type: "nvarchar(max)",
+                nullable: false,
+                defaultValue: "");
+
+            migrationBuilder.AddColumn<string>(
+                name: "url",
+                table: "Documents",
+                type: "nvarchar(max)",
+                nullable: false,
+                defaultValue: "");
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Migrations/DocumentDbContextModelSnapshot.cs

@@ -0,0 +1,159 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.DocuLinks.Db;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DamageAssesment.Api.DocuLinks.Migrations
+{
+    [DbContext(typeof(DoculinkDbContext))]
+    partial class DocumentDbContextModelSnapshot : 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.DocuLinks.Db.Doculink", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CustomOrder")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit");
+
+                    b.Property<DateTime>("dateCreated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("dateUpdated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("linkTypeId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.DoculinkAttachments", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CustomOrder")
+                        .HasColumnType("int");
+
+                    b.Property<int>("DocumentId")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsAttachments")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("docName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DoclinksAttachments");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.DoculinkTranslation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("DocumentId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Language")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("description")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("title")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DocumentsTranslations");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.LinkType", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CustomOrder")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LinkTypes");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.LinksTranslation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Language")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("LinkTypeId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("TypeText")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LinksTranslations");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Models/DoculinkAttachments.cs

@@ -8,7 +8,6 @@ namespace DamageAssesment.Api.DocuLinks.Models
         public string docName { get; set; }
         public string Path { get; set; }
         public bool IsAttachments { get; set; }
-        public string Language { get; set; }
         public int CustomOrder { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Models/ReqDoculink.cs

@@ -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; }
     }
@@ -19,6 +18,5 @@ namespace DamageAssesment.Api.DocuLinks.Models
         public int CustomOrder { get; set; }
         public string url { get;set; }
         public bool IsAttachments { get; set; }
-        public string Language { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Program.cs

@@ -19,14 +19,13 @@ builder.Services.AddSwaggerGen(c =>
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
-builder.Services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 builder.Services.AddScoped<IDoculinkProvider, DoculinkProvider>();
 builder.Services.AddScoped<IUploadService, UploadService>();
 builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<DoculinkDbContext>(option =>
 {
-    option.UseInMemoryDatabase("DocumentConnection");
+    option.UseSqlServer("DoculinConnection");
 });
 var app = builder.Build();
 

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs

@@ -2,16 +2,13 @@
 using DamageAssesment.Api.DocuLinks.Db;
 using DamageAssesment.Api.DocuLinks.Interfaces;
 using DamageAssesment.Api.DocuLinks.Models;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics.Eventing.Reader;
 using System.Reflection.Metadata;
-using System.Runtime.CompilerServices;
 using System.Xml;
 using System.Xml.Linq;
 
@@ -25,18 +22,13 @@ namespace DamageAssesment.Api.DocuLinks.Providers
         private ILogger<DoculinkProvider> logger;
         private IUploadService uploadservice;
         private IMapper mapper;
-        private readonly IHttpContextAccessor httpContextAccessor;
-        private string baseUrl;
 
-        public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice, IHttpContextAccessor httpContextAccessor)
+        public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice)
         {
             this.DocumentDbContext = DocumentDbContext;
             this.logger = logger;
             this.mapper = mapper;
             this.uploadservice = uploadservice;
-            this.httpContextAccessor = httpContextAccessor;
-            baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}";
-            baseUrl = baseUrl + "/doculinks/download";
             SeedData();
         }
 
@@ -79,10 +71,10 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     {
                         linkTypeId = 1;
 
-                        fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1, Language = "en"  };
+                        fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1 };
                     }
                     else
-                        fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1,Language="en" };
+                        fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1 };
                     ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i, CustomOrder = i, Files = new List<FileModel>() { fileModel } };
                     Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo);
                     DocumentDbContext.Documents.Add(mapper.Map<Models.Doculink, Db.Doculink>(document));
@@ -178,43 +170,8 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             MultiLanguage = dicttitle;
             return MultiLanguage;
         }
-        private List<Models.DoculinkAttachments> GetDocumentAttachment(int id,string? language)
-        {
-            List<Db.DoculinkAttachments> doculinkAttachments = null;
-            if (string.IsNullOrEmpty(language))
-            {
-                doculinkAttachments = DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList();
-            }
-            else
-            {
-                doculinkAttachments = DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id && a.Language == language).ToList();
-            }
-            foreach (var attachment in doculinkAttachments)
-            {
-                if (attachment.IsAttachments)
-                    attachment.Path = $"{baseUrl}/{attachment.Id}";
-            }
-            return mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(doculinkAttachments);
-        }
-        public async Task<(bool IsSuccess, Models.DoculinkAttachments DoculinkAttachments, string Path)> GetDownloadAttachmentAsync(int id)
-        {
-            try
-            {
-                Db.DoculinkAttachments Attachment = DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.Id == id).AsNoTracking().FirstOrDefault();
-                if (Attachment == null)
-                {
-                    return (false, null, "Not Found");
-                }
-                return (true, mapper.Map<Db.DoculinkAttachments, Models.DoculinkAttachments>(Attachment), $"Attachment {id}");
-            }
-            catch (Exception ex)
-            {
 
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-        public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive)
+        public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculinks> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive)
         {
 
             try
@@ -235,10 +192,11 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                         item.titles = multilan.titles;
                         item.description = multilan.description;
                         item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
-                        item.doclinksAttachments = GetDocumentAttachment(item.Id,language);
+                        item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
+                            DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList());
                     }
-                   // List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
-                    return (true, result, null);
+                    List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
+                    return (true, doculinks, null);
                 }
                 return (false, null, "Not found");
             }
@@ -249,7 +207,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             }
 
         }
-        public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive)
+        public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculinks> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive)
         {
 
             try
@@ -270,10 +228,11 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                         item.titles = multilan.titles;
                         item.description = multilan.description;
                         item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
-                        item.doclinksAttachments = GetDocumentAttachment(item.Id, language);
+                        item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
+                            DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList());
                     }
-                    //List<ResDoculinks> doculinks =  result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
-                    return (true, result, null);
+                    List<ResDoculinks> doculinks =  result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
+                    return (true, doculinks, null);
                 }
                 return (false, null, "Not found");
             }
@@ -325,7 +284,8 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     result.documentsTranslations = mapper.Map<List<Db.DoculinkTranslation>, List<Models.DoculinkTranslation>>(
                             DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == result.Id).ToList());
 
-                    result.doclinksAttachments = GetDocumentAttachment(id, "");
+                    result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
+                        DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -357,7 +317,8 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, language));
                     result.titles = multilan.titles;
                     result.description = multilan.description;
-                    result.doclinksAttachments = GetDocumentAttachment(id, language);
+                    result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
+                        DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -388,7 +349,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                 result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(Document.linkTypeId, ""));
                 result.titles = multilan.titles;
                 result.description = multilan.description;
-                result.doclinksAttachments = GetDocumentAttachment(document.Id,"");
+                result.doclinksAttachments = Document.doclinksAttachments;
                 return (true, result, null);
             }
             catch (Exception ex)
@@ -430,7 +391,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                         result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(document.linkTypeId, ""));
                         result.titles = multilan.titles;
                         result.description = multilan.description;
-                        result.doclinksAttachments = GetDocumentAttachment(document.Id, "");
+                        result.doclinksAttachments = Document.doclinksAttachments;
                         return (true, result, "Successful");
                     }
                     else
@@ -453,35 +414,6 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id,bool isactive)
-        {
-
-            try
-            {
-                Db.Doculink Document = DocumentDbContext.Documents.AsNoTracking().Where(a => a.Id == id).FirstOrDefault();
-                if (Document == null)
-                {
-                    return (false, null, "Not Found");
-                }
-                Document.IsActive = isactive;
-                DocumentDbContext.Documents.Update(Document);
-                DocumentDbContext.SaveChanges();
-                var result = mapper.Map<Db.Doculink, Models.ResDoculink>(Document);
-                var multilan = CreateMultiLanguageObject(GetDocumentTranslations(Document.Id, ""));
-                result.titles = multilan.titles;
-                result.description = multilan.description;
-                result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, ""));
-                result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                    DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
-                return (true, result, $"DocumentId {id} deleted Successfuly");
-            }
-            catch (Exception ex)
-            {
-
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
         public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id)
         {
 

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/UploadService.cs

@@ -25,41 +25,6 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
             Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
         }
-        public async Task<string> GetFile(string path)
-        {
-            try
-            {
-                if (System.IO.File.Exists(path))
-                {
-                    return path;
-                }
-
-                return null; // File not found
-            }
-            catch (Exception ex)
-            {
-                // Handle or log the exception as needed
-                throw;
-            }
-
-        }
-        public async Task<byte[]> DownloadFile(string path)
-        {
-            try
-            {
-                if (System.IO.File.Exists(path))
-                {
-                    return await System.IO.File.ReadAllBytesAsync(path);
-                }
-
-                return null; // File not found
-            }
-            catch (Exception ex)
-            {
-                // Handle or log the exception as needed
-                throw;
-            }
-        }
 
         public Models.Doculink UploadDocument(int counter, ReqDoculink documentInfo)
         {
@@ -79,20 +44,19 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                         counter++;
                         if (item.IsAttachments)
                         {
-                            UserfileName = Path.GetFileName(item.FileName + item.FileExtension);
+                            UserfileName = Path.GetFileName(item.FileName);
                             var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
                             path = Path.Combine(fullDirectoryPath, fileName);
                             File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
                         }
                         else
                             path = item.url;
-                        attachments.Add(new Models.DoculinkAttachments { docName=UserfileName,Path=path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder,Language=item.Language });
+                        attachments.Add(new Models.DoculinkAttachments { docName=UserfileName,Path=path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder });
                     }
                 }
                 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;
             }
@@ -121,21 +85,21 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     counter++;
                     if (item.IsAttachments)
                     {
-                        UserfileName = Path.GetFileName(item.FileName+item.FileExtension);
+                        UserfileName = Path.GetFileName(item.FileName);
                         var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
                         path = Path.Combine(fullDirectoryPath, fileName);
                         File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
                     }
                     else
                         path = item.url;
-                    attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder,Language=item.Language });
+                    attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder });
                 }
                 Models.Doculink Documents = new Models.Doculink()
                 {
                     Id = documentInfo.Id,
                     linkTypeId = documentInfo.linkTypeId,
                     documentsTranslations=documentInfo.documentsTranslations,
-                    IsActive = documentInfo.IsActive,
+                    IsActive = true,
                     IsDeleted=false,
                     CustomOrder = documentInfo.CustomOrder,
                     doclinksAttachments = attachments

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/appsettings.json

@@ -6,6 +6,9 @@
     }
   },
   "AllowedHosts": "*",
+  "ConnectionStrings": {
+    "DoculinConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+  },
   "Fileupload": {
     "folderpath": "DASA_Documents/Active",
     "Deletepath": "DASA_Documents/Deleted"

DamageAssesmentApi/DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj

@@ -10,8 +10,18 @@
   <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.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
     <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="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

DamageAssesmentApi/DamageAssesment.Api.Employees/Db/EmployeeDbContext.cs

@@ -4,18 +4,23 @@ namespace DamageAssesment.Api.Employees.Db
 {
     public class EmployeeDbContext: DbContext
     {
-        public DbSet<Db.Employee> Employees { get; set; }
-        public EmployeeDbContext(DbContextOptions options) : base(options)
+        private IConfiguration _Configuration { get; set; }
+        public EmployeeDbContext(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("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; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Employees/Migrations/20230817213656_InitialEmployee.Designer.cs

@@ -0,0 +1,64 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.Employees.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.Employees.Migrations
+{
+    [DbContext(typeof(EmployeeDbContext))]
+    [Migration("20230817213656_InitialEmployee")]
+    partial class InitialEmployee
+    {
+        /// <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.Employees.Db.Employee", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<DateTime>("BirthDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("OfficePhoneNumber")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("PreferredLanguage")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Employees");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Employees/Migrations/20230817213656_InitialEmployee.cs

@@ -0,0 +1,39 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Employees.Migrations
+{
+    /// <inheritdoc />
+    public partial class InitialEmployee : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Employees",
+                columns: table => new
+                {
+                    Id = table.Column<string>(type: "nvarchar(450)", nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
+                    BirthDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    OfficePhoneNumber = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
+                    Email = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
+                    IsActive = table.Column<bool>(type: "bit", nullable: false),
+                    PreferredLanguage = table.Column<string>(type: "nvarchar(max)", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Employees", x => x.Id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Employees");
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Employees/Migrations/20230913164315_employeeupdate.Designer.cs

@@ -0,0 +1,72 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.Employees.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.Employees.Migrations
+{
+    [DbContext(typeof(EmployeeDbContext))]
+    [Migration("20230913164315_employeeupdate")]
+    partial class employeeupdate
+    {
+        /// <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.Employees.Db.Employee", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("BirthDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("EmployeeCode")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("OfficePhoneNumber")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("PreferredLanguage")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Employees");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Employees/Migrations/20230913164315_employeeupdate.cs

@@ -0,0 +1,48 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Employees.Migrations
+{
+    /// <inheritdoc />
+    public partial class employeeupdate : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "Employees",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(450)")
+                .Annotation("SqlServer:Identity", "1, 1");
+
+            migrationBuilder.AddColumn<string>(
+                name: "EmployeeCode",
+                table: "Employees",
+                type: "nvarchar(50)",
+                maxLength: 50,
+                nullable: false,
+                defaultValue: "");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "EmployeeCode",
+                table: "Employees");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Id",
+                table: "Employees",
+                type: "nvarchar(450)",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("SqlServer:Identity", "1, 1");
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Employees/Migrations/20230913170055_updatedemployee_id.Designer.cs

@@ -0,0 +1,72 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.Employees.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.Employees.Migrations
+{
+    [DbContext(typeof(EmployeeDbContext))]
+    [Migration("20230913170055_updatedemployee_id")]
+    partial class updatedemployee_id
+    {
+        /// <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.Employees.Db.Employee", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("BirthDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("EmployeeCode")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("OfficePhoneNumber")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("PreferredLanguage")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Employees");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Employees/Migrations/20230913170055_updatedemployee_id.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Employees.Migrations
+{
+    /// <inheritdoc />
+    public partial class updatedemployee_id : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Employees/Migrations/EmployeeDbContextModelSnapshot.cs

@@ -0,0 +1,69 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.Employees.Db;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Employees.Migrations
+{
+    [DbContext(typeof(EmployeeDbContext))]
+    partial class EmployeeDbContextModelSnapshot : 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.Employees.Db.Employee", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("BirthDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("EmployeeCode")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("OfficePhoneNumber")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("PreferredLanguage")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Employees");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Employees/Program.cs

@@ -24,7 +24,7 @@ builder.Services.AddScoped<IEmployeesProvider, EmployeesProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<EmployeeDbContext>(option =>
 {
-    option.UseInMemoryDatabase("Employees");
+    option.UseSqlServer("EmployeeConnection");
 });
 
 var app = builder.Build();

DamageAssesmentApi/DamageAssesment.Api.Employees/Providers/EmployeesProvider.cs

@@ -77,8 +77,7 @@ namespace DamageAssesment.Api.Employees.Providers
                     EmployeeDbContext.Employees.Add(_employee);
                     Employee.Id = _employee.Id;
                     EmployeeDbContext.SaveChanges();
-                    //return (true, Employee, null);
-                    return (true, mapper.Map<Db.Employee, Models.Employee>(_employee), null);
+                    return (true, Employee, null);
                 }
                 return (false, null, "Employee code is already exits");
             }

DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.json

@@ -13,5 +13,8 @@
     "endpoint1": "xxx",
     "endpoint2": "xxx",
     "endpoint3": "xxx"
+  },
+  "ConnectionStrings": {
+    "EmployeeConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
   }
 }

DamageAssesmentApi/DamageAssesment.Api.Locations/DamageAssesment.Api.Locations.csproj

@@ -9,6 +9,17 @@
 
   <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" />

DamageAssesmentApi/DamageAssesment.Api.Locations/Db/Location.cs

@@ -21,10 +21,6 @@ namespace DamageAssesment.Api.Locations.Db
 
         [StringLength(2)]
         public string SchoolType { get; set; }
-        public int? DataValue { get; set; }
-        public int? Enrollment { get; set; }
-        public double? Longitute { get; set; }
-        public double? Latitude { get; set; }
 
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Locations/Db/LocationDbContext.cs

@@ -4,6 +4,16 @@ 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)

DamageAssesmentApi/DamageAssesment.Api.Locations/Migrations/20230817214454_InitialLocation.Designer.cs

@@ -0,0 +1,80 @@
+// <auto-generated />
+using DamageAssesment.Api.Locations.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.Locations.Migrations
+{
+    [DbContext(typeof(LocationDbContext))]
+    [Migration("20230817214454_InitialLocation")]
+    partial class InitialLocation
+    {
+        /// <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.Locations.Db.Location", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasMaxLength(4)
+                        .HasColumnType("nvarchar(4)");
+
+                    b.Property<string>("MaintenanceCenter")
+                        .IsRequired()
+                        .HasMaxLength(1)
+                        .HasColumnType("nvarchar(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("RegionId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("SchoolType")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("nvarchar(2)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Locations");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Locations.Db.Region", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasMaxLength(2)
+                        .HasColumnType("nvarchar(2)");
+
+                    b.Property<string>("Abbreviation")
+                        .IsRequired()
+                        .HasMaxLength(5)
+                        .HasColumnType("nvarchar(5)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Regions");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Locations/Migrations/20230817214454_InitialLocation.cs

@@ -0,0 +1,52 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Locations.Migrations
+{
+    /// <inheritdoc />
+    public partial class InitialLocation : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Locations",
+                columns: table => new
+                {
+                    Id = table.Column<string>(type: "nvarchar(4)", maxLength: 4, nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
+                    MaintenanceCenter = table.Column<string>(type: "nvarchar(1)", maxLength: 1, nullable: false),
+                    SchoolType = table.Column<string>(type: "nvarchar(2)", maxLength: 2, nullable: false),
+                    RegionId = table.Column<string>(type: "nvarchar(max)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Locations", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Regions",
+                columns: table => new
+                {
+                    Id = table.Column<string>(type: "nvarchar(2)", maxLength: 2, nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
+                    Abbreviation = table.Column<string>(type: "nvarchar(5)", maxLength: 5, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Regions", x => x.Id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Locations");
+
+            migrationBuilder.DropTable(
+                name: "Regions");
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Locations/Migrations/LocationDbContextModelSnapshot.cs

@@ -0,0 +1,77 @@
+// <auto-generated />
+using DamageAssesment.Api.Locations.Db;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Locations.Migrations
+{
+    [DbContext(typeof(LocationDbContext))]
+    partial class LocationDbContextModelSnapshot : 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.Locations.Db.Location", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasMaxLength(4)
+                        .HasColumnType("nvarchar(4)");
+
+                    b.Property<string>("MaintenanceCenter")
+                        .IsRequired()
+                        .HasMaxLength(1)
+                        .HasColumnType("nvarchar(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("RegionId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("SchoolType")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("nvarchar(2)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Locations");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Locations.Db.Region", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasMaxLength(2)
+                        .HasColumnType("nvarchar(2)");
+
+                    b.Property<string>("Abbreviation")
+                        .IsRequired()
+                        .HasMaxLength(5)
+                        .HasColumnType("nvarchar(5)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Regions");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Locations/Models/Location.cs

@@ -11,9 +11,5 @@ namespace DamageAssesment.Api.Locations.Models
         public string Name { get; set; }
         public string MaintenanceCenter { get; set; }
         public string SchoolType { get; set; }
-        public int? DataValue { get; set; }
-        public int? Enrollment { get; set; }
-        public double? Longitute { get; set; }
-        public double? Latitude { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Locations/Program.cs

@@ -24,7 +24,7 @@ builder.Services.AddScoped<IRegionsProvider, RegionsProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<LocationDbContext>(option =>
 {
-    option.UseInMemoryDatabase("Locations");
+    option.UseSqlServer("LocationConnection");
 });
 var app = builder.Build();
 

DamageAssesmentApi/DamageAssesment.Api.Locations/Providers/LocationsProvider.cs

@@ -17,7 +17,7 @@ namespace DamageAssesment.Api.Locations.Providers
             this.locationDbContext = locationDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            //  SeedData();
+          //  SeedData();
         }
 
         public async Task<(bool IsSuccess, IEnumerable<Models.Location> Locations, string ErrorMessage)> GetLocationsAsync()
@@ -28,8 +28,6 @@ namespace DamageAssesment.Api.Locations.Providers
                 var locations = await locationDbContext.Locations.AsNoTracking().ToListAsync();
                 if (locations != null)
                 {
-                    int maxenrollment = (int)locations.Max(a => a.Enrollment);
-                    foreach (Db.Location item in locations) { item.DataValue = GetHeatmapdata(item.Enrollment, maxenrollment); }
                     logger?.LogInformation($"{locations.Count} Locations(s) found");
                     var result = mapper.Map<IEnumerable<Db.Location>, IEnumerable<Models.Location>>(locations);
                     return (true, result, null);
@@ -48,12 +46,9 @@ namespace DamageAssesment.Api.Locations.Providers
             try
             {
                 logger?.LogInformation("Query Location");
-
-                int maxenrollment = (int)await locationDbContext.Locations.AsNoTracking().MaxAsync(a => a.Enrollment);
                 var location = await locationDbContext.Locations.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
                 if (location != null)
-                {if(maxenrollment>0)
-                        location.DataValue = GetHeatmapdata(location.Enrollment, maxenrollment);
+                {
                     logger?.LogInformation($"{location}  found");
                     var result = mapper.Map<Db.Location, Models.Location>(location);
                     return (true, result, null);
@@ -66,10 +61,6 @@ namespace DamageAssesment.Api.Locations.Providers
                 return (false, null, ex.Message);
             }
         }
-        private int GetHeatmapdata(int? enrollment,int maxenrollment)
-        {
-            return (enrollment != null ? enrollment.Value : 0) * 100 / maxenrollment;
-        }
         public async Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> PostLocationAsync(Models.Location location)
         {
             try
@@ -148,9 +139,9 @@ namespace DamageAssesment.Api.Locations.Providers
         {
             if (!locationDbContext.Locations.Any())
             {
-                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "0091", RegionId = 5, Name = "BOB GRAHAM EDUCATION CENTER", MaintenanceCenter = "1", SchoolType = "K8", DataValue = 25,Enrollment=780,Latitude= 25.83604,Longitute= -80.21618 });
-                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "0092", RegionId = 1, Name = "NORMAN S. EDELCUP/SUNNY ISLES BEACH K-8", MaintenanceCenter = "1", SchoolType = "K8", DataValue = 46, Enrollment = 650, Latitude = 20.83604, Longitute = -40.21618 });
-                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "7511", RegionId = 4, Name = "MIAMI SPRINGS SHS", MaintenanceCenter = "2", SchoolType = "S", DataValue = 12, Enrollment = 500, Latitude = 53.83604, Longitute = -60.21618 });
+                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "0091", RegionId = 5, Name = "BOB GRAHAM EDUCATION CENTER", MaintenanceCenter = "1", SchoolType = "K8" });
+                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "0092", RegionId = 1, Name = "NORMAN S. EDELCUP/SUNNY ISLES BEACH K-8", MaintenanceCenter = "1", SchoolType = "K8" });
+                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "7511", RegionId = 4, Name = "MIAMI SPRINGS SHS", MaintenanceCenter = "2", SchoolType = "S" });
                 //locationDbContext.Locations.Add(new Db.Location() { Id = 3, LocationCode = "Loc3", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 3", MaintenanceCenter = "1", SchoolType = "US" });
                 //locationDbContext.Locations.Add(new Db.Location() { Id = 4, LocationCode = "Loc4", RegionId = 1, Name = "BOB GRAHAM EDUCATION CENTER 4", MaintenanceCenter = "1", SchoolType = "US" });
                 //locationDbContext.Locations.Add(new Db.Location() { Id = 5, LocationCode = "Loc5", RegionId = 2, Name = "BOB GRAHAM EDUCATION CENTER 5", MaintenanceCenter = "1", SchoolType = "US" });

DamageAssesmentApi/DamageAssesment.Api.Locations/appsettings.json

@@ -8,5 +8,8 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  "ConnectionStrings": {
+    "LocationConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+  }
 }

DamageAssesmentApi/DamageAssesment.Api.Questions/Controllers/QuestionsController.cs

@@ -1,5 +1,4 @@
 using DamageAssesment.Api.Questions.Interfaces;
-using DamageAssesment.Api.Questions.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Questions.Controllers
@@ -90,46 +89,6 @@ namespace DamageAssesment.Api.Questions.Controllers
             return CreatedAtRoute("DefaultApi", new { id = question.Id }, question);
         }
         /// <summary>
-        /// POST request for creating a multiple question (multilingual).
-        /// </summary>
-        [HttpPost("questions/multiple")]
-        public async Task<IActionResult> CreateQuestions(List<Models.Question> questions)
-        {
-            if (questions != null)
-            {
-                var result = await this.questionsProvider.PostQuestionsAsync(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>
-        /// 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>
 

DamageAssesmentApi/DamageAssesment.Api.Questions/DamageAssesment.Api.Questions.csproj

@@ -9,6 +9,17 @@
 
   <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" />

DamageAssesmentApi/DamageAssesment.Api.Questions/Db/QuestionDbContext.cs

@@ -6,6 +6,16 @@ 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; }

DamageAssesmentApi/DamageAssesment.Api.Questions/Interfaces/IQuestionsProvider.cs

@@ -8,8 +8,6 @@ namespace DamageAssesment.Api.Questions.Interfaces
         Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Questions, string ErrorMessage)> GetQuestionsAsync(string language);
         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);
 

DamageAssesmentApi/DamageAssesment.Api.Questions/Migrations/20230817215744_InitialQuestion.Designer.cs

@@ -0,0 +1,143 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.Questions.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.Questions.Migrations
+{
+    [DbContext(typeof(QuestionDbContext))]
+    [Migration("20230817215744_InitialQuestion")]
+    partial class InitialQuestion
+    {
+        /// <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.Questions.Db.Question", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CategoryId")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Comment")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsRequired")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("Key")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("QuestionGroup")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("QuestionNumber")
+                        .HasColumnType("int");
+
+                    b.Property<int>("QuestionTypeId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("SurveyId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionTypeId");
+
+                    b.ToTable("Questions");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Questions.Db.QuestionCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("CategoryImage")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("CategoryName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("QuestionCategories");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Questions.Db.QuestionType", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("TypeText")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("QuestionTypes");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Questions.Db.QuestionsTranslation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Language")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("QuestionId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("QuestionText")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("QuestionsTranslations");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Questions.Db.Question", b =>
+                {
+                    b.HasOne("DamageAssesment.Api.Questions.Db.QuestionType", "QuestionType")
+                        .WithMany()
+                        .HasForeignKey("QuestionTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("QuestionType");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Questions/Migrations/20230817215744_InitialQuestion.cs

@@ -0,0 +1,103 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Questions.Migrations
+{
+    /// <inheritdoc />
+    public partial class InitialQuestion : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "QuestionCategories",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    CategoryName = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    CategoryImage = table.Column<string>(type: "nvarchar(max)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_QuestionCategories", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "QuestionsTranslations",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    QuestionId = table.Column<int>(type: "int", nullable: false),
+                    QuestionText = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Language = table.Column<string>(type: "nvarchar(max)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_QuestionsTranslations", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "QuestionTypes",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    TypeText = table.Column<string>(type: "nvarchar(max)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_QuestionTypes", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Questions",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    QuestionTypeId = table.Column<int>(type: "int", nullable: false),
+                    QuestionNumber = table.Column<int>(type: "int", nullable: false),
+                    IsRequired = table.Column<bool>(type: "bit", nullable: false),
+                    Comment = table.Column<bool>(type: "bit", nullable: false),
+                    Key = table.Column<bool>(type: "bit", nullable: false),
+                    SurveyId = table.Column<int>(type: "int", nullable: true),
+                    QuestionGroup = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    CategoryId = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Questions", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Questions_QuestionTypes_QuestionTypeId",
+                        column: x => x.QuestionTypeId,
+                        principalTable: "QuestionTypes",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Questions_QuestionTypeId",
+                table: "Questions",
+                column: "QuestionTypeId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "QuestionCategories");
+
+            migrationBuilder.DropTable(
+                name: "Questions");
+
+            migrationBuilder.DropTable(
+                name: "QuestionsTranslations");
+
+            migrationBuilder.DropTable(
+                name: "QuestionTypes");
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Questions/Migrations/QuestionDbContextModelSnapshot.cs

@@ -0,0 +1,140 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.Questions.Db;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Questions.Migrations
+{
+    [DbContext(typeof(QuestionDbContext))]
+    partial class QuestionDbContextModelSnapshot : 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.Questions.Db.Question", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CategoryId")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Comment")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsRequired")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("Key")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("QuestionGroup")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("QuestionNumber")
+                        .HasColumnType("int");
+
+                    b.Property<int>("QuestionTypeId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("SurveyId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionTypeId");
+
+                    b.ToTable("Questions");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Questions.Db.QuestionCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("CategoryImage")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("CategoryName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("QuestionCategories");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Questions.Db.QuestionType", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("TypeText")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("QuestionTypes");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Questions.Db.QuestionsTranslation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Language")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("QuestionId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("QuestionText")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("QuestionsTranslations");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Questions.Db.Question", b =>
+                {
+                    b.HasOne("DamageAssesment.Api.Questions.Db.QuestionType", "QuestionType")
+                        .WithMany()
+                        .HasForeignKey("QuestionTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("QuestionType");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Questions/Program.cs

@@ -26,7 +26,7 @@ builder.Services.AddSwaggerGen(c =>
 });
 builder.Services.AddDbContext<QuestionDbContext>(option =>
 {
-    option.UseInMemoryDatabase("Questions");
+    option.UseSqlServer("QuestionConnection");
 });
 var app = builder.Build();
 

DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs

@@ -335,7 +335,16 @@ namespace DamageAssesment.Api.Questions.Providers
             try
             {
                 logger?.LogInformation("Query Question");
-                var result = InsertQuestion(Question);
+                var dbquestion = mapper.Map<Models.Question, Db.Question>(Question);
+                var dbquestiontranslation = mapper.Map<List<Models.QuestionsTranslation>, List<Db.QuestionsTranslation>>(Question.Questions);
+                dbquestion.QuestionTypeId = questionDbContext.QuestionTypes.Where(a => a.TypeText == Question.TypeText).Select(a => a.Id).FirstOrDefault();
+                questionDbContext.Questions.Add(dbquestion);
+                dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id);
+                questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation);
+                questionDbContext.SaveChanges();
+                Question.Id = dbquestion.Id;
+                var result = mapper.Map<Db.Question, Models.MultiLanguage>(dbquestion);
+                result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id,""));
                 return (true, result, null);
             }
             catch (Exception ex)
@@ -344,69 +353,6 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        private Models.MultiLanguage InsertQuestion(Models.Question Question)
-        {
-            var dbquestion = mapper.Map<Models.Question, Db.Question>(Question);
-            var dbquestiontranslation = mapper.Map<List<Models.QuestionsTranslation>, List<Db.QuestionsTranslation>>(Question.Questions);
-            dbquestion.QuestionTypeId = questionDbContext.QuestionTypes.Where(a => a.TypeText == Question.TypeText).Select(a => a.Id).FirstOrDefault();
-            questionDbContext.Questions.Add(dbquestion);
-            questionDbContext.SaveChanges();
-            dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id);
-            questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation);
-            questionDbContext.SaveChanges();
-            Question.Id = dbquestion.Id;
-            var result = mapper.Map<Db.Question, Models.MultiLanguage>(dbquestion);
-            result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
-            return result;
-        }
-        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PostQuestionsAsync(List<Models.Question> Questions)
-        {
-            try
-            {
-                List<Models.MultiLanguage> results = new List<MultiLanguage>();
-               logger?.LogInformation("Query Question");
-                foreach (Models.Question Question in Questions)
-                {
-                    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, 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
@@ -440,11 +386,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");

DamageAssesmentApi/DamageAssesment.Api.Questions/appsettings.json

@@ -8,5 +8,8 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  "ConnectionStrings": {
+    "QuestionConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+  }
 }

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/DamageAssesment.Api.Questions.Test.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="xunit" Version="2.4.2" />

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/MockData.cs

@@ -75,19 +75,8 @@ namespace DamageAssesment.Api.Questions.Test
             return new Questions.Models.Question { Id = 1, Questions=QuestionsTranslations, TypeText = "Text 1", SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=1};
 
         }
-        public static async Task<List<Questions.Models.Question>> getInputQuestionsData()
-        {
-            Models.QuestionsTranslation QuestionsTranslation = new Models.QuestionsTranslation()
-            {
-                Language = "en",
-                QuestionText = "Sample question"
-            };
-            List<Models.QuestionsTranslation> QuestionsTranslations = new List<Models.QuestionsTranslation>();
-            List<Models.Question> Questions = new List<Models.Question>();
-            QuestionsTranslations.Add(QuestionsTranslation);
-            Questions.Models.Question question = new Questions.Models.Question() { Id = 1, Questions = QuestionsTranslations, TypeText = "Text 1", SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
-              Questions.Add(question);
-            return Questions;
-        }
+
+   
+
     }
 }

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/QuestionsServiceTest.cs

@@ -110,33 +110,6 @@ namespace DamageAssesment.Api.Questions.Test
 
             Assert.Equal(400, result.StatusCode);
         }
-        [Fact(DisplayName = "Post Questions - Ok case")]
-        public async Task PostQuestionsAsync_ShouldReturnStatusCode200()
-        {
-            var mockQuestionService = new Mock<IQuestionsProvider>();
-            var mockResponse = await MockData.getOkResponse();
-            var mockInputQuestion = await MockData.getInputQuestionsData();
-            mockQuestionService.Setup(service => service.PostQuestionsAsync(mockInputQuestion)).ReturnsAsync(mockResponse);
-
-            var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (OkObjectResult)await QuestionProvider.CreateQuestions(mockInputQuestion);
-
-            Assert.Equal(200, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "Post Questions - BadRequest case")]
-        public async Task PostQuestionsAsync_ShouldReturnStatusCode400()
-        {
-            var mockQuestionService = new Mock<IQuestionsProvider>();
-            var mockInputQuestion = await MockData.getInputQuestionData();
-            var mockResponse = await MockData.getBadRequestResponse();
-            mockQuestionService.Setup(service => service.UpdateQuestionAsync(mockInputQuestion)).ReturnsAsync(mockResponse);
-
-            var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (BadRequestObjectResult)await QuestionProvider.UpdateQuestion(mockInputQuestion);
-
-            Assert.Equal(400, result.StatusCode);
-        }
 
         [Fact(DisplayName = "Put Question - Ok case")]
         public async Task PutQuestionAsync_ShouldReturnStatusCode200()

DamageAssesmentApi/DamageAssesment.Api.Responses.Test/SurveyResponsesServiceTest.cs

@@ -12,11 +12,9 @@ namespace DamageAssesment.SurveyResponses.Test
     public class SurveyResponsesServiceTest
     {
         Mock<ISurveysResponse> mockSurveyResponseService;
-        Mock<IExcelExportService> mockExcelExportService;
         public SurveyResponsesServiceTest()
         {
             mockSurveyResponseService = new Mock<ISurveysResponse>();
-            mockExcelExportService = new Mock<IExcelExportService>();
         }
 
         [Fact(DisplayName = "Get Responses - Ok case")]
@@ -25,7 +23,7 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse(mockRequestObject);
             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesAsync(1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1);
             Assert.Equal(200, result.StatusCode);
         }
@@ -35,7 +33,7 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesAsync(1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
             var result = (BadRequestObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1);
             Assert.Equal(400, result.StatusCode);
         }
@@ -45,9 +43,9 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
-            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1, 1);
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1,1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
+            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1,1);
             Assert.Equal(200, result.StatusCode);
         }
 
@@ -55,9 +53,9 @@ namespace DamageAssesment.SurveyResponses.Test
         public async Task GetSurveyResponsesBySurveyAsync_ShouldReturnStatusCode204()
         {
             var mockResponse = await MockData.getResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
-            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesAsync(1, 1);
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1,1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
+            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesAsync(1,1);
             Assert.Equal(204, result.StatusCode);
         }
 
@@ -69,9 +67,9 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
-            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1);
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1,1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
+            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1,1);
             Assert.Equal(200, result.StatusCode);
         }
 
@@ -80,7 +78,7 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
             var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1);
             Assert.Equal(204, result.StatusCode);
         }
@@ -90,9 +88,9 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
-            mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes", 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
-            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes", 1);
+            mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes",1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
+            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes",1);
             Assert.Equal(200, result.StatusCode);
         }
 
@@ -101,8 +99,8 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes", 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
-            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes", 1);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
+            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes",1);
             Assert.Equal(204, result.StatusCode);
         }
 
@@ -112,8 +110,8 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
-            mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1,1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
             var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByRegionAsync(1, 1);
             Assert.Equal(200, result.StatusCode);
         }
@@ -123,7 +121,7 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
             var result = (NoContentResult)await surveyResponseProvider.GetAnswersByRegionAsync(1, 1);
             Assert.Equal(204, result.StatusCode);
         }
@@ -134,7 +132,7 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
             var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1, 1);
             Assert.Equal(200, result.StatusCode);
         }
@@ -144,7 +142,7 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
             var result = (NoContentResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1, 1);
             Assert.Equal(204, result.StatusCode);
         }
@@ -155,7 +153,7 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
             mockSurveyResponseService.Setup(service => service.GetSurveyResponseByIdAsync(1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponseByIdAsync(1);
             Assert.Equal(200, result.StatusCode);
         }
@@ -165,7 +163,7 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.GetSurveyResponseByIdAsync(1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
             var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponseByIdAsync(1);
             Assert.Equal(204, result.StatusCode);
         }
@@ -177,7 +175,7 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse(mockRequestObject);
             mockSurveyResponseService.Setup(service => service.PostSurveyResponseAsync(mockRequestObject)).ReturnsAsync(mockResponse);
-            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object);
             var result = (OkObjectResult)await surveyResponseController.PostSurveysAsync(mockRequestObject);
             Assert.Equal(200, result.StatusCode);
         }
@@ -188,7 +186,7 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.PostSurveyResponseAsync(mockRequestObject)).ReturnsAsync(mockResponse);
-            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object);
             var result = (BadRequestObjectResult)await surveyResponseController.PostSurveysAsync(mockRequestObject);
             Assert.Equal(400, result.StatusCode);
         }
@@ -199,7 +197,7 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse(mockRequestObject);
             mockSurveyResponseService.Setup(service => service.PutSurveyResponseAsync(1, mockRequestObject)).ReturnsAsync(mockResponse);
-            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object);
             var result = (OkObjectResult)await surveyResponseController.PutSurveyResponseAsync(1, mockRequestObject);
             Assert.Equal(200, result.StatusCode);
         }
@@ -210,7 +208,7 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.PutSurveyResponseAsync(1, mockRequestObject)).ReturnsAsync(mockResponse); ;
-            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object);
             var result = (BadRequestObjectResult)await surveyResponseController.PutSurveyResponseAsync(1, mockRequestObject);
             Assert.Equal(400, result.StatusCode);
         }
@@ -221,7 +219,7 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse(mockRequestObject);
             mockSurveyResponseService.Setup(service => service.DeleteSurveyResponseAsync(1)).ReturnsAsync(mockResponse);
-            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object);
             var result = (OkObjectResult)await surveyResponseController.DeleteSurveyResponseAsync(1);
             Assert.Equal(200, result.StatusCode);
         }
@@ -231,7 +229,7 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.DeleteSurveyResponseAsync(1)).ReturnsAsync(mockResponse); ;
-            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object);
             var result = (NotFoundResult)await surveyResponseController.DeleteSurveyResponseAsync(1);
             Assert.Equal(404, result.StatusCode);
         }

DamageAssesmentApi/DamageAssesment.Api.Responses/Controllers/SurveyResponsesController.cs

@@ -8,12 +8,10 @@ namespace DamageAssesment.Api.Responses.Controllers
     public class SurveyResponsesController : ControllerBase
     {
         private readonly ISurveysResponse surveyResponseProvider;
-        private readonly IExcelExportService excelExportService;
 
-        public SurveyResponsesController(ISurveysResponse surveyResponseProvider, IExcelExportService excelExportService)
+        public SurveyResponsesController(ISurveysResponse surveyResponseProvider)
         {
             this.surveyResponseProvider = surveyResponseProvider;
-            this.excelExportService = excelExportService;
         }
         /// <summary>
         /// GET request for retrieving survey responses.
@@ -59,9 +57,9 @@ namespace DamageAssesment.Api.Responses.Controllers
         [Route("responses/{surveyid:int}/{locationid:int}/{employeeid:int}")]
         [Route("responses/{surveyid:int}/{locationid:int}")]
         [HttpGet]
-        public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyid, int locationid, int? employeeid)
+        public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyid, int locationid,int? employeeid)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyid, locationid, employeeid ?? 0);
+            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyid, locationid,employeeid ?? 0);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponses);
@@ -200,15 +198,11 @@ namespace DamageAssesment.Api.Responses.Controllers
             else
                 return BadRequest(result.ErrorMessage);
         }
-        /// <summary>
-        /// Get All active surveys .
-        /// </summary>
-        [Route("responses/surveys/active")]
-        [Route("responses/surveys/active/{language:alpha}")]
+
         [Route("responses/surveys/active/{employeeid:int}")]
         [Route("responses/surveys/active/{employeeid:int}/{language:alpha}")]
         [HttpGet]
-        public async Task<ActionResult> GetActiveSurveysAsync(int? employeeid, string? language)
+        public async Task<ActionResult> GetActiveSurveysAsync(int employeeid, string? language)
         {
             var result = await this.surveyResponseProvider.GetActiveSurveysAsync(employeeid, language);
             if (result.IsSuccess)
@@ -217,45 +211,11 @@ namespace DamageAssesment.Api.Responses.Controllers
             }
             return NoContent();
         }
-        /// <summary>
-        /// Export all survey response data based on survey id.
-        /// </summary>
-        [HttpGet]
-        [Route("responses/surveys/export/{surveyid}")]
-        public async Task<ActionResult> GetExcelSurveysAsync(int surveyid, string language, bool IsAdmin = false)
-        {
-            var result = await this.surveyResponseProvider.ExportSurveyResponsesAsync(surveyid, language, IsAdmin);
-            if (result.IsSuccess && result.surveyResponses.Count > 0)
-            {
 
-                byte[] fileContents = excelExportService.ExportToExcel<object>(result.surveyResponses);
-                return File(fileContents, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "data.xlsx");
-                //return Ok(result.Surveys);
-            }
-            return NoContent();
-        }
-        //[Route("responses/surveys/active")]
-        //[Route("responses/surveys/active/{language:alpha}")]
-        //[HttpGet]
-        //public async Task<ActionResult> GetActiveSurveysAsync( string? language)
-        //{
-        //    var result = await this.surveyResponseProvider.GetActiveSurveysAsync(null, language);
-        //    if (result.IsSuccess)
-        //    {
-        //        return Ok(result.Surveys);
-        //    }
-        //    return NoContent();
-        //}
-
-        /// <summary>
-        /// Get all historical surveys .
-        /// </summary>
-        [Route("responses/surveys/historic")]
-        [Route("responses/surveys/historic/{language:alpha}")]
         [Route("responses/surveys/historic/{employeeid:int}")]
         [Route("responses/surveys/historic/{employeeid:int}/{language:alpha}")]
         [HttpGet]
-        public async Task<ActionResult> GetHistoricSurveysAsync(int? employeeid, string? language)
+        public async Task<ActionResult> GetHistoricSurveysAsync(int employeeid, string? language)
         {
             var result = await this.surveyResponseProvider.GetHistoricSurveysAsync(employeeid, language);
             if (result.IsSuccess)

DamageAssesmentApi/DamageAssesment.Api.Responses/DamageAssesment.Api.Responses.csproj

@@ -9,7 +9,19 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
-    <PackageReference Include="EPPlus" Version="7.0.0" />
+    <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="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" />

DamageAssesmentApi/DamageAssesment.Api.Responses/Db/SurveyResponseDbContext.cs

@@ -4,12 +4,17 @@ namespace DamageAssesment.Api.Responses.Db
 {
     public class SurveyResponseDbContext:DbContext
     {
-        public DbSet<Db.SurveyResponse> SurveyResponses { get; set; }
-
-        public SurveyResponseDbContext(DbContextOptions options) : base(options)
+        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; }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {

DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IExcelExportService.cs

@@ -1,7 +0,0 @@
-namespace DamageAssesment.Api.Responses.Interfaces
-{
-    public interface IExcelExportService
-    {
-        public byte[] ExportToExcel<T1>(List<object> responses);
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IQuestionServiceProvider.cs

@@ -4,9 +4,8 @@ namespace DamageAssesment.Api.Responses.Interfaces
 {
     public interface IQuestionServiceProvider
     {
-        Task<List<Question>> getQuestionsAsync(string language);
+        Task<List<Question>> getQuestionsAsync();
         Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId);
         Task<Question> getQuestionsAsync(int questionId);
-        Task<List<QuestionCategory>> GetQuestionCategoriesAsync(string? language);
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/ISurveysResponse.cs

@@ -7,11 +7,10 @@ namespace DamageAssesment.Api.Responses.Interfaces
     {
         Task<(bool IsSuccess, dynamic Answers, string ErrorMessage)> GetAnswersByRegionAsync(int surveyId, int employeeid);
         Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyResponseAsync(Models.SurveyResponse surveyResponse);
-        // Task<(bool IsSuccess,dynamic surveyResponses, string ErrorMessage)> GetSurveyResponseAsync(int responseId);
+       // Task<(bool IsSuccess,dynamic surveyResponses, string ErrorMessage)> GetSurveyResponseAsync(int responseId);
         Task<(bool IsSuccess, dynamic surveyResponses, string ErrorMessage)> GetSurveyResponsesAsync(int employeeid);
-        Task<(bool IsSuccess, List<object> surveyResponses, string ErrorMessage)> ExportSurveyResponsesAsync(int surveyId, string language, bool IsAdmin);
-        Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetActiveSurveysAsync(int? employeeid, string language);
-        Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetHistoricSurveysAsync(int? employeeid, string language);
+        Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetActiveSurveysAsync(int employeeid, string language);
+        Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetHistoricSurveysAsync(int employeeid, string language);
         Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PutSurveyResponseAsync(int Id, Models.SurveyResponse surveyResponse);
         Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> DeleteSurveyResponseAsync(int Id);
         Task<(bool IsSuccess, dynamic SurveyResponse, string ErrorMessage)> GetSurveyResponseByIdAsync(int responseId);

DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Attachment.cs

@@ -11,7 +11,6 @@ namespace DamageAssesment.Api.Responses.Models
 
         public int? AnswerId { get; set; }
         public bool IsDeleted { get; set; }
-        public string FileName { get; set; }
 
         public Attachment(int answerId, string uri)
         {

DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Location.cs

@@ -4,13 +4,8 @@
     {
         public int Id { get; set; }
         public int RegionId { get; set; }
-        public string LocationCode { get; set; }
         public string Name { get; set; }
         public string MaintenanceCenter { get; set; }
         public string SchoolType { get; set; }
-        public int? DataValue { get; set; }
-        public int? Enrollment { get; set; }
-        public double? Longitute { get; set; }
-        public double? Latitude { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Responses/Models/QuestionCategory.cs

@@ -1,10 +0,0 @@
-namespace DamageAssesment.Api.Responses.Models
-{
-    public class QuestionCategory
-    {
-        public int Id { get; set; }
-        public string IconName { get; set; }
-        public string IconLibrary { get; set; }
-        public object Titles { get; set; }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Survey.cs

@@ -2,20 +2,13 @@
 
 namespace DamageAssesment.Api.Responses.Models
 {
-    public enum SurveyStatus
-    {
-        PENDING,
-        ACTIVE,
-        INACTIVE
-    }
     public class Survey
     {
         public int Id { get; set; }
         public bool IsEnabled { get; set; }
-        public DateTime? StartDate { get; set; }
-        public DateTime? EndDate { get; set; }
+        public DateTime StartDate { get; set; }
+        public DateTime EndDate { get; set; }
         public DateTime CreatedDate { get; set; }
-        public string Status { get; set; }
         public Dictionary<string, string> Titles { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Responses/Models/SurveyExport.cs

@@ -1,24 +0,0 @@
-namespace DamageAssesment.Api.Responses.Models
-{
-    public class SurveyExport
-    {
-        public int Id { get; set; }
-        public string SurveyQuestion { get; set; }
-        public string Answer { get; set; }
-        public string Category { get; set; }
-
-        public string School { get; set; }
-        public string Location { get; set; }
-        public string Region { get; set; }
-
-        public string MC { get; set; }
-        public string ResponseDate { get; set; }
-        public string Notes { get; set; }
-
-        public string Attachment1 { get; set; }
-        public string Attachment2 { get; set; }
-        public string Attachment3 { get; set; }
-        public string Attachment4 { get; set; }
-        public string Attachment5 { get; set; }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs

@@ -26,7 +26,6 @@ builder.Services.AddScoped<IQuestionServiceProvider, QuestionServiceProvider>();
 builder.Services.AddScoped<IEmployeeServiceProvider, EmployeeServiceProvider>();
 builder.Services.AddScoped<IAttachmentServiceProvider, AttachmentServiceProvider>();
 builder.Services.AddScoped<ISurveyServiceProvider, SurveyServiceProvider>();
-builder.Services.AddScoped<IExcelExportService, ExcelExportService>();
 
 builder.Services.AddHttpClient<IHttpUtil, HttpUtil>().
     AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
@@ -45,7 +44,7 @@ builder.Services.AddSwaggerGen(c =>
 });
 builder.Services.AddDbContext<SurveyResponseDbContext>(option =>
 {
-    option.UseInMemoryDatabase("Responses");
+    option.UseSqlServer("ResponsesConnection");
 });
 var app = builder.Build();
 

DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/ExcelExportService.cs

@@ -1,62 +0,0 @@
-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 byte[] ExportToExcel<T1>(List<object> responses)
-        {
-            ExcelPackage.LicenseContext = OfficeOpenXml.LicenseContext.NonCommercial;
-            using (var package = new ExcelPackage())
-            {
-                // Create the first worksheet and populate it with responses
-                var workSheet1 = package.Workbook.Worksheets.Add("responses");
-                PopulateWorksheet(workSheet1, responses);
-                return package.GetAsByteArray();
-            }
-        }
-        private void PopulateWorksheet(ExcelWorksheet worksheet, List<object> data)
-        {
-            if (data.Count > 0)
-            {
-                var properties = data[0].GetType().GetProperties();
-                List<int> IsAttchments = new List<int>();
-                // Add column headers
-                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"))
-                        IsAttchments.Add(col);
-                }
-
-                // Add data
-                for (int row = 2; row <= data.Count + 1; row++)
-                {
-                    for (int col = 1; col <= properties.Length; col++)
-                    {
-
-                        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();
-                            try
-                            {
-                                Uri linkUri = new Uri(attachments[1]);
-                                worksheet.Cells[row, col].Value = attachments[0];
-                                worksheet.Cells[row, col].Style.Font.UnderLine = true;
-                            }
-                            catch { worksheet.Cells[row, col].Value = attachments[1]; }
-                        }
-                        else
-                            worksheet.Cells[row, col].Value = value;
-
-                    }
-                }
-            }
-        }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/SurveyResponsesProvider.cs

@@ -3,9 +3,6 @@ using DamageAssesment.Api.Responses.Db;
 using DamageAssesment.Api.Responses.Interfaces;
 using DamageAssesment.Api.Responses.Models;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
-using System.Reflection;
-using System.Text.Json;
 
 namespace DamageAssesment.Api.Responses.Providers
 {
@@ -46,6 +43,7 @@ namespace DamageAssesment.Api.Responses.Providers
                 // Create and save SurveyResponse records with references to existing Employee and Location records
                 surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 1, LocationId = 1, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now });
                 surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 2, LocationId = 2, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now });
+
                 surveyResponseDbContext.SaveChanges();
             }
         }
@@ -56,20 +54,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);
@@ -117,19 +111,25 @@ namespace DamageAssesment.Api.Responses.Providers
                 return (false, null, ex.Message);
             }
         }
-
-        public async Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetActiveSurveysAsync(int? employeeid, string language)
+        
+        public async Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetActiveSurveysAsync(int employeeid, string language)
         {
             try
             {
                 logger?.LogInformation("Querying to get SurveyResponse object from DB");
                 //get all the survey that already taken by the employee
+                var listOfsurveysId = await surveyResponseDbContext.SurveyResponses.Where(x => x.EmployeeId == employeeid).Select(y => y.SurveyId).ToListAsync();
                 var surveys = await surveyServiceProvider.getSurveysAsync(language);
-                surveys = surveys.Where(s => s.IsEnabled == true && s.Status == SurveyStatus.ACTIVE.ToString()).ToList();
-                if (employeeid == null || employeeid == 0)
+
+                if (surveys != null)
+                {
+                    surveys = surveys.Where(s => s.IsEnabled == true && s.StartDate <= DateTime.Now && s.EndDate >= DateTime.Now).ToList();
+                }
+
+                if (listOfsurveysId==null || listOfsurveysId.Count == 0)
                     return (true, surveys, null);
-                List<int> listOfsurveysId = await surveyResponseDbContext.SurveyResponses.Where(x => x.EmployeeId == employeeid.Value).Select(y => y.SurveyId).ToListAsync();
-                var activeSurveys = surveys.Where(s => !listOfsurveysId.Contains(s.Id));
+
+                var activeSurveys = surveys.Where(s => s.IsEnabled == true && s.StartDate <= DateTime.Now && s.EndDate >= DateTime.Now && !listOfsurveysId.Contains(s.Id));
                 return (true, activeSurveys, null);
             }
             catch (Exception ex)
@@ -139,24 +139,21 @@ namespace DamageAssesment.Api.Responses.Providers
             }
         }
 
-        public async Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetHistoricSurveysAsync(int? employeeid, string language)
+        public async Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetHistoricSurveysAsync(int employeeid, string language)
         {
             try
             {
                 logger?.LogInformation("Querying to get SurveyResponse object from DB");
-
-                var surveys = await surveyServiceProvider.getSurveysAsync(language);
-                // returning only historic data: end date is less than current date.
-                surveys = surveys.Where(s => s.Status == SurveyStatus.INACTIVE.ToString()).ToList();
-                if (employeeid == null || employeeid == 0)
-                    return (true, surveys, null);
+                //get all the survey that already taken by the employee
                 var surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.EmployeeId == employeeid).ToListAsync();
+                var surveys = await surveyServiceProvider.getSurveysAsync(language);
+
                 var historicSurveys = from s in surveys
                                       from r in surveyResponses
                                       where s.Id == r.SurveyId
                                       select s;
-                return (true, historicSurveys, null);
 
+                return (true, historicSurveys, null);
             }
             catch (Exception ex)
             {
@@ -313,26 +310,6 @@ namespace DamageAssesment.Api.Responses.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, List<object> surveyResponses, string ErrorMessage)> ExportSurveyResponsesAsync(int surveyId, string language, bool isadmin)
-        {
-            try
-            {
-                var responses = await getAllSurveyResponsesExcelAsync(surveyId, language, isadmin);
-
-                if (responses != null)
-                    return (true, responses, "Request Successful.");
-                else
-                {
-                    responses = null;
-                    return (true, responses, "Empty object returned");
-                }
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
 
         public async Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyResponseAsync(Models.SurveyResponse surveyResponse)
         {
@@ -421,13 +398,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,
@@ -512,22 +490,20 @@ namespace DamageAssesment.Api.Responses.Providers
             {
                 var employee = await employeeServiceProvider.getEmployeeAsync(surveyResponse.EmployeeId);
                 var answers = await answerServiceProvider.GetAnswersByResponseIdAsync(surveyResponse.Id);
-                var allQuestions = await questionServiceProvider.getQuestionsAsync(null);
+                var allQuestions = await questionServiceProvider.getQuestionsAsync();
                 var questions = allQuestions.Where(s => s.SurveyId == surveyResponse.SurveyId);
                 var attachments = await attachmentServiceProvider.getAttachmentsAsync();
-                var Locations = await locationServiceProvider.getLocationsAsync();
-                var location = Locations.Where(a => a.Id == surveyResponse.LocationId).FirstOrDefault();
-                var result = new{
+
+                var result = new
+                {
                     surveyResponse.Id,
                     surveyResponse.SurveyId,
                     surveyResponse.LocationId,
                     surveyResponse.EmployeeId,
                     surveyResponse.ClientDevice,
                     surveyResponse.KeyAnswerResult,
-                    DataValue=(location!=null?location.DataValue:0),
-                    Enrollment= (location != null ? location.Enrollment : 0),
-                    Longitute = (location != null ? location.Longitute : surveyResponse.Longitute),
-                    Latitude=(location != null ? location.Latitude : surveyResponse.Latitude),
+                    surveyResponse.Longitute,
+                    surveyResponse.Latitude,
                     Employee = employee,
                     answers = from ans in answers
                               select new
@@ -568,14 +544,9 @@ 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();
+                var questions = await questionServiceProvider.getQuestionsAsync();
                 var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
 
                 //var surveyQuestions = await questionServiceProvider.getSurveyQuestionsAsync(surveyId);
@@ -585,7 +556,6 @@ namespace DamageAssesment.Api.Responses.Providers
                 if (employeeid == 0)
                 {
                     var result = from r in surveyResonses
-                                 join loc in Locations on r.LocationId equals loc.Id
                                  select new
                                  {
                                      r.Id,
@@ -593,18 +563,16 @@ namespace DamageAssesment.Api.Responses.Providers
                                      r.LocationId,
                                      r.EmployeeId,
                                      r.ClientDevice,
-                                    // 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(),
+                                     r.KeyAnswerResult,
+                                     r.Longitute,
+                                     r.Latitude,
+                                     Employee = (from e in employees where e.Id == r.EmployeeId select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                      answers = from ans in answers
                                                where ans.SurveyResponseId == r.Id
                                                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(),
@@ -622,7 +590,6 @@ namespace DamageAssesment.Api.Responses.Providers
                         _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
                     }
                     var result = from r in surveyResonses
-                                 join loc in Locations on r.LocationId equals loc.Id
                                  select new
                                  {
                                      r.Id,
@@ -630,18 +597,16 @@ namespace DamageAssesment.Api.Responses.Providers
                                      r.LocationId,
                                      r.EmployeeId,
                                      r.ClientDevice,
-                                   //  r.KeyAnswerResult,
-                                     loc.DataValue,
-                                     loc.Enrollment,
-                                     loc.Longitute,
-                                     loc.Latitude,
-                                   //  Employee = _employee,
+                                     r.KeyAnswerResult,
+                                     r.Longitute,
+                                     r.Latitude,
+                                     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(),
@@ -687,12 +652,10 @@ namespace DamageAssesment.Api.Responses.Providers
 
 
                 var answers = await answerServiceProvider.getAnswersAsync();
-                var questions = await questionServiceProvider.getQuestionsAsync(null);
+                var questions = await questionServiceProvider.getQuestionsAsync();
                 var attachments = await attachmentServiceProvider.getAttachmentsAsync();
 
-                var Locations = await locationServiceProvider.getLocationsAsync();
                 var result = from r in surveyResonses
-                             join loc in Locations on r.LocationId equals loc.Id
                              select new
                              {
                                  r.Id,
@@ -700,18 +663,16 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.LocationId,
                                  r.EmployeeId,
                                  r.ClientDevice,
-                               //  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(),
+                                 r.KeyAnswerResult,
+                                 r.Longitute,
+                                 r.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(),
                                  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(),
@@ -728,136 +689,7 @@ namespace DamageAssesment.Api.Responses.Providers
                 return null;
             }
         }
-        //Method to get All Survey Responses for excel export
-        private async Task<List<object>> getAllSurveyResponsesExcelAsync(int surveyId, string language, bool isadmin)
-        {
-            try
-            {
-                if (string.IsNullOrEmpty(language)) language = "en";
-                List<Db.SurveyResponse> surveyResonses;
-                surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(a => a.SurveyId == surveyId).ToListAsync();
-                var answers = await answerServiceProvider.getAnswersAsync();
-                var Locations = await locationServiceProvider.getLocationsAsync();
-                var regions = await regionServiceProvider.getRegionsAsync();
-                var questions = await questionServiceProvider.getQuestionsAsync(language);
-                var categories = await questionServiceProvider.GetQuestionCategoriesAsync(language);
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
-                List<object> questionLists = new List<object>();
-                var allques = from res in surveyResonses
-                              join loc in Locations on res.LocationId equals loc.Id
-                              join reg in regions on loc.RegionId equals reg.Id
-                              join ans in answers on res.Id equals ans.SurveyResponseId
-                              join q in questions on ans.QuestionId equals q.Id
-                              join qc in categories on q.CategoryId equals qc.Id
-                              select new
-                              {
-                                  responseId = res.Id,
-                                  questionId = q.Id,
-                                  QuestionNumber = q.QuestionNumber,
-                                  Category = JsonSerializer.Deserialize<Dictionary<string, string>>(qc.Titles.ToString())[language],
-                                  question = q.Text[language],
-                                  answerId = ans.Id,
-                                  AnswerText = ans.AnswerText,
-                                  Comment = ans.Comment,
-                                  Location = loc.LocationCode,
-                                  school = loc.Name,
-                                  Region = reg.Name,
-                                  MC = loc.MaintenanceCenter,
-                                  ResponseDate = res.CreatedDate,
-                                  EmployeeId = res.EmployeeId,
-                                  ClientDevice = res.ClientDevice,
-                                  Attachments = attachments.Where(a => a.AnswerId == ans.Id).Select(a => a.FileName + "##" + a.URI).ToList()
-                              };
-                List<object> allresoponses = new List<object>();
-                foreach (var item in allques)
-                {
 
-                    List<string> ansattachments = item.Attachments.ToList();
-
-                    //// Initialize the attachment dictionary
-                    //var attachmentsobject = new Dictionary<string, string>();
-                    //for (int i = 0; i < ansattachments.Count; i++)
-                    //{
-                    //    attachmentsobject["Attachment"+(i+1).ToString()] = ansattachments[i];
-                    //}
-
-
-                    string[] variables = new string[5];
-                    for (int i = 0; i < 5; i++) // Assuming you want to assign 5 values
-                    {
-                        if (i < ansattachments.Count())
-                        {
-                            variables[i] = ansattachments[i];
-                        }
-                        else
-                        {
-                            variables[i] = string.Empty; // or null, or any other default value
-                        }
-                    }
-
-                    // Now, you can access the values using the variables
-                    string att1 = variables[0], att2 = variables[1], att3 = variables[2], att4 = variables[3], att5 = variables[4];
-                    object response;
-                    if (isadmin)
-                    {
-                        response = new
-                        {
-                            SurveyQuestion = item.question,
-                            Answer = item.AnswerText,
-                            Category = item.Category,
-                            School = item.school,
-                            Location = item.Location,
-                            Region = item.Region,
-                            MC = item.MC,
-                            ResponseDate = item.ResponseDate.ToString(),
-                            Notes = item.Comment,
-                            Attachment1 = att1,
-                            Attachment2 = att2,
-                            Attachment3 = att3,
-                            Attachment4 = att4,
-                            Attachment5 = att5,
-                            User = item.EmployeeId,
-                            DeviceType = item.ClientDevice,
-                            Reference = item.responseId
-                        };
-                        // Add the attachment dictionary to the response object
-                        // response = new { response, Attachments = attachments };
-                    }
-                    else
-                    {
-                        response = new
-                        {
-                            SurveyQuestion = item.question,
-                            Answer = item.AnswerText,
-                            Category = item.Category,
-                            School = item.school,
-                            Location = item.Location,
-                            Region = item.Region,
-                            MC = item.MC,
-                            ResponseDate = item.ResponseDate.ToString(),
-                            Notes = item.Comment,
-                            Attachment1 = att1,
-                            Attachment2 = att2,
-                            Attachment3 = att3,
-                            Attachment4 = att4,
-                            Attachment5 = att5
-                        };
-
-                        // Add the attachment dictionary to the response object
-                        //  response = new { response, Attachments = attachments };
-                    }
-                    allresoponses.Add(response);
-                }
-                return allresoponses;
-
-
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError($"Exception Found : {ex.Message} - Ref: SurveyResponsesProvider.getSurveyResponseBySurveyIdAsync()");
-                return null;
-            }
-        }
 
         //Method to get Answers By Maintenance Center by surveyId
         private async Task<dynamic> getResultsByMaintenanceCenterAsync(int surveyId, int employeeid)
@@ -952,19 +784,13 @@ 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 questions = await questionServiceProvider.getQuestionsAsync();
                 var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
                 var attachments = await attachmentServiceProvider.getAttachmentsAsync();
 
-                var Locations = await locationServiceProvider.getLocationsAsync();
                 var result = from r in surveyResonses
-                             join loc in Locations on r.LocationId equals loc.Id
                              select new
                              {
                                  r.Id,
@@ -972,18 +798,16 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.LocationId,
                                  r.EmployeeId,
                                  r.ClientDevice,
-                               //  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(),
+                                 r.KeyAnswerResult,
+                                 r.Longitute,
+                                 r.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(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
 
                                            select new
                                            {
-                                          //     ans.QuestionId,
+                                               ans.QuestionId,
                                                ans.Id,
                                                ans.AnswerText,
                                                ans.Comment,
@@ -1027,18 +851,13 @@ 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();
                 var attachments = await attachmentServiceProvider.getAttachmentsAsync();
-                var Locations = await locationServiceProvider.getLocationsAsync();
+
                 var result = from r in surveyResponses
-                             join loc in Locations on r.LocationId equals loc.Id
                              select new
                              {
                                  r.Id,
@@ -1046,12 +865,10 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.LocationId,
                                  r.EmployeeId,
                                  r.ClientDevice,
-                             //    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(),
+                                 r.KeyAnswerResult,
+                                 r.Longitute,
+                                 r.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(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
                                            && ans.QuestionId == question.Id
@@ -1059,7 +876,7 @@ namespace DamageAssesment.Api.Responses.Providers
 
                                            select new
                                            {
-                                              // ans.QuestionId,
+                                               ans.QuestionId,
                                                AnswerId = ans.Id,
                                                ans.AnswerText,
                                                ans.Comment,

DamageAssesmentApi/DamageAssesment.Api.Responses/Services/QuestionServiceProvider.cs

@@ -10,12 +10,10 @@ namespace DamageAssesment.Api.Responses.Services
         {
         }
 
-        public async Task<List<Question>> getQuestionsAsync(string language)
+        public async Task<List<Question>> getQuestionsAsync()
         {
             try
             {
-                if (!string.IsNullOrEmpty(language))
-                    url = url + "/" + language;
                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
                 var questions = JsonConvert.DeserializeObject<List<Question>>(responseJsonString);
 
@@ -29,27 +27,6 @@ namespace DamageAssesment.Api.Responses.Services
                 return new List<Question>();
             }
         }
-        public async Task<List<QuestionCategory>> GetQuestionCategoriesAsync(string? language)
-        {
-            try
-            {
-                url = urlBase + configuration.GetValue<string>("RessourceSettings:QuestionCategory");
-
-                if (!string.IsNullOrEmpty(language))
-                    url = url + "/" + language;
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
-                var questions = JsonConvert.DeserializeObject<List<QuestionCategory>>(responseJsonString);
-
-                if (questions == null || !questions.Any())
-                    return new List<QuestionCategory>();
-                else return questions;
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError($"Exception Found : {ex.Message} - Ref: QuestionServiceProvider.GetQuestionCategoriesAsync()");
-                return new List<QuestionCategory>();
-            }
-        }
 
         public async Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId)
         {
@@ -60,7 +37,7 @@ namespace DamageAssesment.Api.Responses.Services
                 var questions = JsonConvert.DeserializeObject<List<SurveyQuestions>>(responseJsonString);
 
                 if (questions == null || !questions.Any())
-                    return new List<SurveyQuestions>();
+                    return new List<SurveyQuestions>() ;
                 else return questions;
             }
             catch (Exception ex)

DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.json

@@ -6,6 +6,9 @@
     }
   },
   "AllowedHosts": "*",
+  "ConnectionStrings": {
+    "ResponsesConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+  },
   "EndPointSettings": {
     "AnswerUrlBase": "http://localhost:5200",
     "LocationUrlBase": "http://localhost:5213",
@@ -15,12 +18,12 @@
     "AttachmentUrlBase": "http://localhost:5243",
     "SurveyUrlBase": "http://localhost:5009"
   },
+
   "RessourceSettings": {
     "Employee": "/employees",
     "EmployeeById": "/employees/{0}",
     "Question": "/questions",
     "QuestionById": "/questions/{0}",
-    "QuestionCategory": "/questions/categories",
     "SurveyQuestion": "/questions/bysurvey/{0}",
     "Survey": "/surveys",
     "SurveyById": "/surveys/{0}",

DamageAssesmentApi/DamageAssesment.Api.Surveys.Test/SurveyServiceTest.cs

@@ -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()
         {

DamageAssesmentApi/DamageAssesment.Api.Surveys/Controllers/SurveysController.cs

@@ -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>

DamageAssesmentApi/DamageAssesment.Api.Surveys/DamageAssesment.Api.Surveys.csproj

@@ -9,6 +9,17 @@
 
   <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" />

DamageAssesmentApi/DamageAssesment.Api.Surveys/Db/Survey.cs

@@ -13,9 +13,9 @@ namespace DamageAssesment.Api.Surveys.Db
 
         public bool IsEnabled { get; set; }
 
-        public DateTime? StartDate { get; set; }
+        public DateTime StartDate { get; set; }
 
-        public DateTime? EndDate { get; set; }
+        public DateTime EndDate { get; set; }
 
         public DateTime CreatedDate { get; set; } = DateTime.Now;
         /*

DamageAssesmentApi/DamageAssesment.Api.Surveys/Db/SurveysDbContext.cs

@@ -4,11 +4,18 @@ 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; }
-        public SurveysDbContext(DbContextOptions options) : base(options)
+        protected override void OnConfiguring(DbContextOptionsBuilder options)
         {
-
+            // connect to sql server with connection string from app settings
+            options.UseSqlServer(_Configuration.GetConnectionString("SurveyConnection"));
         }
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {

DamageAssesmentApi/DamageAssesment.Api.Surveys/Interfaces/ISurveyProvider.cs

@@ -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);

DamageAssesmentApi/DamageAssesment.Api.Surveys/Migrations/20230817220614_InitialSurvey.Designer.cs

@@ -0,0 +1,57 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.Surveys.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.Survey.Migrations
+{
+    [DbContext(typeof(SurveysDbContext))]
+    [Migration("20230817220614_InitialSurvey")]
+    partial class InitialSurvey
+    {
+        /// <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.Surveys.Db.Survey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("bit");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Surveys");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Surveys/Migrations/20230817220614_InitialSurvey.cs

@@ -0,0 +1,38 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Survey.Migrations
+{
+    /// <inheritdoc />
+    public partial class InitialSurvey : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Surveys",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    Title = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: false),
+                    IsEnabled = table.Column<bool>(type: "bit", nullable: false),
+                    StartDate = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    EndDate = table.Column<DateTime>(type: "datetime2", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Surveys", x => x.Id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Surveys");
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Surveys/Migrations/SurveysDbContextModelSnapshot.cs

@@ -0,0 +1,54 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.Surveys.Db;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Survey.Migrations
+{
+    [DbContext(typeof(SurveysDbContext))]
+    partial class SurveysDbContextModelSnapshot : 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.Surveys.Db.Survey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("bit");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Surveys");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}