changed download url format and added new endpoint for doculink isactive update

DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs

@@ -8,16 +8,10 @@ var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 
-// CORS setup to allow requests from any origin.
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 //builder.Services.AddSwaggerGen();
-// Add Swagger/OpenAPI documentation support.
 builder.Services.AddSwaggerGen(c =>
 {
     // Include XML comments from your assembly
@@ -32,25 +26,18 @@ builder.Services.AddDbContext<AnswerDbContext>(option =>
     option.UseSqlServer("AnswerConnection");
 });
 
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-
 var app = builder.Build();
 
+
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();
     app.UseSwaggerUI();
 }
-app.UseCors("DamageAppCorsPolicy");
+
 app.UseAuthorization();
 
-// Enable CORS, authentication, and authorization middleware.
-app.UseCors("DamageAppCorsPolicy");
-app.UseAuthorization();
-// Map controllers to their respective routes.
 app.MapControllers();
 
 app.Run();

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

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

DamageAssesmentApi/DamageAssesment.Api.Attachments/Program.cs

@@ -8,18 +8,12 @@ using System.Reflection;
 
 var builder = WebApplication.CreateBuilder(args);
 
-// CORS setup to allow requests from any origin.
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-
 // Add services to the container.
 
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 //builder.Services.AddSwaggerGen();
-// Add Swagger/OpenAPI documentation support.
 builder.Services.AddSwaggerGen(c =>
 {
     // Include XML comments from your assembly
@@ -27,7 +21,6 @@ builder.Services.AddSwaggerGen(c =>
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
     c.IncludeXmlComments(xmlPath);
 });
-builder.Services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 builder.Services.AddScoped<IAttachmentsProvider, AttachmentsProvider>();
 builder.Services.AddScoped<IUploadService, UploadService>();
 builder.Services.AddScoped<IAzureBlobService,AzureBlobService>();
@@ -42,9 +35,6 @@ builder.Services.Configure<FormOptions>(o =>
     o.MultipartBodyLengthLimit = int.MaxValue;
     o.MemoryBufferThreshold = int.MaxValue;
 });
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
 
 var app = builder.Build();
 
@@ -55,11 +45,9 @@ if (app.Environment.IsDevelopment())
     app.UseSwaggerUI();
 }
 
-// Enable CORS, authentication, and authorization middleware.
-
-app.UseCors("DamageAppCorsPolicy");
 app.UseAuthorization();
 app.UseHttpsRedirection();
+
 app.MapControllers();
 app.UseStaticFiles();
 app.Run();

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

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

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

@@ -124,7 +124,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                     {
                         counter++;
 
-                        var UserfileName = Path.GetFileName(file.FileName+ file.FileExtension);
+                        var UserfileName = Path.GetFileName(file.FileName);
                         var fileName = String.Format("Attachment_{0}{1}", counter, file.FileExtension);
                         var dbPath = Path.Combine(fullDirectoryPath, fileName);
                         File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));
@@ -161,7 +161,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 foreach (var file in item.postedFiles)
                 {
                     Models.Attachment attachment= attachments.Where(a=>a.Id == file.AttachmentId).FirstOrDefault();
-                    var UserfileName = Path.GetFileName(file.FileName + file.FileExtension);
+                    var UserfileName = Path.GetFileName(file.FileName);
                     var fileName = String.Format("Attachment_{0}{1}", attachment?.Id, file.FileExtension);
                     var dbPath = Path.Combine(fullDirectoryPath, fileName);
                     File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));

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

@@ -32,7 +32,6 @@ namespace DamageAssesment.Api.DocuLinks.Test
                 doclinksAttachments.Add(new DoculinkAttachments()
                 {
                     docName = "",Path="www.google.com",
-                    Language = "en",
                     IsAttachments=false,CustomOrder=1
                 });
                 list.Add(new DocuLinks.Models.ResDoculink()
@@ -75,7 +74,6 @@ namespace DamageAssesment.Api.DocuLinks.Test
                     docName = "",
                     Path = "www.google.com",
                     IsAttachments = false,
-                    Language = "en",
                     CustomOrder = 1
                 });
                 list.Add(new DocuLinks.Models.ResDoculink()
@@ -140,7 +138,6 @@ namespace DamageAssesment.Api.DocuLinks.Test
                 docName = "",
                 Path = "www.google.com",
                 IsAttachments = false,
-                Language = "en",
                 CustomOrder = 1
             });
             return new Models.Doculink
