fixed region issue

date as optional date.

.vs/VSWorkspaceState.json

@@ -1,7 +0,0 @@
-{
-  "ExpandedNodes": [
-    ""
-  ],
-  "SelectedNode": "\\DamageAssesment.sln",
-  "PreviewInSolutionExplorer": false
-}

DamageAssesmentApi/.gitignore

@@ -396,4 +396,3 @@ FodyWeavers.xsd
 
 # JetBrains Rider
 *.sln.iml
-**/migrations/

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

@@ -13,16 +13,8 @@
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
-    <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Answers.Db
 {
-    [Table("Answers")]
     public class Answer
     {
         [Key]

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

@@ -1,19 +1,13 @@
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
 
 namespace DamageAssesment.Api.Answers.Db
 {
     public class AnswerDbContext:DbContext
     {
-        private IConfiguration _Configuration { get; set; }
-        public AnswerDbContext(DbContextOptions options,IConfiguration configuration):base(options) 
+
+        public AnswerDbContext(DbContextOptions options):base(options) 
         {
-            _Configuration= configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("AnswerConnection"));
+            
         }
         public DbSet<Db.Answer> Answers { get; set; }
         protected override void OnModelCreating(ModelBuilder modelBuilder)

DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs

@@ -9,10 +9,6 @@ using System.Reflection;
 using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
 builder.Services.AddAuthentication(item =>
 {
@@ -31,11 +27,6 @@ builder.Services.AddAuthentication(item =>
         ClockSkew = TimeSpan.Zero
     };
 });
-builder.Services.AddLogging(builder =>
-{
-    //builder.AddConsole(); // Optional: Add other providers if needed
-    builder.AddFile("logs/answers-{Date}.txt"); // Specify the file path and format
-});
 // Add services to the container.
 
 builder.Services.AddControllers();
@@ -82,7 +73,7 @@ builder.Services.AddScoped<IAnswersProvider, AnswersProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<AnswerDbContext>(option =>
 {
-    option.UseSqlServer("AnswerConnection");
+    option.UseInMemoryDatabase("Answers");
 });
 
 var app = builder.Build();
@@ -94,7 +85,6 @@ if (app.Environment.IsDevelopment())
     app.UseSwagger();
     app.UseSwaggerUI();
 }
-app.UseCors("DamageAppCorsPolicy");
 app.UseAuthentication();
 app.UseAuthorization();
 

DamageAssesmentApi/DamageAssesment.Api.Answers/Providers/AnswerProvider.cs

@@ -198,12 +198,13 @@ namespace DamageAssesment.Api.Answers.Providers
         {
             if (!answerDbContext.Answers.Any())
             {
-                answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "Yes", Comment = "", QuestionId = 1, SurveyResponseId = 1 });
-                answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "myComment", QuestionId = 2, SurveyResponseId = 1 });
-                //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
-                //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 });
-                //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 });
-                //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 1, AnswerText = "Yes", Comment = "Comment test 4", QuestionId = 1, SurveyResponseId = 1 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 2, AnswerText = "No", Comment = "Comment test 5", QuestionId = 2, SurveyResponseId = 1 });
+                // Uncomment the lines below to add more initial data if needed
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 3, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 4, AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 });
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 5, AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 });
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 6, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 });
                 answerDbContext.SaveChanges();
             }
         }

DamageAssesmentApi/DamageAssesment.Api.Answers/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

DamageAssesmentApi/DamageAssesment.Api.Answers/appsettings.json

@@ -8,10 +8,5 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"AnswerConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "AnswerConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
-  }
+  "AllowedHosts": "*"
 }

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

