Merged PR 62: Added new endpoint for creating multiple questions

Added new endpoint for creating multiple questions

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

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

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

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

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

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

DamageAssesmentApi/DamageAssesment.Api.Attachments/Program.cs

@@ -21,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>();

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

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

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

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

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

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

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

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

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

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

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

@@ -14,6 +14,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

@@ -11,9 +11,7 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces
         Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive);
         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> PostDocumentAsync(Models.Doculink Document);
         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, Models.Doculink Document);
-        Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, bool isactive);
         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id);
-        Task<(bool IsSuccess, Models.DoculinkAttachments DoculinkAttachments, string Path)> GetDownloadAttachmentAsync(int id);
         Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter();
 
 

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

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

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

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

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Program.cs

@@ -19,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>();

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,11 +71,11 @@ 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 } };
+                    ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = linkTypeId, CustomOrder = i, Files = new List<FileModel>() { fileModel } };
                     Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo);
                     DocumentDbContext.Documents.Add(mapper.Map<Models.Doculink, Db.Doculink>(document));
                     DocumentDbContext.SaveChanges();
@@ -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
@@ -453,35 +414,6 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id,bool isactive)
-        {
-
-            try
-            {
-                Db.Doculink Document = DocumentDbContext.Documents.AsNoTracking().Where(a => a.Id == id).FirstOrDefault();
-                if (Document == null)
-                {
-                    return (false, null, "Not Found");
-                }
-                Document.IsActive = isactive;
-                DocumentDbContext.Documents.Update(Document);
-                DocumentDbContext.SaveChanges();
-                var result = mapper.Map<Db.Doculink, Models.ResDoculink>(Document);
-                var multilan = CreateMultiLanguageObject(GetDocumentTranslations(Document.Id, ""));
-                result.titles = multilan.titles;
-                result.description = multilan.description;
-                result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, ""));
-                result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                    DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
-                return (true, result, $"DocumentId {id} deleted Successfuly");
-            }
-            catch (Exception ex)
-            {
-
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
         public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id)
         {
 

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

@@ -25,41 +25,6 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
             Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
         }
-        public async Task<string> GetFile(string path)
-        {
-            try
-            {
-                if (System.IO.File.Exists(path))
-                {
-                    return path;
-                }
-
-                return null; // File not found
-            }
-            catch (Exception ex)
-            {
-                // Handle or log the exception as needed
-                throw;
-            }
-
-        }
-        public async Task<byte[]> DownloadFile(string path)
-        {
-            try
-            {
-                if (System.IO.File.Exists(path))
-                {
-                    return await System.IO.File.ReadAllBytesAsync(path);
-                }
-
-                return null; // File not found
-            }
-            catch (Exception ex)
-            {
-                // Handle or log the exception as needed
-                throw;
-            }
-        }
 
         public Models.Doculink UploadDocument(int counter, ReqDoculink documentInfo)
         {
@@ -79,14 +44,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,
@@ -120,14 +85,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/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, Employee, null);
-                    return (true, mapper.Map<Db.Employee, Models.Employee>(_employee), null);
                 }
                 return (false, null, "Employee code is already exits");
             }

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

@@ -254,7 +254,6 @@ namespace DamageAssesment.Api.Questions.Providers
             var dbquestiontranslation = mapper.Map<List<Models.QuestionsTranslation>, List<Db.QuestionsTranslation>>(Question.Questions);
             dbquestion.QuestionTypeId = questionDbContext.QuestionTypes.Where(a => a.TypeText == Question.TypeText).Select(a => a.Id).FirstOrDefault();
             questionDbContext.Questions.Add(dbquestion);
-            questionDbContext.SaveChanges();
             dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id);
             questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation);
             questionDbContext.SaveChanges();