@@ -168,7 +165,6 @@ namespace DamageAssesment.Api.DocuLinks.Test
                 docName = "",
                 Path = "www.google.com",
                 IsAttachments = false,
-                Language = "en",
                 CustomOrder = 1
             });
             List<DocuLinks.Models.Doculink> DocuLinks = new List<Models.Doculink>();

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

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

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

@@ -13,7 +13,6 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces
         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, Models.Doculink Document);
         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, bool isactive);
         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id);
-        Task<(bool IsSuccess, Models.DoculinkAttachments DoculinkAttachments, string Path)> GetDownloadAttachmentAsync(int id);
         Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter();
 
 

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

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

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

@@ -19,6 +19,5 @@ namespace DamageAssesment.Api.DocuLinks.Models
         public int CustomOrder { get; set; }
         public string url { get;set; }
         public bool IsAttachments { get; set; }
-        public string Language { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Program.cs

@@ -6,11 +6,6 @@ using System.Reflection;
 
 var builder = WebApplication.CreateBuilder(args);
 
-// CORS setup to allow requests from any origin.
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-
 // Add services to the container.
 
 builder.Services.AddControllers();
@@ -24,7 +19,6 @@ builder.Services.AddSwaggerGen(c =>
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
-builder.Services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 builder.Services.AddScoped<IDoculinkProvider, DoculinkProvider>();
 builder.Services.AddScoped<IUploadService, UploadService>();
 builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
@@ -33,9 +27,6 @@ builder.Services.AddDbContext<DoculinkDbContext>(option =>
 {
     option.UseSqlServer("DoculinConnection");
 });
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.
@@ -45,10 +36,6 @@ if (app.Environment.IsDevelopment())
     app.UseSwaggerUI();
 }
 
-
-// Enable CORS, authentication, and authorization middleware.
-
-app.UseCors("DamageAppCorsPolicy");
 app.UseAuthorization();
 
 app.MapControllers();

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

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

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

@@ -52,15 +52,6 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     return await System.IO.File.ReadAllBytesAsync(path);
                 }
 
-                return null; // File not found
-            }
-            catch (Exception ex)
-            {
-                // Handle or log the exception as needed
-                throw;
-            }
-        }
-
         public Models.Doculink UploadDocument(int counter, ReqDoculink documentInfo)
         {
             Models.Doculink Documents = new Models.Doculink();
@@ -79,14 +70,14 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                         counter++;
                         if (item.IsAttachments)
                         {
-                            UserfileName = Path.GetFileName(item.FileName + item.FileExtension);
+                            UserfileName = Path.GetFileName(item.FileName);
                             var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
                             path = Path.Combine(fullDirectoryPath, fileName);
                             File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
                         }
                         else
                             path = item.url;
-                        attachments.Add(new Models.DoculinkAttachments { docName=UserfileName,Path=path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder,Language=item.Language });
+                        attachments.Add(new Models.DoculinkAttachments { docName=UserfileName,Path=path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder });
                     }
                 }
                 Documents=new Models.Doculink (){ linkTypeId = documentInfo.linkTypeId,
@@ -121,14 +112,14 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     counter++;
                     if (item.IsAttachments)
                     {
-                        UserfileName = Path.GetFileName(item.FileName+item.FileExtension);
+                        UserfileName = Path.GetFileName(item.FileName);
                         var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
                         path = Path.Combine(fullDirectoryPath, fileName);
                         File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
                     }
                     else
                         path = item.url;
-                    attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder,Language=item.Language });
+                    attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder });
                 }
                 Models.Doculink Documents = new Models.Doculink()
                 {

DamageAssesmentApi/DamageAssesment.Api.Employees/Program.cs

@@ -6,18 +6,12 @@ using System.Reflection;
 
 var builder = WebApplication.CreateBuilder(args);
 
-
-// CORS setup to allow requests from any origin.
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-
-
 // Add services to the container.
+
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
-// Add Swagger/OpenAPI documentation support.
+//builder.Services.AddSwaggerGen();
 builder.Services.AddSwaggerGen(c =>
 {
     // Include XML comments from your assembly
@@ -32,9 +26,7 @@ builder.Services.AddDbContext<EmployeeDbContext>(option =>
 {
     option.UseSqlServer("EmployeeConnection");
 });
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
+
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.
@@ -51,11 +43,6 @@ if (app.Environment.IsDevelopment())
     }
 }
 
-app.UseCors("DamageAppCorsPolicy");
-
-// Enable CORS, authentication, and authorization middleware.
-app.UseCors("DamageAppCorsPolicy");
-
 app.UseAuthorization();
 
 app.MapControllers();

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

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

DamageAssesmentApi/DamageAssesment.Api.Locations/Program.cs

@@ -5,18 +5,13 @@ using Microsoft.EntityFrameworkCore;
 using System.Reflection;
 
 var builder = WebApplication.CreateBuilder(args);
-// CORS setup to allow requests from any origin.
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-
 
 // Add services to the container.
-// Add controller services and API Explorer for endpoint discovery.
+
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
-// Add Swagger/OpenAPI documentation support.
+//builder.Services.AddSwaggerGen();
 builder.Services.AddSwaggerGen(c =>
 {
     // Include XML comments from your assembly
@@ -31,9 +26,6 @@ builder.Services.AddDbContext<LocationDbContext>(option =>
 {
     option.UseSqlServer("LocationConnection");
 });
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.
@@ -52,11 +44,6 @@ if (app.Environment.IsDevelopment())
     }
 }
 
-app.UseCors("DamageAppCorsPolicy");
-
-// Enable CORS, authentication, and authorization middleware.
-app.UseCors("DamageAppCorsPolicy");
-
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -1,5 +1,4 @@
 using DamageAssesment.Api.Questions.Interfaces;
-using DamageAssesment.Api.Questions.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Questions.Controllers
@@ -110,26 +109,6 @@ namespace DamageAssesment.Api.Questions.Controllers
             return CreatedAtRoute("DefaultApi",questions);
         }
         /// <summary>