@@ -13,12 +13,11 @@ namespace DamageAssesment.Api.Attachments.Controllers
     {
         private IAttachmentsProvider AttachmentProvider;
         private IUploadService UploadService;
-        private IAzureBlobService azureBlobService;
 
-        public AttachmentsController(IAttachmentsProvider AttachmentsProvider, IUploadService UploadService)
+        public AttachmentsController(IAttachmentsProvider AttachmentsProvider, IUploadService uploadService)
         {
             this.AttachmentProvider = AttachmentsProvider;
-            this.UploadService = UploadService;
+            this.UploadService = uploadService;  
         }
         /// <summary>
         /// Get all attachments.

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

@@ -14,23 +14,9 @@
     <PackageReference Include="Azure.Storage.Blobs" Version="12.16.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
-    <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Attachments.Db
 {
-    [Table("AnswerAttachments")]
     public class Attachment
     {
         [Key]

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

@@ -1,19 +1,11 @@
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
 
 namespace DamageAssesment.Api.Attachments.Db
 {
     public class AttachmentsDbContext:DbContext
     {
-        private IConfiguration _Configuration { get; set; }
-        public AttachmentsDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
+        public AttachmentsDbContext(DbContextOptions options) : base(options)
         {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("AttachmentConnection"));
         }
         public DbSet<Db.Attachment> Attachments { get; set; }
         protected override void OnModelCreating(ModelBuilder modelBuilder)

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

@@ -1,15 +1,10 @@
 using Azure.Storage.Blobs.Models;
-using DamageAssesment.Api.Attachments.Models;
 
 namespace DamageAssesment.Api.Attachments.Interfaces
 {
     public interface IAzureBlobService
     {
         Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files);
-        Task<List<Attachment>> UploadAttachment(int responseId, int answerId, int counter, List<IFormFile> postedFile);
-        Task<List<Attachment>> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers);
-        Task<List<Attachment>> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments);
-        void Deletefile(string path);
-        void Movefile(string path);
+        void DeleteFile(string path);
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Attachments/Program.cs

@@ -5,22 +5,13 @@ using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.FileProviders;
-using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.OpenApi.Models;
 using System.Reflection;
 using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddLogging(builder =>
-{
-    //builder.AddConsole(); // Optional: Add other providers if needed
-    builder.AddFile("logs/attachments-{Date}.txt"); // Specify the file path and format
-});
 builder.Services.AddAuthentication(item =>
 {
     item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
@@ -87,7 +78,7 @@ builder.Services.AddScoped<IAzureBlobService,AzureBlobService>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<AttachmentsDbContext>(option =>
 {
-    option.UseSqlServer("AttachmentConnection");
+    option.UseInMemoryDatabase("Attachments");
 });
 builder.Services.Configure<FormOptions>(o =>
 {
@@ -104,7 +95,7 @@ if (app.Environment.IsDevelopment())
     app.UseSwagger();
     app.UseSwaggerUI();
 }
-app.UseCors("DamageAppCorsPolicy");
+
 app.UseAuthentication();
 app.UseAuthorization();
 app.UseHttpsRedirection();

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

@@ -25,7 +25,7 @@ namespace DamageAssesment.Api.Attachments.Providers
             this.httpContextAccessor = httpContextAccessor;
             baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}";
             baseUrl = baseUrl + "/attachments/download";
-           // SeedData();
+            SeedData();
         }
         public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync()
         {

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

@@ -3,9 +3,6 @@ using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Blobs.Specialized;
 using DamageAssesment.Api.Attachments.Interfaces;
-using DamageAssesment.Api.Attachments.Models;
-using System.Diagnostics.Metrics;
-using System.Text;
 
 namespace DamageAssesment.Api.Attachments.Providers
 {
@@ -13,95 +10,11 @@ namespace DamageAssesment.Api.Attachments.Providers
     {
         BlobServiceClient _blobClient;
         BlobContainerClient _containerClient;
-        string azureConnectionString;
-        private string uploadpath = "";
-        private string Deletepath = "";
-        public AzureBlobService(IConfiguration configuration)
+        string azureConnectionString = "<Primary Connection String>";
+        public AzureBlobService()
         {
-            uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
-            Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
-            _blobClient = new BlobServiceClient(configuration.GetValue<string>("Fileupload:BlobConnectionString"));
-            _containerClient = _blobClient.GetBlobContainerClient(configuration.GetValue<string>("Fileupload:BlobContainerName"));
-        }
-        public async Task<List<Attachment>> UploadAttachment(int responseId, int answerId, int counter, List<IFormFile> postedFile)
-        {
-            var pathToSave = Path.Combine(uploadpath, "Response-" + responseId);
-            String fullDirectoryPath = Path.Combine(pathToSave, "Answer-" + answerId);
-            List<Models.Attachment> attachments = new List<Models.Attachment>();
-            foreach (IFormFile item in postedFile)
-            {
-
-                counter++;
-                var UserfileName = Path.GetFileName(item.FileName);
-                var extension = System.IO.Path.GetExtension(UserfileName);
-                var fileName = String.Format("Attachment_{0}{1}", counter, extension);
-                var stream = item.OpenReadStream();
-                BlobClient client = _containerClient.GetBlobClient(fullDirectoryPath + "/" + fileName);
-                string dbPath = fullDirectoryPath + "/" + fileName;
-                var result = await client.UploadAsync(stream, true);
-                attachments.Add(new Models.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
-            }
-            return attachments;
-        }
-        public async Task<List<Attachment>> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers)
-        {
-            List<Models.Attachment> attachments = new List<Models.Attachment>();
-            try
-            {
-                foreach (var item in answers)
-                {
-                    int answerId = item.AnswerId;
-                    var pathToSave = Path.Combine(uploadpath, "Response-" + responseId);
-                    String fullDirectoryPath = Path.Combine(pathToSave, "Answer-" + answerId);
-                    foreach (var file in item.postedFiles)
-                    {
-                        counter++;
-
-                        var UserfileName = Path.GetFileName(file.FileName);
-                        var fileName = String.Format("Attachment_{0}{1}", counter, file.FileExtension);
-                        byte[] byteArray = Convert.FromBase64String(file.FileContent);
-                        MemoryStream stream = new MemoryStream(byteArray);
-                        BlobClient client = _containerClient.GetBlobClient(fullDirectoryPath + "/" + fileName);
-                        string dbPath = fullDirectoryPath + "/" + fileName;
-                        var result = await client.UploadAsync(stream, true);
-                        attachments.Add(new Models.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
-                    }
-                }
-                return attachments;
-            }
-            catch (Exception ex)
-            {
-                return new List<Models.Attachment>();
-            }
-
-
-        }
-        public async Task<List<Attachment>> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments)
-        {
-            List<Models.Attachment> Dbattachments = new List<Models.Attachment>();
-            foreach (Models.Attachment searchFile in attachments)
-            {
-                Movefile(searchFile.URI);
-            }
-            foreach (var item in answers)
-            {
-                int answerId = item.AnswerId;
-                var pathToSave = Path.Combine(uploadpath, "Response-" + responseId);
-                String fullDirectoryPath = Path.Combine(pathToSave, "Answer-" + answerId);
-                foreach (var file in item.postedFiles)
-                {
-                    Models.Attachment attachment = attachments.Where(a => a.Id == file.AttachmentId).FirstOrDefault();
-                    var UserfileName = Path.GetFileName(file.FileName);
-                    var fileName = String.Format("Attachment_{0}{1}", attachment?.Id, file.FileExtension);
-                    byte[] byteArray = Convert.FromBase64String(file.FileContent);
-                    MemoryStream stream = new MemoryStream(byteArray);
-                    BlobClient client = _containerClient.GetBlobClient(fullDirectoryPath + "/" + fileName);
-                    string dbPath = fullDirectoryPath + "/" + fileName;
-                    var result = await client.UploadAsync(stream, true);
-                    Dbattachments.Add(new Models.Attachment { Id = attachment.Id, AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
-                }
-            }
-            return Dbattachments;
+            _blobClient = new BlobServiceClient(azureConnectionString);
+            _containerClient = _blobClient.GetBlobContainerClient("apiimages");
         }
 
         public async Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files)
@@ -122,52 +35,10 @@ namespace DamageAssesment.Api.Attachments.Providers
 
             return azureResponse;
         }
-        public string getMovefilename(string movefilename)
+        public void DeleteFile(string url)
         {
-            var list = movefilename.Split('.');
-            if (list.Length > 0)
-                list[list.Length - 1] = DateTime.Now.ToShortDateString().Replace("/", "_") + "_" + DateTime.Now.ToShortTimeString().Replace("/", "_") + "." + list[list.Length - 1];
-            return string.Join("_", list);
-        }
-        public void Movefile(string path)
-        {
-            try
-            {
-                if (path != "")
-                {
-                    string MovePath = getMovefilename(path.Replace(uploadpath, Deletepath));
-                    // Get references to the source and destination blobs
-                    BlobClient sourceBlobClient = _containerClient.GetBlobClient(path);
-                    BlobClient destinationBlobClient = _containerClient.GetBlobClient(MovePath);
-                    // Start the copy operation from the source to the destination
-                    destinationBlobClient.StartCopyFromUri(sourceBlobClient.Uri);
-
-                    // Check if the copy operation completed successfully
-                    WaitForCopyToComplete(destinationBlobClient);
-
-                    // Delete the source blob after a successful copy
-                    sourceBlobClient.DeleteIfExists();
-                }
-            }
-            catch (Exception ex)
-            {
-
-            }
-        }
-        static void WaitForCopyToComplete(BlobClient blobClient)
-        {
-            BlobProperties properties = blobClient.GetProperties();
-
-            while (properties.CopyStatus == CopyStatus.Pending)
-            {
-                Task.Delay(TimeSpan.FromSeconds(1));
-                properties = blobClient.GetProperties();
-            }
-        }
-        public void Deletefile(string url)
-        {
-            BlobClient sourceBlobClient = _containerClient.GetBlobClient(url);
-            sourceBlobClient.DeleteIfExists();
+            var blob = _containerClient.GetBlockBlobClient(url);
+            blob.DeleteIfExists();
         }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Attachments/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

DamageAssesmentApi/DamageAssesment.Api.Attachments/appsettings.json

@@ -11,14 +11,6 @@
   "AllowedHosts": "*",
   "Fileupload": {
     "folderpath": "DMS_Attachments/Active",
-    "Deletepath": "DMS_Attachments/Deleted",
-    "BlobConnectionString": "DefaultEndpointsProtocol=https;AccountName=damagedoculink;AccountKey=blynpwrAQtthEneXC5f4vFewJ3tPV+QZUt1AX3nefZScPPjkr5hMoC18B9ni6/ZYdhRiERPQw+hB+AStonf+iw==;EndpointSuffix=core.windows.net",
-    "BlobContainerName": "doculinks"
-  },
-  "ConnectionStrings": {
-    //"AttachmentConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "AttachmentConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
+    "Deletepath": "DMS_Attachments/Deleted"
   }
 }
-  

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

@@ -5,6 +5,7 @@ using DamageAssesment.Api.DocuLinks.Providers;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using System.Data;
 
 namespace DamageAssesment.Api.DocuLinks.Controllers
 {
@@ -13,7 +14,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
     {
         private readonly IDoculinkProvider documentsProvider;
         private readonly IUploadService uploadService;
-        private readonly IAzureBlobService azureBlobService;
 
         public DoculinkController(IDoculinkProvider documentsProvider, IUploadService uploadService)
         {
@@ -42,9 +42,9 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// Get a Doculink type by id.
         /// </summary>
         [Authorize(Roles = "admin")]
-        [HttpGet]
         [Route("doculinks/types/{id}")]
         [Route("doculinks/types/{id}/{language:alpha}")]
+        [HttpGet]
         public async Task<IActionResult> GetLinkTypeAsync(int id,string? language)
         {
             var result = await this.documentsProvider.GetLinkTypeAsync(id, language);
@@ -206,6 +206,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// Get all active Doculink.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [Route("doculinks/active")]
         [Route("doculinks/active/{linktype:alpha}")]
         [Route("doculinks/active/{linktype:alpha}/{language:alpha}")]
@@ -222,6 +223,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// Get all active Doculink.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [Route("doculinks/active/{linktypeid:int}")]
         [Route("doculinks/active/{linktypeid:int}/{language:alpha}")]
         [HttpGet]
@@ -252,7 +254,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return NotFound();
         }
         /// <summary>
-        /// update existing doclink.
+        /// Upload new document.
         /// </summary>
         [Authorize(Roles = "admin")]
         [HttpPut]
@@ -294,7 +296,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// Create new doclink.
         /// </summary>
-       // [Authorize(Roles = "admin")]
+        [Authorize(Roles = "admin")]
         [HttpPost]
         [Route("doculinks")]
         public async Task<IActionResult> CreateDocument(ReqDoculink documentInfo)
@@ -320,7 +322,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             }
         }
         /// <summary>
-        /// Delete Doculink by id.
+        /// Delete document by id.
         /// </summary>
         [Authorize(Roles = "admin")]
         [HttpDelete]

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DASA_Documents/Active/Document_1.txt

@@ -0,0 +1 @@
+sample

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DASA_Documents/Active/Document_2.txt

@@ -0,0 +1 @@
+sample

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DamageAssesment.Api.DocuLinks.csproj

@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.18.0" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.16.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
@@ -25,10 +25,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
-    <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.DocuLinks.Db
 {
-    [Table("Doculinks")]
     public class Doculink
     {
         [Key]

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
 
 namespace DamageAssesment.Api.DocuLinks.Db
 {
-    [Table("DoculinkAttachments")]
     public class DoculinkAttachments
     {
 

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

@@ -7,15 +7,8 @@ namespace DamageAssesment.Api.DocuLinks.Db
 {
     public class DoculinkDbContext : DbContext
     {
-        private IConfiguration _Configuration { get; set; }
-        public DoculinkDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
+        public DoculinkDbContext(DbContextOptions options) : base(options)
         {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("DoculinkConnection"));
         }
         public DbSet<Db.Doculink> Documents { get; set; }
         public DbSet<Db.LinkType> LinkTypes { get; set; }

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.DocuLinks.Db
 {
-    [Table("DoculinkTrans")]
     public class DoculinkTranslation
     {
         [Key]

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

@@ -1,9 +1,7 @@
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.DocuLinks.Db
 {
-    [Table("DoculinkTypes")]
     public class LinkType
     {
         [Key]

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
 
 namespace DamageAssesment.Api.DocuLinks.Db
 {
-    [Table("DoculinkTypeTrans")]
     public class LinksTranslation
     {
         [Key]

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

@@ -1,14 +1,10 @@
 using Azure.Storage.Blobs.Models;
-using DamageAssesment.Api.DocuLinks.Models;
 
 namespace DamageAssesment.Api.DocuLinks.Interfaces
 {
     public interface IAzureBlobService
     {
         Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files);
-        Task<Models.Doculink> UploadDocument(int counter, ReqDoculink documentInfo);
-        Task<Models.Doculink> UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo);
         void DeleteFile(string path);
-        void Movefile(string path);
     }
 }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Program.cs

@@ -9,16 +9,9 @@ using System.Text;
 using Microsoft.OpenApi.Models;
 
 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
+
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddLogging(builder =>
-{
-    //builder.AddConsole(); // Optional: Add other providers if needed
-    builder.AddFile("logs/DocuLinks-{Date}.txt"); // Specify the file path and format
-});
 builder.Services.AddAuthentication(item =>
 {
     item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
@@ -83,7 +76,7 @@ builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<DoculinkDbContext>(option =>
 {
-    option.UseSqlServer("DoculinkConnection");
+    option.UseInMemoryDatabase("DocumentConnection");
 });
 var app = builder.Build();
 
@@ -93,7 +86,7 @@ if (app.Environment.IsDevelopment())
     app.UseSwagger();
     app.UseSwaggerUI();
 }
-app.UseCors("DamageAppCorsPolicy");
+
 app.UseAuthentication();
 app.UseAuthorization();
 

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Properties/launchSettings.json

@@ -4,6 +4,7 @@
       "commandName": "Project",
       "launchBrowser": true,
       "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5133",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },

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

@@ -1,17 +1,8 @@
 
-using Azure;
 using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Blobs.Specialized;
 using DamageAssesment.Api.DocuLinks.Interfaces;
-using DamageAssesment.Api.DocuLinks.Models;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Configuration;
-using Microsoft.VisualBasic;
-using System.ComponentModel;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DamageAssesment.Api.DocuLinks.Providers
 {
@@ -19,111 +10,11 @@ namespace DamageAssesment.Api.DocuLinks.Providers
     {
         BlobServiceClient _blobClient;
         BlobContainerClient _containerClient;
-        string azureConnectionString;
-        private string uploadpath = "";
-        private string Deletepath = "";
-        public AzureBlobService(IConfiguration configuration)
+        string azureConnectionString = "<Primary Connection String>";
+        public AzureBlobService()
         {
-            uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
-            Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
-            _blobClient = new BlobServiceClient(configuration.GetValue<string>("Fileupload:BlobConnectionString"));
-            _containerClient = _blobClient.GetBlobContainerClient(configuration.GetValue<string>("Fileupload:BlobContainerName"));
-        }
-        public async Task<Models.Doculink> UploadDocument(int counter, ReqDoculink documentInfo)
-        {
-            Models.Doculink Documents = new Models.Doculink();
-            List <Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
-            try
-            {
-                string path = "", UserfileName = "";
-                if (documentInfo.Files != null)
-                {
-
-                    int counter1 = 1;
-                    foreach (var item in documentInfo.Files)
-                    {
-                        if (item.IsAttachments)
-                        {
-                            UserfileName = Path.GetFileName(item.FileName);
-                            var fileName = String.Format("Document_{0}_{1}{2}", counter, counter1, item.FileExtension);
-                            byte[] byteArray = Convert.FromBase64String(item.FileContent);
-                            MemoryStream stream = new MemoryStream(byteArray);
-                            BlobClient client = _containerClient.GetBlobClient(uploadpath + "/" + fileName);
-                            var result = await client.UploadAsync(stream, true);
-                            path = uploadpath + "/" + fileName;
-                            counter1++;
-                        }
-                        else
-                            path = item.url;
-                        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 = true
-                };
-
-                return Documents;
-            }
-            catch (Exception ex)
-            {
-                return new Models.Doculink();
-            }
-
-
-        }
-
-        public async Task<Models.Doculink> UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo)
-        {
-            try
-            {
-                foreach (var item in document.doclinksAttachments)
-                {
-                     Movefile(item.Path);
-                }
-                string path = "", UserfileName = "";
-                List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
-                int counter1 = 1;
-                foreach (var item in documentInfo.Files)
-                {
-                    if (item.IsAttachments)
-                    {
-                        UserfileName = Path.GetFileName(item.FileName);
-                        var fileName = String.Format("Document_{0}_{1}{2)", document.Id, counter1, item.FileExtension);
-                        byte[] byteArray = Encoding.UTF8.GetBytes(item.FileContent);
-                        MemoryStream stream = new MemoryStream(byteArray);
-                        BlobClient client = _containerClient.GetBlobClient(uploadpath + "/" + fileName);
-                        path = uploadpath + "/" + fileName;
-                        var result = await client.UploadAsync(stream, true);
-                        counter1++;
-                    }
-                    else
-                        path = item.url;
-                    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 = true,
-                    IsDeleted = false,
-                    CustomOrder = documentInfo.CustomOrder,
-                    doclinksAttachments = attachments
-                };
-
-                return Documents;
-            }
-
-            catch (Exception ex)
-            {
-                return new Models.Doculink();
-            }
+            _blobClient = new BlobServiceClient(azureConnectionString);
+            _containerClient = _blobClient.GetBlobContainerClient("apiimages");
         }
 
         public async Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files)
@@ -144,52 +35,10 @@ namespace DamageAssesment.Api.DocuLinks.Providers
 
             return azureResponse;
         }
-        public string getMovefilename(string movefilename)
-        {
-            var list = movefilename.Split('.');
-            if (list.Length > 0)
-                list[list.Length - 1] = DateTime.Now.ToShortDateString().Replace("/", "_") +"_"+ DateTime.Now.ToShortTimeString().Replace("/", "_")+"." + list[list.Length - 1];
-            return string.Join("_", list);
-        }
-        public void Movefile(string path)
-        {
-            try
-            {
-                if (path != "")
-                {
-                    string MovePath = getMovefilename(path.Replace(uploadpath, Deletepath));
-                    // Get references to the source and destination blobs
-                    BlobClient sourceBlobClient = _containerClient.GetBlobClient(path);
-                    BlobClient destinationBlobClient = _containerClient.GetBlobClient(MovePath);
-                    // Start the copy operation from the source to the destination
-                     destinationBlobClient.StartCopyFromUri(sourceBlobClient.Uri);
-
-                    // Check if the copy operation completed successfully
-                     WaitForCopyToComplete(destinationBlobClient);
-
-                    // Delete the source blob after a successful copy
-                     sourceBlobClient.DeleteIfExists();
-                }
-            }
-            catch(Exception ex)
-            {
-
-            }
-        }
-        static void  WaitForCopyToComplete(BlobClient blobClient)
-        {
-            BlobProperties properties =  blobClient.GetProperties();
-
-            while (properties.CopyStatus == CopyStatus.Pending)
-            {
-                 Task.Delay(TimeSpan.FromSeconds(1));
-                properties =  blobClient.GetProperties();
-            }
-        }
         public void DeleteFile(string url)
         {
-            BlobClient sourceBlobClient = _containerClient.GetBlobClient(url);
-            sourceBlobClient.DeleteIfExists();
+            var blob = _containerClient.GetBlockBlobClient(url);
+            blob.DeleteIfExists();
         }
     }
 }

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

@@ -24,12 +24,11 @@ namespace DamageAssesment.Api.DocuLinks.Providers
         private DoculinkDbContext DocumentDbContext;
         private ILogger<DoculinkProvider> logger;
         private IUploadService uploadservice;
-        private IAzureBlobService azureBlobService;
         private IMapper mapper;
         private readonly IHttpContextAccessor httpContextAccessor;
         private string baseUrl;
 
-        public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice, IAzureBlobService azureBlobService, IHttpContextAccessor httpContextAccessor)
+        public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice, IHttpContextAccessor httpContextAccessor)
         {
             this.DocumentDbContext = DocumentDbContext;
             this.logger = logger;
@@ -38,13 +37,12 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             this.httpContextAccessor = httpContextAccessor;
             baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}";
             baseUrl = baseUrl + "/doculinks/download";
-            this.azureBlobService = azureBlobService;
-            //SeedData();
+            SeedData();
         }
 
 
 
-        private async Task SeedDataAsync()
+        private void SeedData()
         {
             if (!DocumentDbContext.LinkTypes.Any())
             {

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

@@ -116,16 +116,15 @@ namespace DamageAssesment.Api.DocuLinks.Providers
 
                 string path = "", UserfileName = "";
                 List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
-                int counter1 = 1;
                 foreach (var item in documentInfo.Files)
                 {
+                    counter++;
                     if (item.IsAttachments)
                     {
                         UserfileName = Path.GetFileName(item.FileName+item.FileExtension);
-                        var fileName = String.Format("Document_{0}{1}", counter1, item.FileExtension);
+                        var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
                         path = Path.Combine(fullDirectoryPath, fileName);
                         File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
-                        counter1++;
                     }
                     else
                         path = item.url;

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/appsettings.json

@@ -1,7 +1,4 @@
 {
-  "JwtSettings": {
-    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
-  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",
@@ -9,15 +6,12 @@
     }
   },
   "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"DoculinkConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "DoculinkConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
+  "JwtSettings": {
+    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
   },
   "Fileupload": {
     "folderpath": "DASA_Documents/Active",
-    "Deletepath": "DASA_Documents/Deleted",
-    "BlobConnectionString": "DefaultEndpointsProtocol=https;AccountName=damagedoculink;AccountKey=blynpwrAQtthEneXC5f4vFewJ3tPV+QZUt1AX3nefZScPPjkr5hMoC18B9ni6/ZYdhRiERPQw+hB+AStonf+iw==;EndpointSuffix=core.windows.net",
-    "BlobContainerName": "doculinks"
+    "Deletepath": "DASA_Documents/Deleted"
   }
 }
+

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

@@ -12,22 +12,9 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
-    <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

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

@@ -1,9 +1,7 @@
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Employees.Db
 {
-    [Table("Employees")]
     public class Employee
     {
         [Key]

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

@@ -4,23 +4,18 @@ namespace DamageAssesment.Api.Employees.Db
 {
     public class EmployeeDbContext: DbContext
     {
-        private IConfiguration _Configuration { get; set; }
-        public EmployeeDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
+        public DbSet<Db.Employee> Employees { get; set; }
+        public EmployeeDbContext(DbContextOptions options) : base(options)
         {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("EmployeeConnection"));
         }
+
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             base.OnModelCreating(modelBuilder);
+
             modelBuilder.Entity<Employee>()
                 .Property(item => item.Id)
                 .ValueGeneratedOnAdd();
         }
-        public DbSet<Db.Employee> Employees { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Employees/Program.cs

@@ -9,16 +9,9 @@ using System.Reflection;
 using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
+
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddLogging(builder =>
-{
-    //builder.AddConsole(); // Optional: Add other providers if needed
-    builder.AddFile("logs/Employees-{Date}.txt"); // Specify the file path and format
-});
 builder.Services.AddAuthentication(item =>
 {
     item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
@@ -82,7 +75,7 @@ builder.Services.AddScoped<IEmployeesProvider, EmployeesProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<EmployeeDbContext>(option =>
 {
-    option.UseSqlServer("EmployeeConnection");
+    option.UseInMemoryDatabase("Employees");
 });
 
 var app = builder.Build();
@@ -100,7 +93,7 @@ if (app.Environment.IsDevelopment())
         employeesProvider.SeedData();
     }
 }
-app.UseCors("DamageAppCorsPolicy");
+
 app.UseAuthentication();
 app.UseAuthorization();
 

DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.json

@@ -8,10 +8,5 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"EmployeeConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "EmployeeConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
-  }
+  "AllowedHosts": "*"
 }

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

@@ -11,24 +11,10 @@
 
   <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" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
-    <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Locations.Db
 {
-    [Table("Locations")]
     public class Location
     {
         [Key]

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

@@ -4,16 +4,6 @@ namespace DamageAssesment.Api.Locations.Db
 {
     public class LocationDbContext : DbContext
     {
-        private IConfiguration _Configuration { get; set; }
-        public LocationDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
-        {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("LocationConnection"));
-        }
         public DbSet<Db.Location> Locations { get; set; }
         public DbSet<Db.Region> Regions { get; set; }
         public LocationDbContext(DbContextOptions options) : base(options)

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

@@ -1,9 +1,7 @@
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Locations.Db
 {
-    [Table("Regions")]
     public class Region
     {
         [Key]

DamageAssesmentApi/DamageAssesment.Api.Locations/Program.cs

@@ -9,16 +9,9 @@ using System.Reflection;
 using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
+
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddLogging(builder =>
-{
-    //builder.AddConsole(); // Optional: Add other providers if needed
-    builder.AddFile("logs/Locations-{Date}.txt"); // Specify the file path and format
-});
 builder.Services.AddAuthentication(item =>
 {
     item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
@@ -81,7 +74,7 @@ builder.Services.AddScoped<IRegionsProvider, RegionsProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<LocationDbContext>(option =>
 {
-    option.UseSqlServer("LocationConnection");
+    option.UseInMemoryDatabase("Locations");
 });
 
 
@@ -103,7 +96,7 @@ if (app.Environment.IsDevelopment())
         regionProvider.SeedData();
     }
 }
-app.UseCors("DamageAppCorsPolicy");
+
 app.UseAuthentication();
 app.UseAuthorization();
 

DamageAssesmentApi/DamageAssesment.Api.Locations/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

DamageAssesmentApi/DamageAssesment.Api.Locations/appsettings.json

@@ -8,10 +8,5 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"LocationConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "LocationConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
-  }
+  "AllowedHosts": "*"
 }

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

@@ -11,24 +11,10 @@
 
   <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" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
-    <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
 
 namespace DamageAssesment.Api.Questions.Db
 {
-    [Table("QuestionCategoryTrans")]
     public class CategoryTranslation
     {
         [Key]

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Questions.Db
 {
-    [Table("Questions")]
     public class Question
     {
         [Key]

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

@@ -1,10 +1,8 @@
 using System.Buffers.Text;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Questions.Db
 {
-    [Table("QuestionCategories")]
     public class QuestionCategory
     {
         [Key]

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

@@ -6,16 +6,6 @@ namespace DamageAssesment.Api.Questions.Db
 {
     public class QuestionDbContext : DbContext
     {
-        private IConfiguration _Configuration { get; set; }
-        public QuestionDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
-        {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("QuestionConnection"));
-        }
         public DbSet<Db.Question> Questions { get; set; }
         public DbSet<Db.QuestionType> QuestionTypes { get; set; }
         public DbSet<Db.QuestionsTranslation> QuestionsTranslations { get; set; }

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

@@ -1,9 +1,7 @@
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Questions.Db
 {
-    [Table("QuestionTypes")]
     public class QuestionType
     {
         [Key]

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Questions.Db
 {
-    [Table("QuestionTrans")]
     public class QuestionsTranslation
     {
         [Key]

DamageAssesmentApi/DamageAssesment.Api.Questions/Program.cs

@@ -9,14 +9,6 @@ using System.Reflection;
 using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-builder.Services.AddLogging(builder =>
-{
-    //builder.AddConsole(); // Optional: Add other providers if needed
-    builder.AddFile("logs/Questions-{Date}.txt"); // Specify the file path and format
-});
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
 builder.Services.AddAuthentication(item =>
@@ -84,7 +76,7 @@ builder.Services.AddSwaggerGen(options =>
 
 builder.Services.AddDbContext<QuestionDbContext>(option =>
 {
-    option.UseSqlServer("QuestionConnection");
+    option.UseInMemoryDatabase("Questions");
 });
 var app = builder.Build();
 
@@ -101,7 +93,6 @@ if (app.Environment.IsDevelopment())
         questionProvider.SeedData();
     }
 }
-app.UseCors("DamageAppCorsPolicy");
 app.UseAuthentication();
 app.UseAuthorization();
 

DamageAssesmentApi/DamageAssesment.Api.Questions/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

DamageAssesmentApi/DamageAssesment.Api.Questions/appsettings.json

@@ -8,10 +8,5 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"QuestionConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "QuestionConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
-  }
+  "AllowedHosts": "*"
 }

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

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

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/MockData.cs

@@ -89,6 +89,5 @@ namespace DamageAssesment.Api.Questions.Test
               Questions.Add(question);
             return Questions;
         }
-
     }
 }

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/QuestionsServiceTest.cs

@@ -356,5 +356,6 @@ namespace DamageAssesment.Api.Questions.Test
 
             Assert.Equal(404, result.StatusCode);
         }
+
     }
 }

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

@@ -11,30 +11,13 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
-    <PackageReference Include="ClosedXML" Version="0.102.1" />
-    <PackageReference Include="EPPlus" Version="6.2.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.9" />
+    <PackageReference Include="EPPlus" Version="7.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Responses.Db
 {
-    [Table("SurveyResponses")]
     public class SurveyResponse
     {
         [Key]

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

@@ -4,18 +4,13 @@ namespace DamageAssesment.Api.Responses.Db
 {
     public class SurveyResponseDbContext:DbContext
     {
-        private IConfiguration _Configuration { get; set; }
-        public SurveyResponseDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
-        {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("ResponsesConnection"));
-        }
         public DbSet<Db.SurveyResponse> SurveyResponses { get; set; }
 
+        public SurveyResponseDbContext(DbContextOptions options) : base(options)
+        {
+
+        }
+
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             base.OnModelCreating(modelBuilder);

DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs

@@ -16,14 +16,7 @@ const int intervalToRetry = 2; //2 seconds
 const int maxRetryForCircuitBraker = 5;
 const int intervalForCircuitBraker = 5; //5 seconds
 
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-builder.Services.AddLogging(builder =>
-{
-    //builder.AddConsole(); // Optional: Add other providers if needed
-    builder.AddFile("logs/Responses-{Date}.txt"); // Specify the file path and format
-});
+
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
 builder.Services.AddAuthentication(item =>
@@ -55,8 +48,8 @@ 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.AddHttpContextAccessor();
+builder.Services.AddScoped<IExcelExportService, ExcelExportService>();
 
 builder.Services.AddHttpClient<IHttpUtil, HttpUtil>().
     AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
@@ -103,7 +96,7 @@ builder.Services.AddSwaggerGen(options =>
 });
 builder.Services.AddDbContext<SurveyResponseDbContext>(option =>
 {
-    option.UseSqlServer("ResponsesConnection");
+    option.UseInMemoryDatabase("Responses");
 });
 var app = builder.Build();
 
@@ -113,7 +106,7 @@ if (app.Environment.IsDevelopment())
     app.UseSwagger();
     app.UseSwaggerUI();
 }
-app.UseCors("DamageAppCorsPolicy");
+
 app.UseAuthentication();
 app.UseAuthorization();
 

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

@@ -1,8 +1,8 @@
-using ClosedXML.Excel;
-using DamageAssesment.Api.Responses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
 using DamageAssesment.Api.Responses.Models;
 using OfficeOpenXml;
 using System.Collections.Generic;
+using System.ComponentModel;
 
 namespace DamageAssesment.Api.Responses.Providers
 {
@@ -10,7 +10,7 @@ namespace DamageAssesment.Api.Responses.Providers
     {
         public byte[] ExportToExcel<T1>(List<object> responses)
         {
-            ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+            ExcelPackage.LicenseContext = OfficeOpenXml.LicenseContext.NonCommercial;
             using (var package = new ExcelPackage())
             {
                 // Create the first worksheet and populate it with responses

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

@@ -82,7 +82,7 @@ namespace DamageAssesment.Api.Responses.Providers
                 }
                 listSurveyResponse = listSurveyResponse
                .OrderByDescending(obj => obj.Id)
-               .GroupBy(obj => new { obj.SurveyId,  obj.LocationId })//obj.EmployeeId,
+               .GroupBy(obj => new { obj.SurveyId, obj.EmployeeId, obj.LocationId })
                .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups
                .ToList();
                 if (listSurveyResponse.Any())
@@ -443,6 +443,7 @@ namespace DamageAssesment.Api.Responses.Providers
                 var answersList = await answerServiceProvider.getAnswersAsync(token);
                 if (answersList == null || !answersList.Any())
                     return null;
+
                 //get all the answers for the particular survey
                 var surveyAnswers = answersList.Join(
                                        surveyResponses,
@@ -538,14 +539,14 @@ namespace DamageAssesment.Api.Responses.Providers
                     surveyResponse.LocationId,
                     surveyResponse.EmployeeId,
                     surveyResponse.ClientDevice,
-                  //  surveyResponse.KeyAnswerResult,
+                    surveyResponse.KeyAnswerResult,
                     surveyResponse.Longitute,
                     surveyResponse.Latitude,
                     Employee = employee,
                     answers = from ans in answers
                               select new
                               {
-                                //  ans.QuestionId,
+                                  ans.QuestionId,
                                   ans.Id,
                                   ans.AnswerText,
                                   ans.Comment,
@@ -581,11 +582,6 @@ namespace DamageAssesment.Api.Responses.Providers
                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid).ToListAsync();
                     employee = await employeeServiceProvider.getEmployeeAsync(employeeid, token);
                 }
-                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(token);
                 var questions = await questionServiceProvider.getQuestionsAsync(null, token);
@@ -602,16 +598,16 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.LocationId,
                                  r.EmployeeId,
                                  r.ClientDevice,
-                                // r.KeyAnswerResult,
+                                 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(),
+                                 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(),
@@ -654,11 +650,7 @@ namespace DamageAssesment.Api.Responses.Providers
                     }
                 }
 
-                surveyResonses = surveyResonses
-                .OrderByDescending(obj => obj.Id)
-                .GroupBy(obj => new { obj.SurveyId, obj.EmployeeId, obj.LocationId })
-                .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups
-                .ToList();
+
                 var answers = await answerServiceProvider.getAnswersAsync(token);
                 var questions = await questionServiceProvider.getQuestionsAsync(null,token);
                 var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
@@ -671,16 +663,16 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.LocationId,
                                  r.EmployeeId,
                                  r.ClientDevice,
-                               //  r.KeyAnswerResult,
+                                 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(),
+                                 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(),
@@ -919,11 +911,7 @@ namespace DamageAssesment.Api.Responses.Providers
                         _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
                     }
                 }
-                surveyResonses = surveyResonses
-                .OrderByDescending(obj => obj.Id)
-                .GroupBy(obj => new { obj.SurveyId,  obj.LocationId }) //obj.EmployeeId,
-                .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups
-                .ToList();
+
                 var answers = await answerServiceProvider.getAnswersAsync(token);
                 var questions = await questionServiceProvider.getQuestionsAsync(null,token);
                 var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
@@ -937,16 +925,16 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.LocationId,
                                  r.EmployeeId,
                                  r.ClientDevice,
-                               //  r.KeyAnswerResult,
+                                 r.KeyAnswerResult,
                                  r.Longitute,
                                  r.Latitude,
-                               //  Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 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,
@@ -989,11 +977,7 @@ namespace DamageAssesment.Api.Responses.Providers
                         _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
                     }
                 }
-                surveyResponses = surveyResponses
-                .OrderByDescending(obj => obj.Id)
-                .GroupBy(obj => new { obj.SurveyId, obj.LocationId })//, obj.EmployeeId
-                .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups
-                .ToList();
+
                 //var surveyResponses = await surveyResponseDbContext.Responses.Where(x => x.SurveyId == survey.Id).ToListAsync();
                 // var employees = await employeeServiceProvider.getEmployeesAsync();
                 var answers = await answerServiceProvider.getAnswersAsync(token);
@@ -1007,10 +991,10 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.LocationId,
                                  r.EmployeeId,
                                  r.ClientDevice,
-                                // r.KeyAnswerResult,
+                                 r.KeyAnswerResult,
                                  r.Longitute,
                                  r.Latitude,
-                               //  Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 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
@@ -1018,7 +1002,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

@@ -1,6 +1,7 @@
 using DamageAssesment.Api.Responses.Interfaces;
 using DamageAssesment.Api.Responses.Models;
 using Newtonsoft.Json;
+using OfficeOpenXml.FormulaParsing.LexicalAnalysis;
 
 namespace DamageAssesment.Api.Responses.Services
 {

DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.json

@@ -9,10 +9,6 @@
   "JwtSettings": {
     "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
   },
-  "ConnectionStrings": {
-    //"ResponsesConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "ResponsesConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-  },
   //"EndPointSettings": {
   //  "AnswerUrlBase": "http://localhost:5200",
   //  "LocationUrlBase": "http://localhost:5213",
@@ -22,6 +18,7 @@
   //  "AttachmentUrlBase": "http://localhost:5243",
   //  "SurveyUrlBase": "http://localhost:5009"
   //},
+  //Endpoints for docker-container  
   "EndPointSettings": {
     "AnswerUrlBase": "http://damageassesment.api.answers:80",
     "LocationUrlBase": "http://damageassesment.api.locations:80",
@@ -30,7 +27,6 @@
     "AttachmentUrlBase": "http://damageassesment.api.attachments:80",
     "SurveyUrlBase": "http://damageassesment.api.surveys:80"
   },
-
   "RessourceSettings": {
     "Employee": "/employees",
     "EmployeeById": "/employees/{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

@@ -29,38 +29,7 @@ namespace DamageAssesment.Api.Surveys.Controllers
             }
             return NoContent();
         }
-        /// <summary>
-        /// GET request for retrieving all active surveys.
-        /// </summary>
-        [Authorize(Roles = "admin,survey,user,report")]
-        [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>
-        [Authorize(Roles = "admin,survey,user,report")]
-        [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

@@ -11,24 +11,10 @@
 
   <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" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
-    <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
 
 namespace DamageAssesment.Api.Surveys.Db
 {
-    [Table("SurveyTrans")]
     public class SurveyTranslation
     {
         [Key]

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

@@ -4,18 +4,11 @@ namespace DamageAssesment.Api.Surveys.Db
 {
     public class SurveysDbContext : DbContext
     {
-        private IConfiguration _Configuration { get; set; }
-        public SurveysDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
-        {
-            _Configuration = configuration;
-        }
-        
         public DbSet<Db.Survey> Surveys { get; set; }
         public DbSet<Db.SurveyTranslation> SurveysTranslation { get; set; }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
+        public SurveysDbContext(DbContextOptions options) : base(options)
         {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("SurveyConnection"));
+
         }
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {

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/Program.cs

@@ -9,14 +9,7 @@ using System.Reflection;
 using Microsoft.OpenApi.Models;
 
 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-builder.Services.AddLogging(builder =>
-{
-    //builder.AddConsole(); // Optional: Add other providers if needed
-    builder.AddFile("logs/Surveys-{Date}.txt"); // Specify the file path and format
-});
+
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
 builder.Services.AddAuthentication(item =>
@@ -82,7 +75,7 @@ builder.Services.AddSwaggerGen(options =>
 
 builder.Services.AddDbContext<SurveysDbContext>(option =>
 {
-    option.UseSqlServer("SurveyConnection");
+    option.UseInMemoryDatabase("Surveys");
 });
 var app = builder.Build();
 
@@ -100,7 +93,6 @@ if (app.Environment.IsDevelopment())
     }
 }
 
-app.UseCors("DamageAppCorsPolicy");
 app.UseAuthentication();
 app.UseAuthorization();
 

DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs

@@ -101,43 +101,6 @@ namespace DamageAssesment.Api.Surveys.Providers
                 return SurveyStatus.INACTIVE.ToString();
             }
         }
-
-        // Method to get surveys asynchronously with multi-language support
-        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanSurvey> Surveys, string ErrorMessage)> GetActiveSurveysAsync(bool IsActive,string language)
-        {
-            IEnumerable<Models.MultiLanSurvey> surveysList = null;
-            try
-            {
-                string status = SurveyStatus.ACTIVE.ToString();
-                if(!IsActive) status = SurveyStatus.INACTIVE.ToString();
-                logger?.LogInformation("Get all Surveys from DB");
-                //checking is enabled in survey response 
-                var surveys = await surveyDbContext.Surveys.ToListAsync();//Where(s => s.IsEnabled == true)
-
-                if (surveys != null)
-                {
-                    surveysList = from s in surveys
-                                  select new Models.MultiLanSurvey
-                                  {
-                                      Id = s.Id,
-                                      StartDate = s.StartDate,
-                                      EndDate = s.EndDate,
-                                      IsEnabled = s.IsEnabled,
-                                      CreatedDate = s.CreatedDate,
-                                      Status = GetStatus(s.StartDate, s.EndDate),
-                                      Titles = CreateMultiLanguageObject(GetSurveyTranslations(s.Id, null, language))
-                                  };
-                    logger?.LogInformation($"{surveys.Count} Items(s) found");
-                    return (true, surveysList.Where(a=>a.Status==status).OrderByDescending(a=>a.Id), null);
-                }
-                return (false, null, "Not found");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
         // Method to get surveys asynchronously with multi-language support
         public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanSurvey> Surveys, string ErrorMessage)> GetSurveysAsync(string language)
         {
@@ -147,6 +110,7 @@ namespace DamageAssesment.Api.Surveys.Providers
                 logger?.LogInformation("Get all Surveys from DB");
                 //checking is enabled in survey response 
                 var surveys = await surveyDbContext.Surveys.ToListAsync();//Where(s => s.IsEnabled == true)
+
                 if (surveys != null)
                 {
                     surveysList = from s in surveys

DamageAssesmentApi/DamageAssesment.Api.Surveys/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

DamageAssesmentApi/DamageAssesment.Api.Surveys/appsettings.json

@@ -8,10 +8,5 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"SurveyConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "SurveyConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
-  }
+  "AllowedHosts": "*"
 }

DamageAssesmentApi/DamageAssesment.Api.UsersAccess.Test/UsersAccessTest.cs

@@ -18,9 +18,9 @@ namespace DamageAssesment.Api.UsersAccess.Test
         public async Task GetTokenAsync_ShouldReturnStatusCode200()
         {
             var response = await MockData.getTokenResponse(true,null);
-            mockService.Setup(service => service.AuthenticateAsync()).ReturnsAsync(response);
+            mockService.Setup(service => service.AuthenticateAsync("Emp1")).ReturnsAsync(response);
             var controller = new UsersAccessController(mockService.Object);
-            var result = (OkObjectResult)await controller.AuthenticateAsync();
+            var result = (OkObjectResult)await controller.AuthenticateAsync("Emp1");
             Assert.Equal(200, result.StatusCode);
         }
 
@@ -28,9 +28,9 @@ namespace DamageAssesment.Api.UsersAccess.Test
         public async Task GetTokenAsync_ShouldReturnStatusCode401()
         {
             var response = await MockData.getTokenResponse(false, null);
-            mockService.Setup(service => service.AuthenticateAsync()).ReturnsAsync(response);
+            mockService.Setup(service => service.AuthenticateAsync("Emp1")).ReturnsAsync(response);
             var controller = new UsersAccessController(mockService.Object);
-            var result = (UnauthorizedObjectResult)await controller.AuthenticateAsync();
+            var result = (UnauthorizedObjectResult)await controller.AuthenticateAsync("Emp1");
             Assert.Equal(401, result.StatusCode);
         }
 

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Controllers/UsersAccessController.cs

@@ -8,17 +8,27 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
     [ApiController]
     public class UsersAccessController : ControllerBase
     {
-        private readonly IUsersAccessProvider userAccessProvider;
+        private IUsersAccessProvider userAccessProvider;
 
         public UsersAccessController(IUsersAccessProvider userAccessProvider)
         {
             this.userAccessProvider = userAccessProvider;
         }
-        [HttpPost("dadeschools/token")]
-        public async Task<ActionResult> DadeSchoolAuthenticateAsync(UserCredentials userCredentials)
+        [HttpPost("dadeschooltoken")]
+        public async Task<ActionResult> DadeSchoolAuthenticateAsync(string username, string password)
         {
-            var result = await userAccessProvider.AuthenticateAsync(userCredentials.username, userCredentials.password);
-
+            var result = await userAccessProvider.DadeSchoolAuthenticateAsync(username, password);
+            if (result.IsSuccess)
+            {
+                return Ok(result.TokenResponse);
+            }
+            return Unauthorized(result.ErrorMessage);
+        }
+        [Authorize(Policy = "Dadeschools")]
+        [HttpPost("token/{employecode}")]
+        public async Task<ActionResult> AuthenticateAsync(string employecode)
+        {
+              var result = await userAccessProvider.AuthenticateAsync(employecode);
               if (result.IsSuccess)
               {
                   return Ok(result.TokenResponse);
@@ -27,19 +37,7 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
         }
 
         [Authorize(Policy = "Dadeschools")]
-        [HttpGet("damageapp/token")]
-        public async Task<ActionResult> AuthenticateAsync()
-        {
-            var result = await userAccessProvider.AuthenticateAsync();
-            if (result.IsSuccess)
-            {
-                return Ok(result.TokenResponse);
-            }
-            return Unauthorized(result.ErrorMessage);
-        }
-
-        [Authorize(Policy = "Dadeschools")]
-        [HttpPost("damageapp/refreshtoken")]
+        [HttpPost("refreshtoken")]
         public async Task<ActionResult> RefreshTokenAsync(TokenResponse tokenResponse)
         {
             var result = await userAccessProvider.RefreshTokenAsync(tokenResponse);
@@ -62,7 +60,7 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
             return NoContent();
         }
 
-       // [Authorize(Policy = "DamageApp", Roles = "admin")]
+        [Authorize(Policy = "DamageApp", Roles = "admin")]
         [HttpGet("users/{Id}")]
         public async Task<ActionResult> GetUsersAsync(int Id)
         {
@@ -74,7 +72,7 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
             return NotFound();
         }
 
-        //[Authorize(Policy = "DamageApp", Roles = "admin")]
+        [Authorize(Policy = "DamageApp", Roles = "admin")]
         [HttpGet("roles")]
         public async Task<ActionResult> GetRolesAsync()
         {
@@ -85,7 +83,7 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
             }
             return NoContent();
         }
-        //[Authorize(Policy = "DamageApp", Roles = "admin")]
+        [Authorize(Policy = "DamageApp", Roles = "admin")]
         [HttpPost("users")]
         public async Task<ActionResult> PostUserAsync(User user)
         {
@@ -97,7 +95,7 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
             return BadRequest(result.ErrorMessage);
         }
 
-        //[Authorize(Policy = "DamageApp", Roles = "admin")]
+        [Authorize(Policy = "DamageApp", Roles = "admin")]
         [HttpPut("users/{Id}")]
         public async Task<ActionResult> PutUserAsync(int Id, User user)
         {

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/DamageAssesment.Api.UsersAccess.csproj

@@ -12,25 +12,12 @@
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.10" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.21.0" />
   </ItemGroup>
 
 </Project>

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Db/UsersAccessDbContext.cs

@@ -1,5 +1,4 @@
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
 
 namespace DamageAssesment.Api.UsersAccess.Db
 {
@@ -8,15 +7,9 @@ namespace DamageAssesment.Api.UsersAccess.Db
         public DbSet<Db.User> Users { get; set; }
         public DbSet<Db.Role> Roles { get; set; }
         public DbSet<Db.Token> Tokens { get; set; }
-        private IConfiguration _Configuration { get; set; }
-        public UsersAccessDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
+        public UsersAccessDbContext(DbContextOptions options) : base(options)
         {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("UsersAccessConnection"));
+
         }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/IEmployeeServiceProvider.cs

@@ -1,10 +1,10 @@
-using DamageAssesment.Api.UsersAccess.Models;
+using DamageAssesment.Api.UsersAccess.Models;
 
 namespace DamageAssesment.Api.UsersAccess.Interfaces
 {
     public interface IEmployeeServiceProvider
     {
-        Task<List<Employee>> getEmployeesAsync(string token);
-        Task<Employee> getEmployeeAsync(int employeeId, string token);
+        Task<List<Employee>> getEmployeesAsync();
+        Task<Employee> getEmployeeAsync(int employeeId);
     }
 }

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/IHttpUtil.cs

@@ -0,0 +1,9 @@
+using DamageAssesment.Api.UsersAccess.Models;
+
+namespace DamageAssesment.Api.UsersAccess.Interfaces 
+{ 
+    public interface IHttpUtil
+    {
+        Task<string> SendAsync(HttpMethod method, string url, string JsonInput);
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/ITokenServiceProvider.cs

@@ -7,7 +7,5 @@ namespace DamageAssesment.Api.UsersAccess.Interfaces
     {
         Task<string> GenerateToken(Models.User user);
         Task<TokenResponse> TokenAuthenticate(Models.User user, Claim[] claims);
-
-        Task<string> ConvertJsonToDadeSchoolsJwt(string json);
     }
 }

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/IUsersAccessProvider.cs

@@ -4,15 +4,14 @@ namespace DamageAssesment.Api.UsersAccess.Interfaces
 {
     public interface IUsersAccessProvider
     {
-       public Task<(bool IsSuccess, IEnumerable<object> Users, string ErrorMessage)> GetUsersAsync();
-        public Task<(bool IsSuccess, object User, string ErrorMessage)> GetUsersAsync(int Id);
+       public Task<(bool IsSuccess, IEnumerable< Models.User> Users, string ErrorMessage)> GetUsersAsync();
+        public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> GetUsersAsync(int Id);
         public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> PostUserAsync(Models.User User);
         public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> PutUserAsync(int Id,Models.User User);
         public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> DeleteUserAsync(int Id);
         public Task<(bool IsSuccess, IEnumerable<Models.Role> Roles, string ErrorMessage)> GetRolesAsync();
-        public  Task<(bool IsSuccess, Models.TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync();
-        public Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> AuthenticateAsync(string username, string password);
-
+        public  Task<(bool IsSuccess, Models.TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync(string employeCode);
+        public Task<(bool IsSuccess, Models.DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password);
         public Task<(bool IsSuccess, Models.TokenResponse TokenResponse, string ErrorMessage)>RefreshTokenAsync(TokenResponse tokenResponse);
         public void seedData();
     }

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/Interface.cs

@@ -1,7 +0,0 @@
-namespace DamageAssesment.Api.UsersAccess.Interfaces
-{
-    public interface IHttpUtil
-    {
-        Task<string> SendAsync(HttpMethod method, string url, string JsonInput, string token);
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Models/FakeToken.cs

@@ -1,19 +0,0 @@
-namespace DamageAssesment.Api.UsersAccess.Models
-{
-    public class FakeToken
-    {
-        public long nbf { get; set; }
-        public long exp { get; set; }
-        public string iss { get; set; } = "https://dev-graph.dadeschools.net";
-        public string aud { get; set; } = "damage_assessment";
-        public long iat { get; set; }
-        public string at_hash { get; set; } = "Mw4sAsR_U3MfpqsffDhAqg";
-        public string s_hash { get; set; } = "xADDtg6lVxAXUIFK8hm0Iw";
-        public string sid { get; set; } = "A5EE26B57C27F28ADFEA8C021BB7C4F1";
-        public string sub { get; set; }
-        public long auth_time { get; set; }
-        public string idp { get; set; } = "Dadeschools";
-        public string[] amr { get; set; } = {"external"};
-
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Models/UserCredentials.cs

@@ -1,5 +1,5 @@
 public class UserCredentials
 {
     public string username { get; set; }
-    public string password { get; set; }
+   // public string? password { get; set; }
 }

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Program.cs

@@ -17,18 +17,9 @@ const int maxRetryForCircuitBraker = 5;
 const int intervalForCircuitBraker = 5; //5 seconds
 
 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build =>
-{
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-builder.Services.AddLogging(builder =>
-{
-    //builder.AddConsole(); // Optional: Add other providers if needed
-    builder.AddFile("logs/UserAccess-{Date}.txt"); // Specify the file path and format
-});
+
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-var mode = builder.Configuration.GetValue<string>("ModeSettings:mode");
 
 
 builder.Services.AddAuthentication().
@@ -59,27 +50,22 @@ builder.Services.AddAuthorization(options =>
         .RequireAuthenticatedUser()
         .AddAuthenticationSchemes("DamageApp")
         .Build();
-
-    var DadeschoolsPolicy = new AuthorizationPolicyBuilder().RequireAuthenticatedUser()
+    var DadeschoolsPolicy = new AuthorizationPolicyBuilder()
+        .RequireAuthenticatedUser()
         .AddAuthenticationSchemes("Dadeschools")
         .Build();
-
-    var DadeschoolsPolicyOffline = new AuthorizationPolicyBuilder().RequireAssertion(_ => true)
-                   .Build();
-
     var allPolicy = new AuthorizationPolicyBuilder()
         .RequireAuthenticatedUser()
         .AddAuthenticationSchemes("DamageApp", "Dadeschools")
         .Build();
     options.AddPolicy("DamageApp", DamageAppPolicy);
-    options.AddPolicy("Dadeschools", mode == "online" ? DadeschoolsPolicy : DadeschoolsPolicyOffline);
+    options.AddPolicy("Dadeschools", DadeschoolsPolicy);
     options.AddPolicy("AllPolicies", allPolicy);
     options.DefaultPolicy = options.GetPolicy("DamageApp")!;
 });
 
 var _jwtsettings = builder.Configuration.GetSection("JwtSettings");
 builder.Services.Configure<JwtSettings>(_jwtsettings);
-builder.Services.AddHttpContextAccessor();
 
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
@@ -135,7 +121,7 @@ builder.Services.AddSwaggerGen(options =>
 
 builder.Services.AddDbContext<UsersAccessDbContext>(option =>
 {
-    option.UseSqlServer("UsersAccessConnection");
+    option.UseInMemoryDatabase("UsersAccess");
 });
 var app = builder.Build();
 
@@ -153,7 +139,6 @@ if (app.Environment.IsDevelopment())
     }
 }
 
-app.UseCors("DamageAppCorsPolicy");
 app.UseAuthentication();
 app.UseAuthorization();
 

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Providers/UserAccessProvider.cs

@@ -2,19 +2,15 @@
 using DamageAssesment.Api.UsersAccess.Db;
 using DamageAssesment.Api.UsersAccess.Interfaces;
 using DamageAssesment.Api.UsersAccess.Models;
-using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System.Data;
 using Newtonsoft.Json;
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using System.Text;
 
-
 namespace DamageAssesment.Api.UsersAccess.Providers
 {
     public class UsersAccessProvider : IUsersAccessProvider
@@ -22,100 +18,55 @@ namespace DamageAssesment.Api.UsersAccess.Providers
         private readonly UsersAccessDbContext userAccessDbContext;
         private readonly ILogger<UsersAccessProvider> logger;
         private readonly IMapper mapper;
-        private readonly IEmployeeServiceProvider employeeServiceProvider;
+        //private readonly IEmployeeServiceProvider employeeServiceProvider;
         private readonly JwtSettings jwtSettings;
         private readonly ITokenServiceProvider tokenServiceProvider; 
         private readonly IConfiguration configuration;
-        private readonly IHttpContextAccessor httpContextAccessor;
 
-        public UsersAccessProvider(IConfiguration configuration, IOptions<JwtSettings> options, ITokenServiceProvider tokenServiceProvider, IHttpContextAccessor httpContextAccessor, UsersAccessDbContext userAccessDbContext, IEmployeeServiceProvider employeeServiceProvider, ILogger<UsersAccessProvider> logger, IMapper mapper)
+        public UsersAccessProvider(IConfiguration configuration,IOptions<JwtSettings> options, ITokenServiceProvider tokenServiceProvider, UsersAccessDbContext userAccessDbContext, IEmployeeServiceProvider employeeServiceProvider, ILogger<UsersAccessProvider> logger, IMapper mapper)
         {
             this.userAccessDbContext = userAccessDbContext;
-            this.employeeServiceProvider = employeeServiceProvider;
+            //this.employeeServiceProvider = employeeServiceProvider;
             this.logger = logger;
             this.mapper = mapper;
             jwtSettings = options.Value;
             this.tokenServiceProvider = tokenServiceProvider;
-            this.httpContextAccessor = httpContextAccessor;
             this.configuration = configuration;
-            seedData();
+            // seedData();
         }
 
         public void seedData()
         {
             if (!userAccessDbContext.Users.Any())
             {
-                userAccessDbContext.Users.Add(new Db.User { EmployeeId = 1, EmployeeCode = "Emp1", RoleId = 1, IsActive = true, CreateDate = DateTime.Now });
-                userAccessDbContext.Users.Add(new Db.User { EmployeeId = 2, EmployeeCode = "Emp2", RoleId = 2, IsActive = true, CreateDate = DateTime.Now });
-                //userAccessDbContext.Users.Add(new Db.User { EmployeeId = 3, EmployeeCode = "Emp3", RoleId = 3, IsActive = true, CreateDate = DateTime.Now });
+                userAccessDbContext.Users.Add(new Db.User { Id = 1, EmployeeId = 1, EmployeeCode = "Emp1", RoleId = 1, IsActive = true, CreateDate = DateTime.Now });
+                userAccessDbContext.Users.Add(new Db.User { Id = 2, EmployeeId = 2, EmployeeCode = "Emp2", RoleId = 2, IsActive = true, CreateDate = DateTime.Now });
+                userAccessDbContext.Users.Add(new Db.User { Id = 3, EmployeeId = 3, EmployeeCode = "Emp3", RoleId = 3, IsActive = true, CreateDate = DateTime.Now });
                 userAccessDbContext.SaveChanges();
             }
 
             if (!userAccessDbContext.Roles.Any())
             {
-                userAccessDbContext.Roles.Add(new Db.Role { Name = "admin", Description = "Administrator role have full access" });
-                userAccessDbContext.Roles.Add(new Db.Role { Name = "user", Description = " User role" });
-                userAccessDbContext.Roles.Add(new Db.Role { Name = "survey", Description = "Survey role" });
-                userAccessDbContext.Roles.Add(new Db.Role { Name = "report", Description = "Report role" });
-                userAccessDbContext.Roles.Add(new Db.Role { Name = "document", Description = "Document role" });
+                userAccessDbContext.Roles.Add(new Db.Role { Id = 1, Name = "admin", Description ="Administrator role have full access" });
+                userAccessDbContext.Roles.Add(new Db.Role { Id = 2, Name = "user", Description =" User role"});
+                userAccessDbContext.Roles.Add(new Db.Role { Id = 3, Name = "survey", Description ="Survey role" });
+                userAccessDbContext.Roles.Add(new Db.Role { Id = 4, Name = "report", Description ="Report role"});
+                userAccessDbContext.Roles.Add(new Db.Role { Id = 5, Name = "document", Description ="Document role" });
                 userAccessDbContext.SaveChanges();
             }
         }
-        private string GetToken()
-        {
-            string token = httpContextAccessor.HttpContext.Request.Headers.Authorization;
-            if (token != null)
-            {
-                token = token.Replace("Bearer ", string.Empty);
-            }
-            else
-            {
-                token = "";
-            }
-            return token;
-        }
-        public async Task<(bool IsSuccess, IEnumerable<object> Users, string ErrorMessage)> GetUsersAsync()
+
+        public async Task<(bool IsSuccess, IEnumerable<Models.User> Users, string ErrorMessage)> GetUsersAsync()
         {
             try
             {
                 logger?.LogInformation("Gell all Users from DB");
                 var users = await userAccessDbContext.Users.ToListAsync();
-                List<object> userslist = new List<object>();
                 if (users != null)
                 {
-                    var employees = await employeeServiceProvider.getEmployeesAsync(GetToken());
-                    var roles = await userAccessDbContext.Roles.ToListAsync();
-                    foreach (Db.User user in users)
-                    {
-                        var employee = employees.SingleOrDefault(a => a.Id == user.EmployeeId);
-                        var role = roles.SingleOrDefault(s => s.Id == user.RoleId);
-
-                        string FirstName = null, LastName = null, EmployeeName = null;
-                        if (employee != null)
-                        {
-                            string[] names = employee.Name.Split(' ');
-                            EmployeeName = employee.Name;
-                            FirstName = names[0];
-                            LastName = EmployeeName.Replace(FirstName + " ", "");
-                        }
-                        userslist.Add(new
-                        {
-                            Id = user.Id,
-                            EmployeeId = user.EmployeeId,
-                            EmployeeCode = user.EmployeeCode,
-                            FirstName = FirstName,
-                            LastName = LastName,
-                            EmployeeName = EmployeeName,
-                            RoleId = user.RoleId,
-                            RoleName = (role != null) ? role.Name : null,
-                            IsActive = user.IsActive,
-                            CreatedDate = user.CreateDate,
-                            UpdatedDate = user.UpdateDate
-                        });
-                    }
                     logger?.LogInformation($"{users.Count} Items(s) found");
-                    // var result = mapper.Map<IEnumerable<Db.User>, IEnumerable<Models.User>>(users);
-                    return (true, userslist, null);
+                    var result = mapper.Map<IEnumerable<Db.User>, IEnumerable<Models.User>>(users);
+                    return (true, result, null);
                 }
                 return (false, null, "Not found");
             }
@@ -125,42 +76,18 @@ namespace DamageAssesment.Api.UsersAccess.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, object User, string ErrorMessage)> GetUsersAsync(int Id)
+
+        public async Task<(bool IsSuccess, Models.User User, string ErrorMessage)> GetUsersAsync(int Id)
         {
             try
             {
                 logger?.LogInformation("Querying Users table");
-
                 var user = await userAccessDbContext.Users.SingleOrDefaultAsync(s => s.Id == Id);
                 if (user != null)
                 {
-                    var employee = await employeeServiceProvider.getEmployeeAsync(user.EmployeeId, GetToken());
-                    var role = await userAccessDbContext.Roles.SingleOrDefaultAsync(s => s.Id == user.RoleId);
-                    string FirstName = null, LastName = null, EmployeeName = null;
-                    if (employee != null)
-                    {
-                        string[] names = employee.Name.Split(' ');
-                        EmployeeName = employee.Name;
-                        FirstName = names[0];
-                        LastName = EmployeeName.Replace(FirstName + " ", "");
-                    }
-                    var data = new
-                    {
-                        Id = user.Id,
-                        EmployeeId = user.EmployeeId,
-                        EmployeeCode = user.EmployeeCode,
-                        FirstName = FirstName,
-                        LastName = LastName,
-                        EmployeeName = EmployeeName,
-                        RoleId = user.RoleId,
-                        RoleName = (role != null) ? role.Name : null,
-                        IsActive = user.IsActive,
-                        CreatedDate = user.CreateDate,
-                        UpdatedDate = user.UpdateDate
-                    };
                     logger?.LogInformation($"User Id: {Id} found");
                     var result = mapper.Map<Db.User, Models.User>(user);
-                    return (true, data, null);
+                    return (true, result, null);
                 }
                 return (false, null, "Not found");
             }
@@ -206,12 +133,18 @@ namespace DamageAssesment.Api.UsersAccess.Providers
 
                     if (_user != null)
                     {
-                        Db.User vUsers = mapper.Map<Models.User, Db.User>(user);
-                        vUsers.UpdateDate = DateTime.Now;
-                        userAccessDbContext.Users.Update(vUsers);
-                        userAccessDbContext.SaveChanges();
-                        user.Id = Id;
-                        return (true, user, "Successful");
+                        int count = userAccessDbContext.Users.Where(u => u.Id != user.Id).Count();
+                        if (count == 0)
+                        {
+                            await userAccessDbContext.SaveChangesAsync();
+                            logger?.LogInformation($"Employee Id:  {user.EmployeeId} updated successfuly");
+                            return (true, mapper.Map<Db.User, Models.User>(_user), $"Employee Id:  {_user.EmployeeId} updated successfuly");
+                        }
+                        else
+                        {
+                            logger?.LogInformation($"Employee Id:  {user.EmployeeId} is already exist");
+                            return (false, null, $"Employee Id:  {user.EmployeeId} is already exist");
+                        }
                     }
                     else
                     {
@@ -257,19 +190,7 @@ namespace DamageAssesment.Api.UsersAccess.Providers
                 return (false, null, ex.Message);
             }
         }
-
-        public async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> AuthenticateAsync(string username, string password)
-        {
-            var mode = configuration.GetValue<string>("ModeSettings:mode");
-            if (mode == "online")
-                return await DadeSchoolAuthenticateAsync(username, password);
-            else if (mode == "offline") return await DadeSchoolAuthenticateFakeAsync(username, password);
-            else return (false, null, "Invalid mode");
-        }
-
-
-
-        private async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password)
+        public async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password)
         {
             try
             {
@@ -291,44 +212,6 @@ namespace DamageAssesment.Api.UsersAccess.Providers
                     return (true, JsonConvert.DeserializeObject<DadeSchoolToken>(responseString), "");
                 }
                 return (false, null, responseString);
-
-            }
-            catch (Exception ex)
-            {
-                return (false, null, ex.Message);
-            }
-        }
-
-        private async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateFakeAsync(string username, string password)
-        {
-            try
-            {
-                var defaultPassword = configuration.GetValue<string>("ModeSettings:userPassword");
-                if (password != defaultPassword)
-                    return (false, null, "Invalid Password");
-
-                long unixTimeNow = (long)DateTime.UtcNow.Subtract(DateTime.UnixEpoch).TotalSeconds;
-                var tokenObject = new Models.FakeToken
-                {
-                    nbf = unixTimeNow,
-                    exp = unixTimeNow + 259200,
-                    iat = unixTimeNow,
-                    auth_time = unixTimeNow,
-                    sub = username
-
-                };
-                var tokenString = JsonConvert.SerializeObject(tokenObject);
-                var jwtToken = await tokenServiceProvider.ConvertJsonToDadeSchoolsJwt(tokenString);
-
-                var response = new DadeSchoolToken
-                {
-                    access_token = jwtToken,
-                    expires_in = 262800,
-                    scope = "openid profile",
-                    token_type = "Bearer"
-                };
-
-                return (true, response, "");
             }
             catch (Exception ex)
             {
@@ -336,40 +219,19 @@ namespace DamageAssesment.Api.UsersAccess.Providers
             }
 
         }
-
-        private string DecodeJwtToken(string token)
+        public async Task<(bool IsSuccess, TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync(string employecode)
         {
-            try
+          
+            if (employecode != null)
               {
-                var handler = new JwtSecurityTokenHandler();
-                var jsonToken = handler.ReadToken(token);
-                var tokenS = handler.ReadToken(token) as JwtSecurityToken;
-
-                if (tokenS == null)
-                    return null;
-
-                var payload = tokenS.Payload.SerializeToJson();
-                return payload;
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        public async Task<(bool IsSuccess, TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync()
-        {
-            var dadeschoolsToken = GetToken();
-            var decodedToken = DecodeJwtToken(dadeschoolsToken);
-            var tokenObject = decodedToken == null ? null : JObject.Parse(decodedToken);
-
-            if (tokenObject == null)
-                return (false, null, "JWT authentication is required");
-
-            var employecode = (string)tokenObject["sub"];
+                //implementation for dadeschools authentication
+                // var employees = await employeeServiceProvider.getEmployeesAsync();
+                // var employee = employees.Where(e=> e.EmployeeCode.ToLower() == employecode.ToLower()).SingleOrDefault();
                 var user = userAccessDbContext.Users.Where(x => x.IsActive == true && x.EmployeeCode.ToLower() == employecode.ToLower()).SingleOrDefault();
+       
                           if (user != null)
                           {
+
                               var r = await GetRolesAsync();
                               var role = r.Roles.Where(x => x.Id == user.RoleId).SingleOrDefault();
 
@@ -388,7 +250,7 @@ namespace DamageAssesment.Api.UsersAccess.Providers
                                   Audience = "",
                                   NotBefore = DateTime.Now,
                                   Subject = new ClaimsIdentity(authClaims),
-                    Expires = DateTime.Now.AddDays(3),
+                                  Expires = DateTime.Now.AddMinutes(30),
                                   SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(tokenkey), SecurityAlgorithms.HmacSha256)
                               };
                               var token = tokenhandler.CreateToken(tokendesc);
@@ -401,7 +263,12 @@ namespace DamageAssesment.Api.UsersAccess.Providers
                           {
                               return (false, null, "user inactive or not exist.");
                           }
+                  }
 
+              else
+              {
+                  return (false, null, "Credentials are required to authenticate.");
+              }
         }
         public async Task<(bool IsSuccess, IEnumerable<Models.Role> Roles, string ErrorMessage)> GetRolesAsync()
         {

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Services/EmployeeServiceProvider.cs

@@ -1,4 +1,4 @@
-using DamageAssesment.Api.UsersAccess.Interfaces;
+using DamageAssesment.Api.UsersAccess.Interfaces;
 using DamageAssesment.Api.UsersAccess.Models;
 using Newtonsoft.Json;
 
@@ -10,11 +10,11 @@ namespace DamageAssesment.Api.UsersAccess.Services
         {
         }
 
-        public async Task<List<Employee>> getEmployeesAsync(string token)
+        public async Task<List<Employee>> getEmployeesAsync()
         {
             try
             {
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null,token);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
                 var employees = JsonConvert.DeserializeObject<List<Employee>>(responseJsonString);
 
                 if (employees == null || !employees.Any())
@@ -28,12 +28,12 @@ namespace DamageAssesment.Api.UsersAccess.Services
             }
         }
 
-        public async Task<Employee> getEmployeeAsync(int employeeId, string token)
+        public async Task<Employee> getEmployeeAsync(int employeeId)
         {
             try
             {
                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:EmployeeById"), employeeId);
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null,token);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
                 var employee = JsonConvert.DeserializeObject<Employee>(responseJsonString);
 
                 if (employee == null)

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Services/HttpUtil.cs

@@ -14,7 +14,7 @@ namespace DamageAssesment.Api.UsersAccess.Services
             this.httpClient = httpClient;
             this.logger = logger;
         }
-        public async Task<string> SendAsync(HttpMethod method, string url, string JsonInput,string token)
+        public async Task<string> SendAsync(HttpMethod method, string url, string JsonInput)
         {
             try
             {
@@ -22,7 +22,7 @@ namespace DamageAssesment.Api.UsersAccess.Services
                 request.Headers.Accept.Clear();
                 request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
 
-                request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
+                //request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
                 if (method == HttpMethod.Post)
                 {
                     request.Content = new StringContent(JsonInput, Encoding.UTF8, "application/json");

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Services/TokenServiceProvider.cs

@@ -6,10 +6,8 @@ using DamageAssesment.Api.UsersAccess.Db;
 using DamageAssesment.Api.UsersAccess.Interfaces;
 using DamageAssesment.Api.UsersAccess.Models;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
-using Newtonsoft.Json.Linq;
 
 namespace DamageAssesment.Api.UsersAccess.Services
 {
@@ -17,11 +15,9 @@ namespace DamageAssesment.Api.UsersAccess.Services
     {
         private readonly UsersAccessDbContext usersAccessDbContext;
         private readonly JwtSettings jwtSettings;
-        private readonly IConfiguration configuration;
-        public TokenServiceProvider(IOptions<JwtSettings> options, UsersAccessDbContext usersAccessDbContext, IConfiguration configuration)
+        public TokenServiceProvider(IOptions<JwtSettings> options, UsersAccessDbContext usersAccessDbContext)
         {
             this.usersAccessDbContext = usersAccessDbContext;
-            this.configuration = configuration;
             this.jwtSettings = options.Value;
         }
         public async Task<string> GenerateToken(Models.User user)
@@ -59,27 +55,5 @@ namespace DamageAssesment.Api.UsersAccess.Services
             var jwttoken = new JwtSecurityTokenHandler().WriteToken(token);
             return new TokenResponse() { jwttoken = jwttoken, refreshtoken = await GenerateToken(user) };
         }
-
-        public async Task<string> ConvertJsonToDadeSchoolsJwt(string json)
-        {
-            var jsonObject = JObject.Parse(json);
-            var claims = new Claim[jsonObject.Count];
-            int i = 0;
-            foreach (var property in jsonObject.Properties())
-            {
-                claims[i++] = new Claim(property.Name, property.Value.ToString());
-            }
-            var securityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configuration.GetValue<string>("Dadeschools:TokenClientSecret")));
-            var credentials = new SigningCredentials(securityKey, SecurityAlgorithms.HmacSha256);
-            var tokenDescriptor = new SecurityTokenDescriptor
-            {
-                Subject = new ClaimsIdentity(claims),
-                Expires = DateTime.UtcNow.AddDays(3),
-                SigningCredentials = credentials
-            };
-            var tokenHandler = new JwtSecurityTokenHandler();
-            var token = tokenHandler.CreateToken(tokenDescriptor);
-            return tokenHandler.WriteToken(token);
-        }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/appsettings.json

@@ -8,24 +8,17 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  //"EndPointSettings": {
-  //  "EmployeeUrlBase": "http://localhost:5135"
-  //},
   "EndPointSettings": {
-    "EmployeeUrlBase": "http://damageassesment.api.employees:80"
+    "EmployeeUrlBase": "http://localhost:5135"
   },
   "RessourceSettings": {
     "Employee": "/Employees",
     "EmployeeById": "/Employees/{0}"
   },
-  "ModeSettings": {
-    "mode": "offline",
-    "userPassword": "^R,cVAvEy7Z.qPkH9"
-  },
   "AllowedHosts": "*",
   "Dadeschools": {
-    "Authority": "https://graph2.dadeschools.net",
-    "TokenUrl": "https://graph2.dadeschools.net/connect/token",
+    "Authority": "https://dev-graph.dadeschools.net",
+    "TokenUrl": "https://dev-graph.dadeschools.net/connect/token",
     "ClientId": "dmapi",
     "ClientSecret": "bfce2c8d-2064-4a02-b19d-7f1d42b16eae",
     "TokenClientId": "damage_assessment_postman",
@@ -43,9 +36,5 @@
       "Name": "profile",
       "Description": "Read basic information about you such as your date of brith and full name"
     }
-  ],
-  "ConnectionStrings": {
-    // "UsersAccessConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "UsersAccessConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-  }
+  ]
 }

DamageAssesmentApi/DamageAssesment.sln

@@ -11,7 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Attachm
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4CB40DC2-D9D2-4384-A7A6-9968F5C777A2}"
 	ProjectSection(SolutionItems) = preProject
-		..\..\..\..\Sample\Migrations.ps1 = ..\..\..\..\Sample\Migrations.ps1
 		ReadMe.txt = ReadMe.txt
 		ReadMe4Dev.txt = ReadMe4Dev.txt
 	EndProjectSection
@@ -36,12 +35,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Employe
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.DocuLinks.Test", "DamageAssesment.Api.DocuLinks.Test\DamageAssesment.Api.DocuLinks.Test.csproj", "{A7F17ED7-71D2-4FD0-87E5-D83415078FC0}"
 EndProject
+Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{0DD44934-6826-43C8-A438-320A05209967}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.UsersAccess", "DamageAssesment.Api.UsersAccess\DamageAssesment.Api.UsersAccess.csproj", "{40240AD6-90D2-4128-BCDF-12C77D1B1B55}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.UsersAccess.Test", "DamageAssesment.Api.UsersAccess.Test\DamageAssesment.Api.UsersAccess.Test.csproj", "{ADAF9385-262C-4A37-A603-A53B77EA515D}"
 EndProject
-Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{0DD44934-6826-43C8-A438-320A05209967}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.DocuLinks", "DamageAssesment.Api.DocuLinks\DamageAssesment.Api.DocuLinks.csproj", "{B027FBB9-1357-4FD6-85B3-8ADCE11CAE05}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Responses", "DamageAssesment.Api.Responses\DamageAssesment.Api.Responses.csproj", "{B5C446DF-30DF-46E3-BD87-DA454C8B9C4F}"
@@ -106,6 +105,10 @@ Global
 		{A7F17ED7-71D2-4FD0-87E5-D83415078FC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A7F17ED7-71D2-4FD0-87E5-D83415078FC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A7F17ED7-71D2-4FD0-87E5-D83415078FC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0DD44934-6826-43C8-A438-320A05209967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0DD44934-6826-43C8-A438-320A05209967}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0DD44934-6826-43C8-A438-320A05209967}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0DD44934-6826-43C8-A438-320A05209967}.Release|Any CPU.Build.0 = Release|Any CPU
 		{40240AD6-90D2-4128-BCDF-12C77D1B1B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{40240AD6-90D2-4128-BCDF-12C77D1B1B55}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{40240AD6-90D2-4128-BCDF-12C77D1B1B55}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -114,10 +117,6 @@ Global
 		{ADAF9385-262C-4A37-A603-A53B77EA515D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ADAF9385-262C-4A37-A603-A53B77EA515D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ADAF9385-262C-4A37-A603-A53B77EA515D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0DD44934-6826-43C8-A438-320A05209967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0DD44934-6826-43C8-A438-320A05209967}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0DD44934-6826-43C8-A438-320A05209967}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0DD44934-6826-43C8-A438-320A05209967}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B027FBB9-1357-4FD6-85B3-8ADCE11CAE05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B027FBB9-1357-4FD6-85B3-8ADCE11CAE05}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B027FBB9-1357-4FD6-85B3-8ADCE11CAE05}.Release|Any CPU.ActiveCfg = Release|Any CPU