-        /// PUT request for update a multiple question (multilingual) for survey.
-        /// </summary>
-        [HttpPut("questions/multiple/{surveyid}")]
-        public async Task<IActionResult> CreateQuestions(int surveyid, List<Models.Question> questions)
-        {
-            if (questions != null)
-            {
-                var result = await this.questionsProvider.PutQuestionsAsync(surveyid,questions);
-                if (result.IsSuccess)
-                {
-                    return Ok(result.Question);
-                }
-                if (result.ErrorMessage == "Not Found")
-                    return NotFound(result.ErrorMessage);
-
-                return BadRequest(result.ErrorMessage);
-            }
-            return CreatedAtRoute("DefaultApi", questions);
-        }
-        /// <summary>
         /// POST request for creating a new question (multilingual).
         /// </summary>
 

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

@@ -9,7 +9,6 @@ namespace DamageAssesment.Api.Questions.Interfaces
         Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int surveyId,string language);
         Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question);
         Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PostQuestionsAsync(List<Models.Question> Questions);
-        Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PutQuestionsAsync(int surveyId,List<Models.Question> Questions);
         Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question);
         Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> DeleteQuestionAsync(int id);
 

DamageAssesmentApi/DamageAssesment.Api.Questions/Program.cs

@@ -15,14 +15,8 @@ builder.Services.AddControllers();
 builder.Services.AddScoped<IQuestionsProvider, QuestionsProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
 
-// CORS setup to allow requests from any origin.
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-
-// Add controller services and API Explorer for endpoint discovery.
 builder.Services.AddEndpointsApiExplorer();
-// Add Swagger/OpenAPI documentation support.
+//builder.Services.AddSwaggerGen();
 builder.Services.AddSwaggerGen(c =>
 {
     // Include XML comments from your assembly
@@ -34,9 +28,6 @@ builder.Services.AddDbContext<QuestionDbContext>(option =>
 {
     option.UseSqlServer("QuestionConnection");
 });
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.
@@ -53,9 +44,6 @@ if (app.Environment.IsDevelopment())
     }
 }
 
-
-// Enable CORS, authentication, and authorization middleware.
-app.UseCors("DamageAppCorsPolicy");
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -376,36 +376,6 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-      
-        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PutQuestionsAsync(int surveyId, List<Models.Question> Questions)
-        {
-            try
-            {
-                var questions=await questionDbContext.Questions.AsNoTracking().Where(a=>a.SurveyId == surveyId).ToListAsync();
-                if (questions != null)
-                {
-                    List<int> questionids=questions.Select(a=>a.Id).ToList();
-                    var questiontrans = await questionDbContext.QuestionsTranslations.AsNoTracking().Where(x => questionids.Contains(x.QuestionId)).ToListAsync();
-                    if (questiontrans != null)
-                        questionDbContext.QuestionsTranslations.RemoveRange(questiontrans);
-                    questionDbContext.Questions.RemoveRange(questions);
-                    questionDbContext.SaveChanges();
-                }
-                List<Models.MultiLanguage> results = new List<MultiLanguage>();
-                logger?.LogInformation("Query Question");
-                foreach (Models.Question Question in Questions)
-                {
-                    Question.SurveyId = surveyId;
-                    results.Add(InsertQuestion(Question));
-                }
-                return (true, results, null);
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
         public async Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question)
         {
             try
@@ -439,11 +409,8 @@ namespace DamageAssesment.Api.Questions.Providers
 
                 if (question != null)
                 {
-                    var questiontrans=await questionDbContext.QuestionsTranslations.AsNoTracking().Where(x=>x.QuestionId== id).ToListAsync();
                     var result = mapper.Map<Db.Question, Models.MultiLanguage>(question);
                     result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
-                    if(questiontrans!=null)
-                        questionDbContext.QuestionsTranslations.RemoveRange(questiontrans);
                     questionDbContext.Questions.Remove(question);
                     questionDbContext.SaveChanges();
                     return (true, result, $"QuestionID {id} deleted Successfuly");

DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs

@@ -16,10 +16,6 @@ const int intervalForCircuitBraker = 5; //5 seconds
 // Add services to the container.
 
 builder.Services.AddControllers();
-// CORS setup to allow requests from any origin.
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 
 builder.Services.AddScoped<ISurveysResponse, SurveyResponsesProvider>();
@@ -40,7 +36,6 @@ builder.Services.AddHttpClient<IHttpUtil, HttpUtil>().
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
 builder.Services.AddEndpointsApiExplorer();
 //builder.Services.AddSwaggerGen();
-// Add Swagger/OpenAPI documentation support.
 builder.Services.AddSwaggerGen(c =>
 {
     // Include XML comments from your assembly
@@ -52,9 +47,6 @@ builder.Services.AddDbContext<SurveyResponseDbContext>(option =>
 {
     option.UseSqlServer("ResponsesConnection");
 });
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.
@@ -64,7 +56,6 @@ if (app.Environment.IsDevelopment())
     app.UseSwaggerUI();
 }
 
-app.UseCors("DamageAppCorsPolicy");
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -56,20 +56,16 @@ namespace DamageAssesment.Api.Responses.Providers
             try
             {
                 logger?.LogInformation("Querying to get SurveyResponse object from DB");
-                List<Db.SurveyResponse> listSurveyResponse = null;
+                IQueryable<Db.SurveyResponse> listSurveyResponse = null;
                 if (employeeid == 0)
                 {
-                    listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId).ToList();
+                    listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId);
                 }
                 else
                 {
-                    listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId && s.EmployeeId == employeeid).ToList();
+                    listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId && s.EmployeeId == employeeid);
                 }
-                listSurveyResponse = listSurveyResponse
-               .OrderByDescending(obj => obj.Id)
-               .GroupBy(obj => new { obj.SurveyId,  obj.LocationId })//obj.EmployeeId,
-               .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups
-               .ToList();
+
                 if (listSurveyResponse.Any())
                 {
                     var answers = await getAnswersByRegionAndSurveyIdAsync(listSurveyResponse);
@@ -421,13 +417,14 @@ namespace DamageAssesment.Api.Responses.Providers
         }
 
         //Method to get Answers by region with surveyId as input parameter
-        private async Task<dynamic> getAnswersByRegionAndSurveyIdAsync(List<Db.SurveyResponse> surveyResponses)
+        private async Task<dynamic> getAnswersByRegionAndSurveyIdAsync(IQueryable<Db.SurveyResponse> surveyResponses)
         {
             try
             {
                 var answersList = await answerServiceProvider.getAnswersAsync();
                 if (answersList == null || !answersList.Any())
                     return null;
+
                 //get all the answers for the particular survey
                 var surveyAnswers = answersList.Join(
                                        surveyResponses,
@@ -568,11 +565,7 @@ namespace DamageAssesment.Api.Responses.Providers
                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid).ToListAsync();
                     employee = await employeeServiceProvider.getEmployeeAsync(employeeid);
                 }
-                surveyResonses = surveyResonses
-                .OrderByDescending(obj => obj.Id)
-                .GroupBy(obj => new { obj.SurveyId, obj.LocationId })//obj.EmployeeId,
-                .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups
-                .ToList();
+
                 var answers = await answerServiceProvider.getAnswersAsync();
                 var questions = await questionServiceProvider.getQuestionsAsync(null);
                 var Locations = await locationServiceProvider.getLocationsAsync();
@@ -593,18 +586,18 @@ namespace DamageAssesment.Api.Responses.Providers
                                      r.LocationId,
                                      r.EmployeeId,
                                      r.ClientDevice,
-                                    // r.KeyAnswerResult,
+                                     r.KeyAnswerResult,
                                      loc.DataValue,
                                      loc.Enrollment,
                                      loc.Longitute,
                                      loc.Latitude,
-                                    // Employee = (from e in employees where e.Id == r.EmployeeId select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                     Employee = (from e in employees where e.Id == r.EmployeeId select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                      answers = from ans in answers
                                                where ans.SurveyResponseId == r.Id
                                                select new
                                                {
                                                    ans.Id,
-                                                //   ans.QuestionId,
+                                                   ans.QuestionId,
                                                    ans.AnswerText,
                                                    ans.Comment,
                                                    Questions = (from q in surveyQuestions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
@@ -630,18 +623,18 @@ namespace DamageAssesment.Api.Responses.Providers
                                      r.LocationId,
                                      r.EmployeeId,
                                      r.ClientDevice,
-                                   //  r.KeyAnswerResult,
+                                     r.KeyAnswerResult,
                                      loc.DataValue,
                                      loc.Enrollment,
                                      loc.Longitute,
                                      loc.Latitude,
-                                   //  Employee = _employee,
+                                     Employee = _employee,
                                      answers = from ans in answers
                                                where ans.SurveyResponseId == r.Id
                                                select new
                                                {
                                                    ans.Id,
-                                             //      ans.QuestionId,
+                                                   ans.QuestionId,
                                                    ans.AnswerText,
                                                    ans.Comment,
                                                    Questions = (from q in questions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
@@ -700,18 +693,18 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.LocationId,
                                  r.EmployeeId,
                                  r.ClientDevice,
-                               //  r.KeyAnswerResult,
+                                 r.KeyAnswerResult,
                                  loc.DataValue,
                                  loc.Enrollment,
                                  loc.Longitute,
                                  loc.Latitude,
-                               //  Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
                                            select new
                                            {
                                                ans.Id,
-                                         //      ans.QuestionId,
+                                               ans.QuestionId,
                                                ans.AnswerText,
                                                ans.Comment,
                                                Questions = (from q in questions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
@@ -952,11 +945,7 @@ namespace DamageAssesment.Api.Responses.Providers
                         _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
                     }
                 }
-                surveyResonses = surveyResonses
-                .OrderByDescending(obj => obj.Id)
-                .GroupBy(obj => new { obj.SurveyId,  obj.LocationId }) //obj.EmployeeId,
-                .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups
-                .ToList();
+
                 var answers = await answerServiceProvider.getAnswersAsync();
                 var questions = await questionServiceProvider.getQuestionsAsync(null);
                 var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
@@ -972,18 +961,18 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.LocationId,
                                  r.EmployeeId,
                                  r.ClientDevice,
-                               //  r.KeyAnswerResult,
+                                 r.KeyAnswerResult,
                                  loc.DataValue,
                                  loc.Enrollment,
                                  loc.Longitute,
                                  loc.Latitude,
-                               //  Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
 
                                            select new
                                            {
-                                          //     ans.QuestionId,
+                                               ans.QuestionId,
                                                ans.Id,
                                                ans.AnswerText,
                                                ans.Comment,
@@ -1027,11 +1016,7 @@ namespace DamageAssesment.Api.Responses.Providers
                         _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
                     }
                 }
-                surveyResponses = surveyResponses
-                .OrderByDescending(obj => obj.Id)
-                .GroupBy(obj => new { obj.SurveyId, obj.LocationId })//, obj.EmployeeId
-                .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups
-                .ToList();
+
                 //var surveyResponses = await surveyResponseDbContext.Responses.Where(x => x.SurveyId == survey.Id).ToListAsync();
                 // var employees = await employeeServiceProvider.getEmployeesAsync();
                 var answers = await answerServiceProvider.getAnswersAsync();
@@ -1046,12 +1031,12 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.LocationId,
                                  r.EmployeeId,
                                  r.ClientDevice,
-                             //    r.KeyAnswerResult,
+                                 r.KeyAnswerResult,
                                  loc.DataValue,
                                  loc.Enrollment,
                                  loc.Longitute,
                                  loc.Latitude,
-                               //  Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
                                            && ans.QuestionId == question.Id
@@ -1059,7 +1044,7 @@ namespace DamageAssesment.Api.Responses.Providers
 
                                            select new
                                            {
-                                              // ans.QuestionId,
+                                               ans.QuestionId,
                                                AnswerId = ans.Id,
                                                ans.AnswerText,
                                                ans.Comment,

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

@@ -34,55 +34,7 @@ namespace DamageAssesment.Api.Surveys.Test
 
             Assert.Equal(204, result.StatusCode);
         }
-        [Fact(DisplayName = "Get active Surveys - Ok case")]
-        public async Task GetActiveSurveysAsync_ShouldReturnStatusCode200()
-        {
-            var mockSurveyService = new Mock<ISurveyProvider>();
-            var mockResponse = await MockData.getOkResponse();
-            mockSurveyService.Setup(service => service.GetActiveSurveysAsync(true,null)).ReturnsAsync(mockResponse);
 
-            var surveyProvider = new SurveysController(mockSurveyService.Object);
-            var result = (OkObjectResult)await surveyProvider.GetActiveSurveysAsync(null);
-
-            Assert.Equal(200, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "Get active Surveys - NoContent Case")]
-        public async Task GetActiveSurveysAsync_ShouldReturnStatusCode204()
-        {
-            var mockSurveyService = new Mock<ISurveyProvider>();
-            var mockResponse = await MockData.getNoContentResponse();
-            mockSurveyService.Setup(service => service.GetActiveSurveysAsync(true,null)).ReturnsAsync(mockResponse);
-
-            var surveyProvider = new SurveysController(mockSurveyService.Object);
-            var result = (NoContentResult)await surveyProvider.GetActiveSurveysAsync(null);
-
-            Assert.Equal(204, result.StatusCode);
-        }
-        [Fact(DisplayName = "Get inactive Surveys - Ok case")]
-        public async Task GetInActiveSurveysAsync_ShouldReturnStatusCode200()
-        {
-            var mockSurveyService = new Mock<ISurveyProvider>();
-            var mockResponse = await MockData.getOkResponse();
-            mockSurveyService.Setup(service => service.GetActiveSurveysAsync(false, null)).ReturnsAsync(mockResponse);
-
-            var surveyProvider = new SurveysController(mockSurveyService.Object);
-            var result = (OkObjectResult)await surveyProvider.GetInActiveSurveysAsync(null);
-
-            Assert.Equal(200, result.StatusCode);
-        }
-        [Fact(DisplayName = "Get in active Surveys - NoContent Case")]
-        public async Task GetInActiveSurveysAsync_ShouldReturnStatusCode204()
-        {
-            var mockSurveyService = new Mock<ISurveyProvider>();
-            var mockResponse = await MockData.getNoContentResponse();
-            mockSurveyService.Setup(service => service.GetActiveSurveysAsync(false, null)).ReturnsAsync(mockResponse);
-
-            var surveyProvider = new SurveysController(mockSurveyService.Object);
-            var result = (NoContentResult)await surveyProvider.GetInActiveSurveysAsync(null);
-
-            Assert.Equal(204, result.StatusCode);
-        }
         [Fact(DisplayName = "Get Survey by Id - Ok case")]
         public async Task GetSurveyAsync_ShouldReturnStatusCode200()
         {

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

@@ -27,36 +27,7 @@ namespace DamageAssesment.Api.Surveys.Controllers
             }
             return NoContent();
         }
-        /// <summary>
-        /// GET request for retrieving all active surveys.
-        /// </summary>
-        [Route("surveys/active")]
-        [Route("surveys/active/{language:alpha}")]
-        [HttpGet]
-        public async Task<ActionResult> GetActiveSurveysAsync(string? language)
-        {
-            var result = await this.surveyProvider.GetActiveSurveysAsync(true,language);
-            if (result.IsSuccess)
-            {
-                return Ok(result.Surveys);
-            }
-            return NoContent();
-        }
-        /// <summary>
-        /// GET request for retrieving all inactive surveys.
-        /// </summary>
-        [Route("surveys/inactive")]
-        [Route("surveys/inactive/{language:alpha}")]
-        [HttpGet]
-        public async Task<ActionResult> GetInActiveSurveysAsync(string? language)
-        {
-            var result = await this.surveyProvider.GetActiveSurveysAsync(false, language);
-            if (result.IsSuccess)
-            {
-                return Ok(result.Surveys);
-            }
-            return NoContent();
-        }
+
         /// <summary>
         /// GET request for retrieving surveys by ID.
         /// </summary>

DamageAssesmentApi/DamageAssesment.Api.Surveys/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

@@ -10,11 +10,7 @@ using System.Reflection;
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
-
-// Retrieve the security key for JWT token validation.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-
-// Configure JWT authentication and validation.
 builder.Services.AddAuthentication(item =>
 {
     item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
@@ -33,21 +29,12 @@ builder.Services.AddAuthentication(item =>
     };
 });
 
-//CORS setup to allow requests from any origin.
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-
-
-
-// Add controller services and API Explorer for endpoint discovery.
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddScoped<ISurveyProvider, SurveysProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
 builder.Services.AddEndpointsApiExplorer();
-
-// Add Swagger/OpenAPI documentation support.
+//builder.Services.AddSwaggerGen();
 builder.Services.AddSwaggerGen(c =>
 {
     // Include XML comments from your assembly
@@ -55,13 +42,10 @@ builder.Services.AddSwaggerGen(c =>
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
     c.IncludeXmlComments(xmlPath);
 });
-
-// Configure the database context for SurveysDbContext using SQL Server.
 builder.Services.AddDbContext<SurveysDbContext>(option =>
 {
     option.UseSqlServer("SurveyConnection");
 });
-
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.
@@ -69,7 +53,7 @@ if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();
     app.UseSwaggerUI();
-    // Seed initial data in the database when in development mode
+
     using (var serviceScope = app.Services.CreateScope())
     {
         var services = serviceScope.ServiceProvider;
@@ -77,11 +61,10 @@ if (app.Environment.IsDevelopment())
         surveyProvider.seedData();
     }
 }
-// Enable CORS, authentication, and authorization middleware.
-app.UseCors("DamageAppCorsPolicy");
+
 app.UseAuthentication();
 app.UseAuthorization();
-// Map controllers to their respective routes.
+
 app.MapControllers();
 
 app.Run();

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)
         {
@@ -216,11 +179,6 @@ namespace DamageAssesment.Api.Surveys.Providers
             {
                 if (survey != null)
                 {
-                    if (survey.StartDate != null && survey.EndDate != null)
-                    {
-                        if(survey.StartDate.Value>survey.EndDate.Value)
-                            return (false, null, $"Survey start date should be less than enddate");
-                    }
                     survey.CreatedDate = DateTime.Now;
                     Db.Survey _survey = mapper.Map<Models.Survey, Db.Survey>(survey);
 
@@ -257,11 +215,6 @@ namespace DamageAssesment.Api.Surveys.Providers
             {
                 if (survey != null)
                 {
-                    if (survey.StartDate != null && survey.EndDate != null)
-                    {
-                        if (survey.StartDate.Value > survey.EndDate.Value)
-                            return (false, null, $"Survey start date should be less than enddate");
-                    }
                     var _survey = await surveyDbContext.Surveys.AsNoTracking().Where(s => s.Id == Id).SingleOrDefaultAsync();
 
                     if (_survey != null)

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Program.cs

@@ -1,147 +0,0 @@
-using DamageAssesment.Api.UsersAccess.Db;
-using DamageAssesment.Api.UsersAccess.Interfaces;
-using DamageAssesment.Api.UsersAccess.Providers;
-using DamageAssesment.Api.UsersAccess.Models;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.IdentityModel.Tokens;
-using System.Text;
-using Polly;
-using DamageAssesment.Api.UsersAccess.Services;
-using Microsoft.OpenApi.Models;
-using System.Reflection;
-using Microsoft.AspNetCore.Authorization;
-
-const int maxApiCallRetries = 3;
-const int intervalToRetry = 2; //2 seconds
-const int maxRetryForCircuitBraker = 5;
-const int intervalForCircuitBraker = 5; //5 seconds
-
-var builder = WebApplication.CreateBuilder(args);
-
-// Add services to the container.
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-
-
-builder.Services.AddAuthentication().
-    AddJwtBearer("DamageApp", item =>
-{
-
-    item.RequireHttpsMetadata = true;
-    item.SaveToken = true;
-    item.TokenValidationParameters = new TokenValidationParameters()
-    {
-        ValidateIssuerSigningKey = true,
-        IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(authkey)),
-        ValidateIssuer = false,
-        ValidateAudience = false,
-        ClockSkew = TimeSpan.Zero
-    };
-}).AddJwtBearer("Dadeschools", options =>
-{
-    options.Authority = builder.Configuration["Dadeschools:Authority"];
-    options.TokenValidationParameters.ValidTypes = new[] { "at+jwt" };
-    options.TokenValidationParameters.ValidateAudience = false;
-});
-
-
-builder.Services.AddAuthorization(options =>
-{
-    var DamageAppPolicy = new AuthorizationPolicyBuilder()
-        .RequireAuthenticatedUser()
-        .AddAuthenticationSchemes("DamageApp")
-        .Build();
-    var DadeschoolsPolicy = new AuthorizationPolicyBuilder()
-        .RequireAuthenticatedUser()
-        .AddAuthenticationSchemes("Dadeschools")
-        .Build();
-
-    var allPolicy = new AuthorizationPolicyBuilder()
-        .RequireAuthenticatedUser()
-        .AddAuthenticationSchemes("DamageApp", "Dadeschools")
-        .Build();
-    options.AddPolicy("DamageApp", DamageAppPolicy);
-    options.AddPolicy("Dadeschools", DadeschoolsPolicy);
-    options.AddPolicy("AllPolicies", allPolicy);
-    options.DefaultPolicy = options.GetPolicy("DamageApp")!;
-});
-
-var _jwtsettings = builder.Configuration.GetSection("JwtSettings");
-builder.Services.Configure<JwtSettings>(_jwtsettings);
-
-builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddScoped<IUsersAccessProvider, UsersAccessProvider>();
-builder.Services.AddScoped<ITokenServiceProvider, TokenServiceProvider>();
-builder.Services.AddScoped<IEmployeeServiceProvider, EmployeeServiceProvider>();
-
-builder.Services.AddHttpClient<IHttpUtil, HttpUtil>().
-    AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
-    AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
-
-builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
-builder.Services.AddEndpointsApiExplorer();
-//builder.Services.AddSwaggerGen();
-
-builder.Services.AddSwaggerGen(options =>
-{
-
-    // Include XML comments from your assembly
-    var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
-    var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    //options.IncludeXmlComments(xmlPath);
-
-    OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme()
-    {
-        Name = "Bearer",
-        BearerFormat = "JWT",
-        Scheme = "bearer",
-        Description = "Specify the authorization token.",
-        In = ParameterLocation.Header,
-        Type = SecuritySchemeType.Http,
-    };
-
-    options.AddSecurityDefinition("jwt_auth", securityDefinition);
-
-    // Make sure swagger UI requires a Bearer token specified
-    OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme()
-    {
-        Reference = new OpenApiReference()
-        {
-            Id = "jwt_auth",
-            Type = ReferenceType.SecurityScheme
-        }
-    };
-
-    OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement()
-    {
-        {securityScheme, new string[] { }},
-    };
-
-    options.AddSecurityRequirement(securityRequirements);
-});
-
-builder.Services.AddDbContext<UsersAccessDbContext>(option =>
-{
-    option.UseInMemoryDatabase("UsersAccess");
-});
-var app = builder.Build();
-
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI();
-
-    using (var serviceScope = app.Services.CreateScope())
-    {
-        var services = serviceScope.ServiceProvider;
-        var usersAccessProvider = services.GetRequiredService<IUsersAccessProvider>();
-        usersAccessProvider.seedData();
-    }
-}
-
-app.UseAuthentication();
-app.UseAuthorization();
-
-app.MapControllers();
-app.Run();