merge with docker-branch

.gitignore

@@ -0,0 +1,5 @@
+################################################################################
+# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
+################################################################################
+
+/DamageAssesmentApi/nginx.conf

.vs/VSWorkspaceState.json

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

DamageAssesmentApi/.gitignore

@@ -395,5 +395,4 @@ FodyWeavers.xsd
 *.msp
 
 # JetBrains Rider
-*.sln.iml
+*.sln.iml
-**/migrations/

DamageAssesmentApi/DamageAssesment.Api.Answers/Controllers/AnswersController.cs

@@ -1,9 +1,11 @@
 using DamageAssesment.Api.Answers.Interfaces;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.OpenApi.Any;
 
 namespace DamageAssesment.Api.Answers.Controllers
 {
+    //[Route("api")]
     [ApiController]
     public class AnswersController: ControllerBase
     {
@@ -15,8 +17,8 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Get all answers
         /// </summary>
-        [Authorize(Roles = "admin")]
+        
-        [HttpGet("answers")]
+        [HttpGet("Answers")]
         public async Task<ActionResult> GetAnswersAsync() {
         
             var result = await answerProvider.GetAnswersAsync();
@@ -31,12 +33,12 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// Get an answer based on answerId.
         /// </summary>
 
-        [Authorize(Roles = "admin")]
+
-        [HttpGet("answers/{id}")]
+        [HttpGet("Answers/{Id}")]
-        public async Task<ActionResult> GetAnswerByIdAsync(int id)
+        public async Task<ActionResult> GetAnswerByIdAsync(int Id)
         {
 
-            var result = await answerProvider.GetAnswerByIdAsync(id);
+            var result = await answerProvider.GetAnswerByIdAsync(Id);
             if (result.IsSuccess)
             {
                 return Ok(result.Answer);
@@ -47,11 +49,10 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Get all answers based on responseId.
         /// </summary>
-        [Authorize(Roles = "admin")]
+        [HttpGet("AnswersByResponse/{ResponseId}")]
-        [HttpGet("answers/byresponse/{responseid}")]
+        public async Task<IActionResult> GetAnswersByResponseId(int ResponseId)
-        public async Task<IActionResult> GetAnswersByResponseId(int responseid)
         {
-            var result = await this.answerProvider.GetAnswersAsync(responseid);
+            var result = await this.answerProvider.GetAnswersAsync(ResponseId);
             if(result.IsSuccess)
             {
                 return Ok(result.Answers);
@@ -61,11 +62,11 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Get all answers based on questionId.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
-        [HttpGet("answers/byquestion/{questionid}")]
+        [HttpGet("AnswersByQuestion/{QuestionId}")]
-        public async Task<IActionResult> AnswersByQuestionId(int questionid)
+        public async Task<IActionResult> AnswersByQuestionId(int QuestionId)
         {
-            var result = await this.answerProvider.GetAnswersByQuestionAsync(questionid);
+            var result = await this.answerProvider.GetAnswersByQuestionAsync(QuestionId);
             if (result.IsSuccess)
             {
                 return Ok(result.Answers);
@@ -75,8 +76,8 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Update an existing answer.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
-        [HttpPut("answers")]
+        [HttpPut("Answers")]
         public async Task<IActionResult> UpdateAnswer(Models.Answer answer)
         {
             if (answer != null)
@@ -96,8 +97,8 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Save a new answer.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
-        [HttpPost("answers")]
+        [HttpPost("Answers")]
         public async Task<IActionResult> CreateAnswer(Models.Answer answer)
         {
             if (answer != null)
@@ -114,8 +115,8 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         ///  Delete an existing answer.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
-        [HttpDelete("answers/{id}")]
+        [HttpDelete("Answers/{id}")]
         public async Task<IActionResult> DeleteAnswer(int id)
         {
             var result = await this.answerProvider.DeleteAnswerAsync(id);

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

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

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

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

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

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

DamageAssesmentApi/DamageAssesment.Api.Answers/Dockerfile

@@ -1,21 +1,39 @@
 #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
+# Use the ASP.NET base image
 FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
 WORKDIR /app
 EXPOSE 80
 
+# Use the SDK image for building
 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /src
+
+# Copy the project file and restore dependencies
 COPY ["DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj", "DamageAssesment.Api.Answers/"]
 RUN dotnet restore "DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj"
+
+# Copy the source code
 COPY . .
 WORKDIR "/src/DamageAssesment.Api.Answers"
+
+# Build the application
 RUN dotnet build "DamageAssesment.Api.Answers.csproj" -c Release -o /app/build
 
+# Publish the application
 FROM build AS publish
 RUN dotnet publish "DamageAssesment.Api.Answers.csproj" -c Release -o /app/publish /p:UseAppHost=false
 
+# Set up the final image
 FROM base AS final
 WORKDIR /app
+
+# Copy the published files
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Answers.dll"]
+
+## Set up the volume and copy the XML comments
+#VOLUME /xmlcomments
+#COPY ["DamageAssesment.Api.Answers.xml", "/xmlcomments/DamageAssesment.Api.Answers.xml"]
+#
+# Specify the entry point for the container
+ENTRYPOINT ["dotnet", "DamageAssesment.Api.Answers.dll"]

DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs

@@ -1,79 +1,34 @@
 using DamageAssesment.Api.Answers.Db;
 using DamageAssesment.Api.Answers.Interfaces;
 using DamageAssesment.Api.Answers.Providers;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.IdentityModel.Tokens;
+using Microsoft.Extensions.Options;
 using Microsoft.OpenApi.Models;
 using System.Reflection;
-using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
+
-builder.Services.AddAuthentication(item =>
-{
-    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    item.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-}).AddJwtBearer(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
-    };
-});
 // 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();
-builder.Services.AddSwaggerGen(options =>
+builder.Services.AddSwaggerGen(c =>
 {
+  
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    options.IncludeXmlComments(xmlPath);
+    c.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.AddScoped<IAnswersProvider, AnswersProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<AnswerDbContext>(option =>
 {
-    option.UseSqlServer("AnswerConnection");
+    option.UseInMemoryDatabase("Answers");
 });
 
 var app = builder.Build();
@@ -82,10 +37,23 @@ var app = builder.Build();
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {
+    //using (var serviceScope = app.Services.CreateScope())
+    //{
+    //    var services = serviceScope.ServiceProvider;
+    //    var answerProvider = services.GetRequiredService<IAnswersProvider>();
+    //    answerProvider.SeedData();
+    //}
     app.UseSwagger();
-    app.UseSwaggerUI();
+    app.UseSwaggerUI(
+        options =>
+    {
+        //switch for local environment
+        //options.SwaggerEndpoint("/swagger/v1/swagger.json", "");
+        options.SwaggerEndpoint("/answers/swagger/v1/swagger.json","" );
+        
+    } );
 }
-app.UseAuthentication();
+
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -1,33 +1,4 @@
-{
+{
-  "profiles": {
-    "DamageAssesment.Api.Answers": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5200"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "environmentVariables": {
-        "ASPNETCORE_URLS": "http://+:80"
-      },
-      "publishAllPorts": true
-    }
-  },
   "$schema": "https://json.schemastore.org/launchsettings.json",
   "iisSettings": {
     "windowsAuthentication": false,
@@ -36,5 +7,25 @@
       "applicationUrl": "http://localhost:18005",
       "sslPort": 0
     }
+  },
+  "profiles": {
+    "DamageAssesment.Api.Answers": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5200",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
   }
-}
+}

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

@@ -8,20 +8,19 @@ namespace DamageAssesment.Api.Answers.Providers
 {
     public class AnswersProvider : IAnswersProvider
     {
+
         private AnswerDbContext answerDbContext;
         private ILogger<AnswersProvider> logger;
         private IMapper mapper;
 
-        // Constructor with dependency injection and data seeding
         public AnswersProvider(AnswerDbContext answerDbContext, ILogger<AnswersProvider> logger, IMapper mapper)
         {
             this.answerDbContext = answerDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            SeedData(); // Seed initial data if the table is empty
+            //SeedData();
         }
 
-        // Get all answers
         public async Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersAsync()
         {
             try
@@ -41,9 +40,9 @@ namespace DamageAssesment.Api.Answers.Providers
                 logger?.LogError(ex.ToString());
                 return (false, null, ex.Message);
             }
+
         }
 
-        // Get an answer by its ID
         public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> GetAnswerByIdAsync(int Id)
         {
             try
@@ -64,8 +63,6 @@ namespace DamageAssesment.Api.Answers.Providers
                 return (false, null, ex.Message);
             }
         }
-
-        // Get answers by survey response ID
         public async Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersAsync(int surveyResponseId)
         {
             try
@@ -77,17 +74,17 @@ namespace DamageAssesment.Api.Answers.Providers
                 {
                     var result = mapper.Map<IEnumerable<Db.Answer>, IEnumerable<Models.Answer>>(respAnswers);
                     return (true, result, null);
+
                 }
                 return (false, null, "Not Found");
             }
             catch (Exception ex)
             {
+
                 logger?.LogError(ex.ToString());
                 return (false, null, ex.Message);
             }
         }
-
-        // Get answers by question ID
         public async Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersByQuestionAsync(int questionId)
         {
             try
@@ -99,17 +96,17 @@ namespace DamageAssesment.Api.Answers.Providers
                 {
                     var result = mapper.Map<IEnumerable<Db.Answer>, IEnumerable<Models.Answer>>(respAnswers);
                     return (true, result, null);
+
                 }
                 return (false, null, "Not Found");
             }
             catch (Exception ex)
             {
+
                 logger?.LogError(ex.ToString());
                 return (false, null, ex.Message);
             }
         }
-
-        // Create a new answer
         public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> PostAnswerAsync(Models.Answer Answer)
         {
             try
@@ -123,7 +120,7 @@ namespace DamageAssesment.Api.Answers.Providers
                     var result = mapper.Map<Db.Answer, Models.Answer>(answer);
                     return (true, result, null);
                 }
-                return (false, null, "Answer is already exists");
+                return (false, null, "Answer is already exits");
             }
             catch (Exception ex)
             {
@@ -131,8 +128,6 @@ namespace DamageAssesment.Api.Answers.Providers
                 return (false, null, ex.Message);
             }
         }
-
-        // Update an existing answer
         public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> UpdateAnswerAsync(Models.Answer Answer)
         {
             try
@@ -161,14 +156,14 @@ namespace DamageAssesment.Api.Answers.Providers
             }
             catch (Exception ex)
             {
+
                 logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
+                return (false,null, ex.Message);
             }
         }
-
-        // Delete an answer by its ID
         public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> DeleteAnswerAsync(int Id)
         {
+
             try
             {
                 Db.Answer answer = answerDbContext.Answers.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
@@ -178,32 +173,30 @@ namespace DamageAssesment.Api.Answers.Providers
                 }
                 answerDbContext.Answers.Remove(answer);
                 answerDbContext.SaveChanges();
-                return (true, mapper.Map<Db.Answer, Models.Answer>(answer), $"AnswerId {Id} deleted successfully");
+                return (true, mapper.Map<Db.Answer, Models.Answer>(answer), $"AnswerId {Id} deleted Successfuly");
             }
             catch (Exception ex)
             {
+
                 logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
+                return (false,null, ex.Message);
             }
         }
-
-        // Check if an answer with a specific ID exists
         private bool AnswerExists(int id)
         {
             return answerDbContext.Answers.AsNoTracking().Count(e => e.Id == id) > 0;
         }
 
-        // Seed initial data if the table is empty
         public void SeedData()
         {
             if (!answerDbContext.Answers.Any())
             {
-                answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "Yes", Comment = "", QuestionId = 1, SurveyResponseId = 1 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 1, AnswerText = "Yes", Comment = "", QuestionId = 1, SurveyResponseId = 1 });
-                answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "myComment", QuestionId = 2, SurveyResponseId = 1 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 2, AnswerText = "Yes", Comment = "myComment", QuestionId = 2, SurveyResponseId = 1 });
-                //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 3, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
-                //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 4, AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 });
-                //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 5, AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 });
-                //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 6, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 });
                 answerDbContext.SaveChanges();
             }
         }

DamageAssesmentApi/DamageAssesment.Api.Answers/appsettings.json

@@ -8,10 +8,5 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*",
+  "AllowedHosts": "*"
-  "ConnectionStrings": {
-    //"AnswerConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "AnswerConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
-
-  }
 }

DamageAssesmentApi/DamageAssesment.Api.Attachments.Test/AttachmentsServiceTest.cs

@@ -20,7 +20,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task GetAttachmentsAsync_ShouldReturnStatusCode200()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse();
             mockAttachmentService.Setup(service => service.GetAttachmentsAsync()).ReturnsAsync(mockResponse);
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
@@ -33,7 +33,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task GetAttachmentsAsync_ShouldReturnStatusCode204()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNoContentResponse();
             mockAttachmentService.Setup(service => service.GetAttachmentsAsync()).ReturnsAsync(mockResponse);
 
@@ -47,7 +47,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task GetAttachmentAsync_ShouldReturnStatusCode200()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse(1);
             mockAttachmentService.Setup(service => service.GetAttachmentByIdAsync(1)).ReturnsAsync(mockResponse);
 
@@ -61,7 +61,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task GetAttachmentAsync_ShouldReturnStatusCode404()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNotFoundResponse();
             mockAttachmentService.Setup(service => service.GetAttachmentByIdAsync(99)).ReturnsAsync(mockResponse);
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
@@ -73,7 +73,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task PostAttachmentAsync_ShouldReturnStatusCode200()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse();
             var AttachmentResponse = await MockData.GetAttachmentInfo(0);
             var mockInputAttachment = await MockData.getInputAttachmentData();
@@ -89,7 +89,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task PostAttachmentAsync_ShouldReturnStatusCode400()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockInputAttachment = await MockData.getInputAttachmentData();
             var mockResponse = await MockData.getBadRequestResponse();
             mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse);
@@ -105,7 +105,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task PutAttachmentAsync_ShouldReturnStatusCode200()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse();
             var AttachmentResponse = await MockData.GetAttachmentInfo(1);
             var mockInputAttachment = await MockData.getInputAttachmentData();
@@ -121,7 +121,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task PutAttachmentAsync_ShouldReturnStatusCode400()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockInputAttachment = await MockData.getInputAttachmentData();
             var mockResponse = await MockData.getBadRequestResponse();
             mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse);
@@ -136,7 +136,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task DeleteAttachmentAsync_ShouldReturnStatusCode200()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse(1);
             mockAttachmentService.Setup(service => service.DeleteAttachmentAsync(1)).ReturnsAsync(mockResponse);
             mockUploadService.Setup(service => service.Deletefile(""));
@@ -150,7 +150,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task DeleteAttachmentAsync_ShouldReturnStatusCode404()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNotFoundResponse();
             mockAttachmentService.Setup(service => service.DeleteAttachmentAsync(1)).ReturnsAsync(mockResponse);
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);

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

@@ -1,30 +1,29 @@
 using Azure;
 using DamageAssesment.Api.Attachments.Interfaces;
 using DamageAssesment.Api.Attachments.Models;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using System.Net.Http.Headers;
 
 namespace DamageAssesment.Api.Attachments.Controllers
 {
+    //[Route("api")]
     [ApiController]
     public class AttachmentsController : ControllerBase
     {
         private IAttachmentsProvider AttachmentProvider;
         private IUploadService UploadService;
-        private IAzureBlobService azureBlobService;
 
-        public AttachmentsController(IAttachmentsProvider AttachmentsProvider,  IAzureBlobService azureBlobService)
+        public AttachmentsController(IAttachmentsProvider AttachmentsProvider, IUploadService uploadService)
         {
             this.AttachmentProvider = AttachmentsProvider;
-            this.azureBlobService = azureBlobService;
+            this.UploadService = uploadService;  
         }
         /// <summary>
         /// Get all attachments.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
-        [HttpGet("attachments")]
+        [HttpGet("Attachments")]
         public async Task<ActionResult> GetAttachmentsAsync()
         {
 
@@ -39,8 +38,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// <summary>
         /// Get all attachments by attachmentId.
         /// </summary>
-        [Authorize(Roles = "admin")]
+        [HttpGet("Attachments/{id}")]
-        [HttpGet("attachments/{id}")]
         public async Task<ActionResult> GetAttachmentbyIdAsync(int id)
         {
 
@@ -83,8 +81,8 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// <summary>
         /// Save new Attachment(s)
         /// </summary>
-        [Authorize(Roles = "admin")]
+
-        [HttpPost("attachments"), DisableRequestSizeLimit]
+        [HttpPost("Attachments"), DisableRequestSizeLimit]
         public async Task<IActionResult> UploadAttachmentAsync(AttachmentInfo attachmentInfo)
         {
             try
@@ -92,7 +90,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
                 if (attachmentInfo.Answers.Count > 0)
                 {
                     var Attachments =  await this.AttachmentProvider.GetAttachmentCounter();
-                    List<Models.Attachment> attachments = await azureBlobService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers);
+                    List<Models.Attachment> attachments = UploadService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers);
                     var result =  await this.AttachmentProvider.PostAttachmentAsync(attachments);
                     if (result.IsSuccess)
                     {
@@ -110,8 +108,8 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// <summary>
         /// Modify an new attachment.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
-        [HttpPut("attachments"), DisableRequestSizeLimit]
+        [HttpPut("Attachments"), DisableRequestSizeLimit]
         public async Task<IActionResult> UpdateAttachmentAsync(AttachmentInfo attachmentInfo)
         {
             try
@@ -121,7 +119,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
                     var res =  await this.AttachmentProvider.GetAttachmentInfo(attachmentInfo.Answers);
                     if (res.IsSuccess)
                     {
-                        List<Models.Attachment> attachments = await azureBlobService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments);
+                        List<Models.Attachment> attachments = UploadService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments);
                         var result = await this.AttachmentProvider.PutAttachmentAsync(attachments);
                         if (result.IsSuccess)
                         {
@@ -141,16 +139,15 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// <summary>
         /// Delete an existing attachment.
         /// </summary>
-        [Authorize(Roles = "admin")]
+        [HttpDelete("Delete")]
-        [HttpDelete("attachments/{id}")]
+        public async Task<IActionResult> DeleteAttachment(int Id)
-        public async Task<IActionResult> DeleteAttachment(int id)
         {
             // database soft delete
-            var result = await this.AttachmentProvider.DeleteAttachmentAsync(id);
+            var result = await this.AttachmentProvider.DeleteAttachmentAsync(Id);
             if (result.IsSuccess)
             {
                 // deleting file from folder
-                azureBlobService.Movefile(result.Attachment.URI);
+                UploadService.Movefile(result.Attachment.URI);
                 return Ok(result.Attachment);
             }
             return NotFound();

DamageAssesmentApi/DamageAssesment.Api.Attachments/DMS_Attachments/Active/Response-1/Answer-1/Attachment_1.txt

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

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

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

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

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

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

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

DamageAssesmentApi/DamageAssesment.Api.Attachments/Dockerfile

@@ -1,23 +1,35 @@
 #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
+# Use the ASP.NET base image
 FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
 WORKDIR /app
 EXPOSE 80
 
+# Use the SDK image for building
 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /src
+
+# Copy the project file and restore dependencies
 COPY ["DamageAssesment.Api.Attachments/DamageAssesment.Api.Attachments.csproj", "DamageAssesment.Api.Attachments/"]
 RUN dotnet restore "DamageAssesment.Api.Attachments/DamageAssesment.Api.Attachments.csproj"
+
+# Copy the source code
 COPY . .
 WORKDIR "/src/DamageAssesment.Api.Attachments"
+
+# Build the application
 RUN dotnet build "DamageAssesment.Api.Attachments.csproj" -c Release -o /app/build
 
+# Publish the application
 FROM build AS publish
 RUN dotnet publish "DamageAssesment.Api.Attachments.csproj" -c Release -o /app/publish /p:UseAppHost=false
 
+# Set up the final image
 FROM base AS final
 WORKDIR /app
+
+# Copy the published files
 COPY --from=publish /app/publish .
+
 # Create directories for attachments and set permissions
 RUN mkdir -p /app/DMS_Attachments/Active && \
     mkdir -p /app/DMS_Attachments/Deleted && \
@@ -26,4 +38,10 @@ RUN mkdir -p /app/DMS_Attachments/Active && \
 # Update appsettings.json with the correct paths for attachments
 RUN sed -i 's#"folderpath": "DMS_Attachments/Active"#"folderpath": "/app/DMS_Attachments/Active"#' appsettings.json && \
     sed -i 's#"Deletepath": "DMS_Attachments/Deleted"#"Deletepath": "/app/DMS_Attachments/Deleted"#' appsettings.json
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Attachments.dll"]
+
+## Set up the volume and copy the XML comments
+#VOLUME /xmlcomments
+#COPY ["DamageAssesment.Api.Attachments/bin/Release/net6.0/DamageAssesment.Api.Attachments.xml", "/xmlcomments/"]
+#
+# Specify the entry point for the container
+ENTRYPOINT ["dotnet", "DamageAssesment.Api.Attachments.dll"]

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

@@ -13,5 +13,6 @@ namespace DamageAssesment.Api.Attachments.Interfaces
         Task<(bool IsSuccess, int counter, string Path)> DeleteBulkAttachmentsAsync(int responseId, List<int> answerIds);
         Task<(bool IsSuccess, int counter, string message)> GetAttachmentCounter();
         Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentInfo(List<AnswerInfo> answers);
+       
     }
 }

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

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

DamageAssesmentApi/DamageAssesment.Api.Attachments/Program.cs

@@ -1,75 +1,25 @@
 using DamageAssesment.Api.Attachments.Db;
 using DamageAssesment.Api.Attachments.Interfaces;
 using DamageAssesment.Api.Attachments.Providers;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.FileProviders;
-using Microsoft.IdentityModel.Tokens;
-using Microsoft.OpenApi.Models;
 using System.Reflection;
-using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
+
-builder.Services.AddAuthentication(item =>
-{
-    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    item.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-}).AddJwtBearer(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
-    };
-});
 // 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();
-builder.Services.AddSwaggerGen(options =>
+builder.Services.AddSwaggerGen(c =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    options.IncludeXmlComments(xmlPath);
+    c.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.AddScoped<IAttachmentsProvider, AttachmentsProvider>();
 builder.Services.AddScoped<IUploadService, UploadService>();
@@ -77,7 +27,7 @@ builder.Services.AddScoped<IAzureBlobService,AzureBlobService>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<AttachmentsDbContext>(option =>
 {
-    option.UseSqlServer("AttachmentConnection");
+    option.UseInMemoryDatabase("Attachments");
 });
 builder.Services.Configure<FormOptions>(o =>
 {
@@ -92,10 +42,16 @@ var app = builder.Build();
 if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();
-    app.UseSwaggerUI();
+    app.UseSwaggerUI(options => {
+       //switch for local environment
+        // options.SwaggerEndpoint("/swagger/v1/swagger.json", "");
+        options.SwaggerEndpoint("/attachments/swagger/v1/swagger.json", "");
+     
+    });
+
+
 }
 
-app.UseAuthentication();
 app.UseAuthorization();
 app.UseHttpsRedirection();
 

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

@@ -1,33 +1,4 @@
-{
+{
-  "profiles": {
-    "DamageAssesment.Api.Attachments": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5243"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "environmentVariables": {
-        "ASPNETCORE_URLS": "http://+:80"
-      },
-      "publishAllPorts": true
-    }
-  },
   "$schema": "https://json.schemastore.org/launchsettings.json",
   "iisSettings": {
     "windowsAuthentication": false,
@@ -36,5 +7,25 @@
       "applicationUrl": "http://localhost:65305",
       "sslPort": 0
     }
+  },
+  "profiles": {
+    "DamageAssesment.Api.Attachments": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5243",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
   }
-}
+}

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

@@ -21,7 +21,7 @@ namespace DamageAssesment.Api.Attachments.Providers
             this.logger = logger;
             this.mapper = mapper;
             this.uploadservice = uploadservice;
-            //SeedData();
+           // SeedData();
         }
         public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync()
         {

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

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

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

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

DamageAssesmentApi/DamageAssesment.Api.Attachments/appsettings.json

@@ -11,14 +11,6 @@
   "AllowedHosts": "*",
   "Fileupload": {
     "folderpath": "DMS_Attachments/Active",
-    "Deletepath": "DMS_Attachments/Deleted",
+    "Deletepath": "DMS_Attachments/Deleted"
-    "BlobConnectionString": "DefaultEndpointsProtocol=https;AccountName=damagedoculink;AccountKey=blynpwrAQtthEneXC5f4vFewJ3tPV+QZUt1AX3nefZScPPjkr5hMoC18B9ni6/ZYdhRiERPQw+hB+AStonf+iw==;EndpointSuffix=core.windows.net",
-    "BlobContainerName": "doculinks"
-  },
-  "ConnectionStrings": {
-    //"AttachmentConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "AttachmentConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
-
   }
 }
-  

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

@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="Moq" Version="4.18.4" />
-    <PackageReference Include="coverlet.collector" Version="3.2.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DamageAssesment.Api.DocuLinks\DamageAssesment.Api.DocuLinks.csproj" />
-  </ItemGroup>
-
-</Project>

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

@@ -1,71 +0,0 @@
-using DamageAssesment.Api.DocuLinks.Db;
-using DamageAssesment.Api.DocuLinks.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Mail;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DamageAssesment.Api.DocuLinks.Test
-{
-    public class LinkTypeMockData
-    {
-
-        public static async Task<(bool, List<DocuLinks.Models.ResLinkType>, string)> getOkResponse()
-        {
-            List<DocuLinks.Models.ResLinkType> list = new List<DocuLinks.Models.ResLinkType>();
-            Dictionary<string, string> dictdesc = new Dictionary<string, string>();
-            dictdesc.Add("en", "test"); dictdesc.Add("fr", "tester");
-            for (int i = 1; i < 4; i++)
-            {
-                list.Add(new DocuLinks.Models.ResLinkType()
-                {
-                    Id = i,
-                    titles= dictdesc,
-                    CustomOrder=i,
-                    IsActive = true
-                });
-            }
-            return (true, list, null);
-        }
-        public static async Task<(bool, DocuLinks.Models.ResLinkType, string)> getOkResponse(int Id)
-        {
-            var DocuLinks = await getOkResponse();
-            var Document = DocuLinks.Item2.FirstOrDefault(s => s.Id == Id);
-            return (true, Document, null);
-        }
-        public static async Task<(bool, DocuLinks.Models.ResLinkType, string)> getBadRequestResponse()
-        {
-            return (false, null, "Bad Request");
-        }
-
-        public static async Task<(bool, DocuLinks.Models.ResLinkType, string)> getNotFoundResponse()
-        {
-            return (false, null, "Not Found");
-        }
-        public static async Task<(bool, IEnumerable<DocuLinks.Models.ResLinkType>, string)> getNoContentResponse()
-        {
-            IEnumerable<DocuLinks.Models.ResLinkType> list = new List<DocuLinks.Models.ResLinkType>();
-            return (false, list, null);
-        }
-
-        public static async Task<DocuLinks.Models.LinkType> getInputLinkData(int id)
-        {
-            List<Models.LinksTranslation> DocuLinksTranslations = new List<Models.LinksTranslation>();
-            DocuLinksTranslations.Add(new Models.LinksTranslation()
-            {
-                Language = "en",
-                TypeText = "tel"
-            });
-            return new Models.LinkType
-            {
-                Id = id,
-                linksTranslations = DocuLinksTranslations,
-                CustomOrder=1,
-                IsActive = true
-            };
-        }
-
-    }
-}

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

@@ -1,189 +0,0 @@
-using DamageAssesment.Api.DocuLinks.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Mail;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DamageAssesment.Api.DocuLinks.Test
-{
-    public class MockData
-    {
-
-        public static async Task<(bool, List<DocuLinks.Models.ResDoculink>, string)> getOkResponses()
-        {
-            List<DocuLinks.Models.ResDoculink> list = new List<DocuLinks.Models.ResDoculink>();
-
-            for (int i = 1; i < 4; i++)
-            {
-                Dictionary<string, string> dicttitle = new Dictionary<string, string>();
-                Dictionary<string, string> dictdesc = new Dictionary<string, string>();
-                dicttitle.Add("en", "test"); dicttitle.Add("fr", "tester");
-                dictdesc.Add("en", "test"); dictdesc.Add("fr", "tester");
-                List<DoculinkTranslation> DocuLinksTranslations = new List<DoculinkTranslation>();
-                DocuLinksTranslations.Add(new DoculinkTranslation()
-                {
-                    Language = "en",
-                    title = "tel" + i,
-                    description = "Sample" + i
-                });
-                List<DoculinkAttachments> doclinksAttachments = new List<DoculinkAttachments>();
-                doclinksAttachments.Add(new DoculinkAttachments()
-                {
-                    docName = "",
-                    Path = "www.google.com",
-                    IsAttachments = false,
-                    Language = "en",
-                    CustomOrder = 1
-                });
-                list.Add(new DocuLinks.Models.ResDoculink()
-                {
-
-                    Id = i,
-                    linkTypeId = i,
-                    IsActive = true,
-                    titles = dicttitle,
-                    description = dictdesc,
-                    CustomOrder = i,
-                    doclinksAttachments = doclinksAttachments
-                });
-            }
-           // List<ResDoculinks> doculinks = list.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
-            return (true, list, null);
-        }
-
-
-        public static async Task<(bool, List<DocuLinks.Models.ResDoculink>, string)> getOkResponse()
-        {
-            List<DocuLinks.Models.ResDoculink> list = new List<DocuLinks.Models.ResDoculink>();
-
-            for (int i = 1; i < 4; i++)
-            {
-                Dictionary<string, string> dicttitle = new Dictionary<string, string>();
-                Dictionary<string, string> dictdesc = new Dictionary<string, string>();
-                dicttitle.Add("en", "test"); dicttitle.Add("fr", "tester");
-                dictdesc.Add("en", "test"); dictdesc.Add("fr", "tester");
-                List<DoculinkTranslation> DocuLinksTranslations = new List<DoculinkTranslation>();
-                DocuLinksTranslations.Add(new DoculinkTranslation()
-                {
-                    Language = "en",
-                    title = "tel" + i,
-                    description = "Sample" + i
-                });
-                List<DoculinkAttachments> doclinksAttachments = new List<DoculinkAttachments>();
-                doclinksAttachments.Add(new DoculinkAttachments()
-                {
-                    docName = "",
-                    Path = "www.google.com",
-                    IsAttachments = false,
-                    CustomOrder = 1
-                });
-                list.Add(new DocuLinks.Models.ResDoculink()
-                {
-
-                    Id = i,
-                    linkTypeId = i,
-                    IsActive = true,
-                    titles = dicttitle,
-                    description = dictdesc,
-                    CustomOrder = i,
-                    doclinksAttachments = doclinksAttachments
-                });
-            }
-            return (true, list, null);
-        }
-        public static async Task<(bool, DocuLinks.Models.ResDoculink, string)> getOkResponse(int Id)
-        {
-            var DocuLinks = await getOkResponse();
-            var Document = DocuLinks.Item2.FirstOrDefault(s => s.Id == Id);
-            return (true, Document, null);
-        }
-
-        public static async Task<(bool, DocuLinks.Models.ResDoculink, string)> getBadRequestResponse()
-        {
-            return (false, null, "Bad Request");
-        }
-
-        public static async Task<(bool, DocuLinks.Models.ResDoculink, string)> getNotFoundResponse()
-        {
-            return (false, null, "Not Found");
-        }
-        public static async Task<(bool, IEnumerable<DocuLinks.Models.ResDoculinks>, string)> getNoContentResponses()
-        {
-            IEnumerable<DocuLinks.Models.ResDoculinks> list = new List<DocuLinks.Models.ResDoculinks>();
-            return (false, list, null);
-        }
-        public static async Task<(bool, IEnumerable<DocuLinks.Models.ResDoculink>, string)> getNoContentResponse()
-        {
-            IEnumerable<DocuLinks.Models.ResDoculink> list = new List<DocuLinks.Models.ResDoculink>();
-            return (false, list, null);
-        }
-        public static async Task<DocuLinks.Models.ReqDoculink> GetDocuLinksInfo(int id)
-        {
-
-            List<FileModel> fileModels = new List<FileModel>();
-            fileModels.Add(new FileModel() { FileName = "Sample", FileContent = "c2FtcGxl", FileExtension = ".txt", IsAttachments = true, CustomOrder = 1 });
-            return new ReqDoculink() { Id = id, linkTypeId = 1, CustomOrder = 1, Files = fileModels };
-        }
-        public static async Task<DocuLinks.Models.Doculink> getInputDocumentData()
-        {
-            List<DoculinkTranslation> DocuLinksTranslations = new List<DoculinkTranslation>();
-            DocuLinksTranslations.Add(new DoculinkTranslation()
-            {
-                Language = "en",
-                title = "tel",
-                description = "Sample"
-            });
-            List<DoculinkAttachments> doclinksAttachments = new List<DoculinkAttachments>();
-            doclinksAttachments.Add(new DoculinkAttachments()
-            {
-                docName = "",
-                Path = "www.google.com",
-                IsAttachments = false,
-                Language = "en",
-                CustomOrder = 1
-            });
-            return new Models.Doculink
-            {
-                Id = 1,
-                linkTypeId = 1,
-                IsActive = true,
-                CustomOrder = 1,
-                documentsTranslations = DocuLinksTranslations,
-                doclinksAttachments = doclinksAttachments
-            };
-        }
-        public static async Task<List<DocuLinks.Models.Doculink>> getInputDocuLinksData()
-        {
-            List<DoculinkTranslation> DocuLinksTranslations = new List<DoculinkTranslation>();
-            DocuLinksTranslations.Add(new DoculinkTranslation()
-            {
-                Language = "en",
-                title = "tel",
-                description = "Sample"
-            });
-            List<DoculinkAttachments> doclinksAttachments = new List<DoculinkAttachments>();
-            doclinksAttachments.Add(new DoculinkAttachments()
-            {
-                docName = "",
-                Path = "www.google.com",
-                IsAttachments = false,
-                Language="en",
-                CustomOrder = 1
-            });
-            List<DocuLinks.Models.Doculink> DocuLinks = new List<Models.Doculink>();
-            DocuLinks.Add(new Models.Doculink
-            {
-                Id = 1,
-                linkTypeId = 1,
-                IsActive = true,
-                CustomOrder = 1,
-                documentsTranslations = DocuLinksTranslations,
-                doclinksAttachments = doclinksAttachments
-            });
-            return DocuLinks;
-        }
-
-    }
-}

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

@@ -1,20 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-
-namespace DamageAssesment.Api.DocuLinks.Db
-{
-    [Table("DoculinkAttachments")]
-    public class DoculinkAttachments
-    {
-
-        [Key]
-        public int Id { get; set; }
-        [ForeignKey("Document")]
-        public int DocumentId { get; set; }
-        public string docName { get; set; }
-        public string Path { get; set; }
-        public bool IsAttachments { get; set; }
-        public int CustomOrder { get; set; }
-        public string Language { get; set; }
-    }
-}

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

@@ -1,45 +0,0 @@
-using Microsoft.AspNetCore.Identity;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using System.ComponentModel.DataAnnotations;
-
-namespace DamageAssesment.Api.DocuLinks.Db
-{
-    public class DoculinkDbContext : DbContext
-    {
-        private IConfiguration _Configuration { get; set; }
-        public DoculinkDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
-        {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("DoculinkConnection"));
-        }
-        public DbSet<Db.Doculink> Documents { get; set; }
-        public DbSet<Db.LinkType> LinkTypes { get; set; }
-        public DbSet<Db.DoculinkTranslation> DocumentsTranslations { get; set; }
-        public DbSet<Db.LinksTranslation> LinksTranslations { get; set; }
-        public DbSet<Db.DoculinkAttachments> DoclinksAttachments { get; set; }
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
-            modelBuilder.Entity<Doculink>()
-                .Property(item => item.Id)
-                .ValueGeneratedOnAdd();
-            modelBuilder.Entity<LinkType>()
-                .Property(item => item.Id)
-                .ValueGeneratedOnAdd();
-            modelBuilder.Entity<DoculinkTranslation>()
-                .Property(item => item.Id)
-                .ValueGeneratedOnAdd();
-            modelBuilder.Entity<LinksTranslation>()
-                .Property(item => item.Id)
-                .ValueGeneratedOnAdd();
-            modelBuilder.Entity<DoculinkAttachments>()
-                .Property(item => item.Id)
-                .ValueGeneratedOnAdd();
-        }
-    }
-}

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

@@ -1,16 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-
-namespace DamageAssesment.Api.DocuLinks.Db
-{
-    [Table("DoculinkTypeTrans")]
-    public class LinksTranslation
-    {
-        [Key]
-        public int Id { get; set; }
-        [ForeignKey("LinkType")]
-        public int LinkTypeId { get; set; }
-        public string TypeText { get; set; }
-        public string Language { get; set; }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Dockerfile

@@ -1,30 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-COPY ["DamageAssesment.Api.DocuLinks/DamageAssesment.Api.DocuLinks.csproj", "DamageAssesment.Api.DocuLinks/"]
-RUN dotnet restore "DamageAssesment.Api.DocuLinks/DamageAssesment.Api.DocuLinks.csproj"
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.DocuLinks"
-RUN dotnet build "DamageAssesment.Api.DocuLinks.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.DocuLinks.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-# Create directories for attachments and set permissions
-RUN mkdir -p /app/DASA_Documents/Active && \
-    mkdir -p /app/DASA_Documents/Deleted && \
-    chown -R www-data:www-data /app/DASA_Documents
-
-# Update appsettings.json with the correct paths for attachments
-RUN sed -i 's#"folderpath": "DASA_Documents/Active"#"folderpath": "/app/DASA_Documents/Active"#' appsettings.json && \
-    sed -i 's#"Deletepath": "DASA_Documents/Deleted"#"Deletepath": "/app/DASA_Documents/Deleted"#' appsettings.json
-
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.DocuLinks.dll"]

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

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

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

@@ -1,19 +0,0 @@
-using DamageAssesment.Api.DocuLinks.Models;
-
-namespace DamageAssesment.Api.DocuLinks.Interfaces
-{
-    public interface IDoculinkProvider : ILinkTypesProvider
-    {
-        Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> GetDocumentAsync(int id, string? linktype, string? language);
-        Task<(bool IsSuccess, Models.Doculink Document, string ErrorMessage)> GetDocumentByidAsync(int id);
-        // Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetDocumnetsAsync(string? language);
-        Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive);
-        Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive);
-        Task<(bool IsSuccess, 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)> DeleteDocumentAsync(int id);
-        Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter();
-
-
-    }
-}

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

@@ -1,11 +0,0 @@
-namespace DamageAssesment.Api.DocuLinks.Interfaces
-{
-    public interface ILinkTypesProvider
-    {
-        Task<(bool IsSuccess, Models.ResLinkType LinkType, string ErrorMessage)> GetLinkTypeAsync(int id,string? language);
-        Task<(bool IsSuccess, IEnumerable<Models.ResLinkType> LinkTypes, string ErrorMessage)> GetLinkTypesAsync(string? language);
-        Task<(bool IsSuccess, Models.ResLinkType LinkType, string ErrorMessage)> PostLinkTypeAsync(Models.LinkType LinkType);
-        Task<(bool IsSuccess, Models.ResLinkType LinkType, string ErrorMessage)> UpdateLinkTypeAsync(int id,Models.LinkType LinkType);
-        Task<(bool IsSuccess, Models.ResLinkType LinkType, string ErrorMessage)> DeleteLinkTypeAsync(int id);
-    }
-}

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

@@ -1,12 +0,0 @@
-using DamageAssesment.Api.DocuLinks.Models;
-
-namespace DamageAssesment.Api.DocuLinks.Interfaces
-{
-    public interface IUploadService
-    {
-        Models.Doculink UploadDocument( int counter, ReqDoculink documentInfo);
-        public Models.Doculink UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo);
-        void Deletefile(string path);
-        void Movefile(string path);
-    }
-}

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

@@ -1,30 +0,0 @@
-using DamageAssesment.Api.DocuLinks.Models;
-using System.ComponentModel.DataAnnotations;
-
-namespace DamageAssesment.Api.DocuLinks.Models
-{
-    public class Doculink : BaseDoculink
-    {
-        public List<DoculinkTranslation> documentsTranslations { get; set; }
-    }
-    public class ResDoculinks
-    {
-        public int linkTypeId { get; set; }
-        public List<ResDoculink> doculinks { get; set; }   
-    }
-    public class ResDoculink:BaseDoculink
-    {
-        public object titles { get; set; }
-        public object description { get; set; }
-        public object linktypes { get; set; }
-    }
-    public class BaseDoculink
-    {
-        public int Id { get; set; }
-        public int linkTypeId { get; set; }
-        public bool IsActive { get; set; }
-        public bool IsDeleted { get; set; }
-        public List<DoculinkAttachments> doclinksAttachments { get; set; }
-        public int CustomOrder { get; set; }
-    }
-}

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

@@ -1,14 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-
-namespace DamageAssesment.Api.DocuLinks.Models
-{
-    public class DoculinkAttachments
-    {
-        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/LinkType.cs

@@ -1,20 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace DamageAssesment.Api.DocuLinks.Models
-{
-    public class LinkType : BaseLinkType
-    {
-        public List<LinksTranslation> linksTranslations { get; set; }
-    }
-    public class BaseLinkType
-    {
-        public int Id { get; set; }
-        public bool IsActive { get; set; }
-        public int CustomOrder { get; set; }
-    }
-
-    public class ResLinkType : BaseLinkType
-    {
-        public object titles { get; set; }
-    }
-}

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

@@ -1,11 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-
-namespace DamageAssesment.Api.DocuLinks.Models
-{
-    public class LinksTranslation
-    {
-        public string TypeText { get; set; }
-        public string Language { get; set; }
-    }
-}

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

@@ -1,23 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace DamageAssesment.Api.DocuLinks.Models
-{
-    public class ReqDoculink
-    {
-        public int Id { get; set; }
-        public int linkTypeId { get; set; }
-        public List<DoculinkTranslation> documentsTranslations { get; set; }
-        public int CustomOrder { get; set; }
-        public List<FileModel>? Files { get; set; }
-    }
-    public class FileModel
-    {
-        public string? FileName { get; set; }
-        public string? FileContent { get; set; }
-        public string? FileExtension { get; set; }
-        public int CustomOrder { get; set; }
-        public string url { get;set; }
-        public string Language { get; set; }
-        public bool IsAttachments { get; set; }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Profiles/DoculinkProfile.cs

@@ -1,22 +0,0 @@
-using AutoMapper;
-
-namespace DamageAssesment.Api.DocuLinks.Profiles
-{
-    public class DoculinkProfile : AutoMapper.Profile
-    {
-        public DoculinkProfile()
-        {
-            CreateMap<Db.Doculink, Models.ResDoculink>() ;
-            CreateMap<Db.Doculink, Models.Doculink>();
-            CreateMap<Models.Doculink, Db.Doculink>();
-            CreateMap<Db.LinkType, Models.ResLinkType>();
-            CreateMap<Models.LinkType, Db.LinkType>();
-            CreateMap<Db.DoculinkTranslation, Models.DoculinkTranslation>();
-            CreateMap<Models.DoculinkTranslation, Db.DoculinkTranslation>();
-            CreateMap<Db.LinksTranslation, Models.LinksTranslation>();
-            CreateMap<Models.LinksTranslation, Db.LinksTranslation>();
-            CreateMap<Db.DoculinkAttachments, Models.DoculinkAttachments>();
-            CreateMap<Models.DoculinkAttachments, Db.DoculinkAttachments>();
-        }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Program.cs

@@ -1,94 +0,0 @@
-using DamageAssesment.Api.DocuLinks.Db;
-using DamageAssesment.Api.DocuLinks.Interfaces;
-using DamageAssesment.Api.DocuLinks.Providers;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.IdentityModel.Tokens;
-using System.Reflection;
-using System.Text;
-using Microsoft.OpenApi.Models;
-
-var builder = WebApplication.CreateBuilder(args);
-
-// Add services to the container.
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddAuthentication(item =>
-{
-    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    item.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-}).AddJwtBearer(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
-    };
-});
-builder.Services.AddControllers();
-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);
-});
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-builder.Services.AddScoped<IDoculinkProvider, DoculinkProvider>();
-builder.Services.AddScoped<IUploadService, UploadService>();
-builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
-builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
-builder.Services.AddDbContext<DoculinkDbContext>(option =>
-{
-    option.UseSqlServer("DoculinkConnection");
-});
-var app = builder.Build();
-
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI();
-}
-
-app.UseAuthentication();
-app.UseAuthorization();
-
-app.MapControllers();
-
-app.Run();

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

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

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

@@ -1,577 +0,0 @@
-using AutoMapper;
-using DamageAssesment.Api.DocuLinks.Db;
-using DamageAssesment.Api.DocuLinks.Interfaces;
-using DamageAssesment.Api.DocuLinks.Models;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
-using System;
-using System.Diagnostics.Eventing.Reader;
-using System.Reflection.Metadata;
-using System.Xml.Linq;
-
-namespace DamageAssesment.Api.DocuLinks.Providers
-{
-
-
-    public class DoculinkProvider : IDoculinkProvider
-    {
-        private DoculinkDbContext DocumentDbContext;
-        private ILogger<DoculinkProvider> logger;
-        private IUploadService uploadservice;
-        private IAzureBlobService azureBlobService;
-        private IMapper mapper;
-
-        public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice, IAzureBlobService azureBlobService)
-        {
-            this.DocumentDbContext = DocumentDbContext;
-            this.logger = logger;
-            this.mapper = mapper;
-            this.uploadservice = uploadservice;
-            this.azureBlobService = azureBlobService;
-            //SeedData();
-        }
-
-
-
-        private async Task SeedDataAsync()
-        {
-            if (!DocumentDbContext.LinkTypes.Any())
-            {
-                DocumentDbContext.LinkTypes.Add(new Db.LinkType() { IsActive = true, CustomOrder = 1 });
-                DocumentDbContext.LinkTypes.Add(new Db.LinkType() { IsActive = true, CustomOrder = 2 });
-                DocumentDbContext.LinkTypes.Add(new Db.LinkType() { IsActive = true, CustomOrder = 3 });
-                DocumentDbContext.LinkTypes.Add(new Db.LinkType() { IsActive = true, CustomOrder = 4 });
-                DocumentDbContext.SaveChanges();
-            }
-            if (!DocumentDbContext.LinksTranslations.Any())
-            {
-                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Forms", Language = "en", LinkTypeId = 1 });
-                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Communiques", Language = "en", LinkTypeId = 2 });
-                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Memos", Language = "en", LinkTypeId = 3 });
-                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Trainings", Language = "en", LinkTypeId = 4 });
-                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Formularios", Language = "es", LinkTypeId = 1 });
-                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Comunicados", Language = "es", LinkTypeId = 2 });
-                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "notas", Language = "es", LinkTypeId = 3 });
-                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Entrenamientos", Language = "es", LinkTypeId = 4 });
-                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Formes", Language = "fr", LinkTypeId = 1 });
-                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Communiqués", Language = "fr", LinkTypeId = 2 });
-                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Mémos", Language = "fr", LinkTypeId = 3 });
-                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Formations", Language = "fr", LinkTypeId = 4 });
-                DocumentDbContext.SaveChanges();
-            }
-            if (!DocumentDbContext.Documents.Any())
-            {
-                int counter = 0;
-                for (int i = 1; i <= 4; i++)
-                {
-                    FileModel 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 } };
-                    Db.DoculinkTranslation documents = new Db.DoculinkTranslation { DocumentId = i, title = "Test" + i, description = "ss" + i, Language = "en" };
-                    Models.Doculink document = await azureBlobService.UploadDocument(counter, documentInfo);
-                    DocumentDbContext.Documents.Add(mapper.Map<Models.Doculink, Db.Doculink>(document));
-                    DocumentDbContext.SaveChanges();
-                    DocumentDbContext.DocumentsTranslations.AddRange(documents);
-                    var dbattachments = mapper.Map<List<Models.DoculinkAttachments>, List<Db.DoculinkAttachments>>(document.doclinksAttachments);
-                    dbattachments.ForEach(a => a.DocumentId = i);
-                    DocumentDbContext.DoclinksAttachments.AddRange(dbattachments);
-                    DocumentDbContext.SaveChanges();
-                    counter++;
-                }
-            }
-        }
-        public List<Models.DoculinkTranslation> GetDocumentTranslations(int id, string? language)
-        {
-            List<Models.DoculinkTranslation> QuestionTranslations;
-            if (string.IsNullOrEmpty(language))
-            {
-                QuestionTranslations = mapper.Map<List<Db.DoculinkTranslation>, List<Models.DoculinkTranslation>>(
-                    DocumentDbContext.DocumentsTranslations.AsNoTracking().Where(a => a.DocumentId == id).ToList());
-            }
-            else
-            {
-                QuestionTranslations = mapper.Map<List<Db.DoculinkTranslation>, List<Models.DoculinkTranslation>>(
-                DocumentDbContext.DocumentsTranslations.AsNoTracking().Where(a => a.DocumentId == id && a.Language == language).ToList());
-            }
-            return QuestionTranslations;
-        }
-        public ResDoculink CreateMultiLanguageObject(List<Models.DoculinkTranslation> questions)
-        {
-            ResDoculink MultiLanguage = new ResDoculink();
-            Dictionary<string, string> dicttitle = new Dictionary<string, string>();
-            Dictionary<string, string> dictdesc = new Dictionary<string, string>();
-            foreach (Models.DoculinkTranslation item in questions)
-            {
-                dicttitle.Add(item.Language, item.title);
-                dictdesc.Add(item.Language, item.description);
-            }
-            MultiLanguage.titles = dicttitle;
-            MultiLanguage.description = dictdesc;
-            return MultiLanguage;
-        }
-        public List<Models.LinksTranslation> GetLinkTypeTranslations(int id, string? language)
-        {
-            List<Models.LinksTranslation> linksTranslations;
-            if (string.IsNullOrEmpty(language))
-            {
-                linksTranslations = mapper.Map<List<Db.LinksTranslation>, List<Models.LinksTranslation>>(
-                    DocumentDbContext.LinksTranslations.AsNoTracking().Where(a => a.LinkTypeId == id).ToList());
-            }
-            else
-            {
-                linksTranslations = mapper.Map<List<Db.LinksTranslation>, List<Models.LinksTranslation>>(
-                DocumentDbContext.LinksTranslations.AsNoTracking().Where(a => a.LinkTypeId == id && a.Language == language).ToList());
-            }
-            return linksTranslations;
-        }
-        public object CreateMultiLanguageLinkTypeObject(List<Models.LinksTranslation> links)
-        {
-            object MultiLanguage = new object();
-            Dictionary<string, string> dicttitle = new Dictionary<string, string>();
-            foreach (Models.LinksTranslation item in links)
-            {
-                dicttitle.Add(item.Language, item.TypeText);
-            }
-            MultiLanguage = dicttitle;
-            return MultiLanguage;
-        }
-        private List<Models.DoculinkAttachments> GetDocumentAttachment(int id, string? language)
-        {
-            if (string.IsNullOrEmpty(language))
-            {
-                return mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                    DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
-            }
-            else
-            {
-                return mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id && a.Language == language).ToList());
-            }
-        }
-        public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive)
-        {
-
-            try
-            {
-                logger?.LogInformation("Query Question");
-                var documents = new List<Db.Doculink>();
-                if (linkTypeId == null)
-                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value)).ToListAsync();
-                else
-                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value) &&
-                     q.linkTypeId == linkTypeId.Value).ToListAsync();
-                if (documents != null)
-                {
-                    var result = mapper.Map<List<Db.Doculink>, List<Models.ResDoculink>>(documents);
-                    foreach (var item in result)
-                    {
-                        var multilan = CreateMultiLanguageObject(GetDocumentTranslations(item.Id, language));
-                        item.titles = multilan.titles;
-                        item.description = multilan.description;
-                        item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
-                        item.doclinksAttachments = GetDocumentAttachment(item.Id, language);
-                    }
-                    // List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
-                    return (true, result, null);
-                }
-                return (false, null, "Not found");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-
-        }
-        public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive)
-        {
-
-            try
-            {
-                logger?.LogInformation("Query Question");
-                var documents = new List<Db.Doculink>();
-                if (String.IsNullOrEmpty(linkType))
-                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value)).ToListAsync();
-                else
-                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value) &&
-                     q.linkTypeId == (DocumentDbContext.LinksTranslations.AsNoTracking().Where(a => a.TypeText.ToLower() == linkType.ToLower()).Select(a => a.Id).FirstOrDefault())).ToListAsync();
-                if (documents != null)
-                {
-                    var result = mapper.Map<List<Db.Doculink>, List<Models.ResDoculink>>(documents);
-                    foreach (var item in result)
-                    {
-                        var multilan = CreateMultiLanguageObject(GetDocumentTranslations(item.Id, language));
-                        item.titles = multilan.titles;
-                        item.description = multilan.description;
-                        item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
-                        item.doclinksAttachments = GetDocumentAttachment(item.Id, language);
-                    }
-                    return (true, result, null);
-                }
-                return (false, null, "Not found");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-
-        }
-        //public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetDocumnetsAsync(string? language)
-        //{
-
-        //    try
-        //    {
-        //        logger?.LogInformation("Query Question");
-        //        var documents = await DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().Where(q => q.IsActive).ToListAsync();
-        //        if (documents != null)
-        //        {
-        //            logger?.LogInformation($"{documents.Count} Document(s) found");
-        //            var result = mapper.Map<List<Db.Document>, List<Models.ResDoculink>>(documents);
-        //            foreach (var item in result)
-        //            {
-        //                var multilan = CreateMultiLanguageObject(GetDocumentTranslations(item.Id, language));
-        //                item.titles = multilan.titles;
-        //                item.description = multilan.description;
-        //            }
-        //            return (true, result, null);
-        //        }
-        //        return (false, null, "Not found");
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        logger?.LogError(ex.ToString());
-        //        return (false, null, ex.Message);
-        //    }
-
-        //}
-        public async Task<(bool IsSuccess, Models.Doculink Document, string ErrorMessage)> GetDocumentByidAsync(int id)
-        {
-            try
-            {
-                logger?.LogInformation("Query LinkType");
-                var Document = await DocumentDbContext.Documents.AsNoTracking().FirstOrDefaultAsync(q => q.Id == id && q.IsActive);
-                if (Document != null)
-                {
-                    logger?.LogInformation($"{Document} customer(s) found");
-                    var result = mapper.Map<Db.Doculink, Models.Doculink>(Document);
-                    result.documentsTranslations = mapper.Map<List<Db.DoculinkTranslation>, List<Models.DoculinkTranslation>>(
-                            DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == result.Id).ToList());
-
-                    result.doclinksAttachments = GetDocumentAttachment(id, "");
-                    return (true, result, null);
-                }
-                return (false, null, "Not found");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-        //added linktype filter 
-        public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> GetDocumentAsync(int id, string? linkType, string? language)
-        {
-            try
-            {
-                logger?.LogInformation("Query LinkType");
-                //var Document = await DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().FirstOrDefaultAsync(q => q.Id == id && q.IsActive);
-                var Document = new Db.Doculink();
-                if (String.IsNullOrEmpty(linkType))
-                    Document = await DocumentDbContext.Documents.AsNoTracking().Where(q => q.IsActive && q.Id == id).FirstOrDefaultAsync();
-                else
-                    Document = await DocumentDbContext.Documents.AsNoTracking().Where(q => q.IsActive && q.Id == id &&
-                     q.linkTypeId == (DocumentDbContext.LinksTranslations.AsNoTracking().Where(a => a.TypeText.ToLower() == linkType.ToLower()).Select(a => a.Id).FirstOrDefault())).FirstOrDefaultAsync();
-                if (Document != null)
-                {
-                    logger?.LogInformation($"{Document} customer(s) found");
-                    var result = mapper.Map<Db.Doculink, Models.ResDoculink>(Document);
-                    var multilan = CreateMultiLanguageObject(GetDocumentTranslations(result.Id, language));
-                    result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, language));
-                    result.titles = multilan.titles;
-                    result.description = multilan.description;
-                    result.doclinksAttachments = GetDocumentAttachment(id, language);
-                    return (true, result, null);
-                }
-                return (false, null, "Not found");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-        public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> PostDocumentAsync(Models.Doculink Document)
-        {
-            try
-            {
-                var document = mapper.Map<Models.Doculink, Db.Doculink>(Document);
-                document.dateCreated = DateTime.Now; document.dateUpdated = DateTime.Now;
-                DocumentDbContext.Documents.Add(document);
-                DocumentDbContext.SaveChanges();
-                var dbtranslation = mapper.Map<List<Models.DoculinkTranslation>, List<Db.DoculinkTranslation>>(Document.documentsTranslations);
-                dbtranslation.ForEach(i => i.DocumentId = document.Id);
-                DocumentDbContext.DocumentsTranslations.AddRange(dbtranslation);
-                var dbattachments = mapper.Map<List<Models.DoculinkAttachments>, List<Db.DoculinkAttachments>>(Document.doclinksAttachments);
-                dbattachments.ForEach(i => i.DocumentId = document.Id);
-                DocumentDbContext.DoclinksAttachments.AddRange(dbattachments);
-                DocumentDbContext.SaveChanges();
-                var result = mapper.Map<Db.Doculink, Models.ResDoculink>(document);
-                var multilan = CreateMultiLanguageObject(GetDocumentTranslations(document.Id, ""));
-                result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(Document.linkTypeId, ""));
-                result.titles = multilan.titles;
-                result.description = multilan.description;
-                result.doclinksAttachments = Document.doclinksAttachments;
-                return (true, result, null);
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-
-        public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, Models.Doculink Document)
-        {
-            try
-            {
-                if (Document != null)
-                {
-                    var existing = DocumentDbContext.Documents.AsNoTracking().FirstOrDefault(x => x.Id == id);
-                    if (existing != null)
-                    {
-                        Document.Id = existing.Id;
-                        var document = mapper.Map<Models.Doculink, Db.Doculink>(Document);
-                        document.dateUpdated = DateTime.Now;
-                        DocumentDbContext.Documents.Update(document);
-                        DocumentDbContext.SaveChanges();
-                        var oldtranslations = DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == id).ToList();
-                        if (oldtranslations != null)
-                            DocumentDbContext.DocumentsTranslations.RemoveRange(oldtranslations);
-                        var oldattachments = DocumentDbContext.DoclinksAttachments.Where(a => a.DocumentId == id).ToList();
-                        if (oldattachments != null)
-                            DocumentDbContext.DoclinksAttachments.RemoveRange(oldattachments);
-                        var dbtranslation = mapper.Map<List<Models.DoculinkTranslation>, List<Db.DoculinkTranslation>>(Document.documentsTranslations);
-                        dbtranslation.ForEach(i => i.DocumentId = Document.Id);
-                        DocumentDbContext.DocumentsTranslations.AddRange(dbtranslation);
-                        var dbattachments = mapper.Map<List<Models.DoculinkAttachments>, List<Db.DoculinkAttachments>>(Document.doclinksAttachments);
-                        dbattachments.ForEach(i => i.DocumentId = document.Id);
-                        DocumentDbContext.DoclinksAttachments.AddRange(dbattachments);
-                        DocumentDbContext.SaveChanges();
-                        var result = mapper.Map<Db.Doculink, Models.ResDoculink>(document);
-                        var multilan = CreateMultiLanguageObject(GetDocumentTranslations(document.Id, ""));
-                        result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(document.linkTypeId, ""));
-                        result.titles = multilan.titles;
-                        result.description = multilan.description;
-                        result.doclinksAttachments = Document.doclinksAttachments;
-                        return (true, result, "Successful");
-                    }
-                    else
-                    {
-                        logger?.LogInformation($"{Document} Not found");
-                        return (false, null, "Not Found");
-                    }
-                }
-                else
-                {
-                    logger?.LogInformation($"{Document} Bad Request");
-                    return (false, null, "Bad request");
-                }
-
-            }
-            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)
-        {
-
-            try
-            {
-                Db.Doculink Document = DocumentDbContext.Documents.AsNoTracking().Where(a => a.Id == id).FirstOrDefault();
-                if (Document == null)
-                {
-                    return (false, null, "Not Found");
-                }
-                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 = GetDocumentAttachment(id, "");
-                Document.IsActive = false;
-                DocumentDbContext.Documents.Update(Document);
-                DocumentDbContext.SaveChanges();
-                return (true, result, $"DocumentId {id} deleted Successfuly");
-            }
-            catch (Exception ex)
-            {
-
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-
-        public async Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter()
-        {
-            try
-            {
-                int AttachmentId = DocumentDbContext.Documents.Max(a => a.Id);
-                return (true, AttachmentId, "");
-            }
-            catch (Exception ex)
-            {
-                return (false, 0, ex.Message);
-            }
-        }
-
-        //Link Type methods
-        public async Task<(bool IsSuccess, IEnumerable<Models.ResLinkType> LinkTypes, string ErrorMessage)> GetLinkTypesAsync(string? language)
-        {
-
-            try
-            {
-                logger?.LogInformation("Query Question");
-                var LinkType = await DocumentDbContext.LinkTypes.AsNoTracking().Where(q => q.IsActive).ToListAsync();
-                if (LinkType != null)
-                {
-                    logger?.LogInformation($"{LinkType.Count} LinkTypes(s) found");
-                    var result = mapper.Map<IEnumerable<Db.LinkType>, IEnumerable<Models.ResLinkType>>(LinkType);
-                    foreach (var item in result)
-                    {
-                        item.titles = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.Id, language));
-                    }
-                    return (true, result, null);
-                }
-                return (false, null, "Not found");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-
-        }
-        public async Task<(bool IsSuccess, Models.ResLinkType LinkType, string ErrorMessage)> GetLinkTypeAsync(int Id, string? language)
-        {
-            try
-            {
-                logger?.LogInformation("Query LinkType");
-                var LinkType = await DocumentDbContext.LinkTypes.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id && q.IsActive);
-                if (LinkType != null)
-                {
-                    logger?.LogInformation($"{LinkType} customer(s) found");
-                    var result = mapper.Map<Db.LinkType, Models.ResLinkType>(LinkType);
-                    result.titles = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.Id, language));
-                    return (true, result, null);
-                }
-                return (false, null, "Not found");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-        public async Task<(bool IsSuccess, Models.ResLinkType LinkType, string ErrorMessage)> PostLinkTypeAsync(Models.LinkType LinkType)
-        {
-            try
-            {
-                logger?.LogInformation("Query LinkType");
-                if (!LinkTypeExists(LinkType.Id))
-                {
-                    var dbLink = mapper.Map<Models.LinkType, Db.LinkType>(LinkType);
-                    DocumentDbContext.LinkTypes.Add(dbLink);
-                    DocumentDbContext.SaveChanges();
-                    var dbtranslation = mapper.Map<List<Models.LinksTranslation>, List<Db.LinksTranslation>>(LinkType.linksTranslations);
-                    dbtranslation.ForEach(i => i.LinkTypeId = dbLink.Id);
-                    DocumentDbContext.LinksTranslations.AddRange(dbtranslation);
-                    DocumentDbContext.SaveChanges();
-                    var result = mapper.Map<Db.LinkType, Models.ResLinkType>(dbLink);
-                    result.titles = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.Id, ""));
-                    return (true, result, null);
-                }
-                return (false, null, "LinkType is already exits");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-        public async Task<(bool IsSuccess, Models.ResLinkType LinkType, string ErrorMessage)> UpdateLinkTypeAsync(int id, Models.LinkType LinkType)
-        {
-            try
-            {
-                if (LinkType != null)
-                {
-                    var existing = DocumentDbContext.LinkTypes.AsNoTracking().FirstOrDefault(x => x.Id == id);
-                    if (existing != null)
-                    {
-                        var dbLink = mapper.Map<Models.LinkType, Db.LinkType>(LinkType);
-                        DocumentDbContext.LinkTypes.Update(dbLink);
-                        DocumentDbContext.SaveChanges();
-                        var oldtranslations = DocumentDbContext.LinksTranslations.Where(a => a.LinkTypeId == id).ToList();
-                        if (oldtranslations != null)
-                            DocumentDbContext.LinksTranslations.RemoveRange(oldtranslations);
-                        var dbtranslation = mapper.Map<List<Models.LinksTranslation>, List<Db.LinksTranslation>>(LinkType.linksTranslations);
-                        dbtranslation.ForEach(i => i.LinkTypeId = dbLink.Id);
-                        DocumentDbContext.LinksTranslations.AddRange(dbtranslation);
-                        DocumentDbContext.SaveChanges();
-                        var result = mapper.Map<Db.LinkType, Models.ResLinkType>(dbLink);
-                        result.titles = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.Id, ""));
-                        return (true, result, "Successful");
-                    }
-                    else
-                    {
-                        logger?.LogInformation($"{LinkType} Not found");
-                        return (false, null, "Not Found");
-                    }
-                }
-                else
-                {
-                    logger?.LogInformation($"{LinkType} Bad Request");
-                    return (false, null, "Bad request");
-                }
-
-            }
-            catch (Exception ex)
-            {
-
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-        public async Task<(bool IsSuccess, Models.ResLinkType LinkType, string ErrorMessage)> DeleteLinkTypeAsync(int id)
-        {
-
-            try
-            {
-                Db.LinkType LinkType = DocumentDbContext.LinkTypes.AsNoTracking().Where(a => a.Id == id).FirstOrDefault();
-                if (LinkType == null)
-                {
-                    return (false, null, "Not Found");
-                }
-                LinkType.IsActive = false;
-                var result = mapper.Map<Db.LinkType, Models.ResLinkType>(LinkType);
-                result.titles = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.Id, ""));
-                DocumentDbContext.LinkTypes.Update(LinkType);
-                DocumentDbContext.SaveChanges();
-                return (true, result, $"LinkTypeId {id} deleted Successfuly");
-            }
-            catch (Exception ex)
-            {
-
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-        private bool LinkTypeExists(int id)
-        {
-            return DocumentDbContext.LinkTypes.AsNoTracking().Count(e => e.Id == id) > 0;
-        }
-    }
-}

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

@@ -1,151 +0,0 @@
-using AutoMapper;
-using Azure;
-using DamageAssesment.Api.DocuLinks.Db;
-using DamageAssesment.Api.DocuLinks.Interfaces;
-using DamageAssesment.Api.DocuLinks.Models;
-using Microsoft.AspNetCore.Http;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
-using System.Diagnostics.Metrics;
-using System.Net.Http;
-using System.Security.AccessControl;
-using System.Security.Principal;
-
-namespace DamageAssesment.Api.DocuLinks.Providers
-{
-    public class UploadService : IUploadService
-    {
-        private ILogger<UploadService> logger;
-        private IMapper mapper;
-        private string uploadpath = "";
-        private string Deletepath = "";
-        public UploadService(IConfiguration configuration, ILogger<UploadService> logger, IMapper mapper)
-        {
-            this.logger = logger;
-            this.mapper = mapper;
-            uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
-            Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
-        }
-
-        public Models.Doculink UploadDocument(int counter, ReqDoculink documentInfo)
-        {
-            Models.Doculink Documents = new Models.Doculink();
-            List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
-            try
-            {
-                string path = "", UserfileName = "";
-                var fullDirectoryPath = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
-                if (!Directory.Exists(fullDirectoryPath)) //Create deirectory if does not exist
-                    Directory.CreateDirectory(fullDirectoryPath);
-                if (documentInfo.Files != null)
-                {
-
-                    foreach (var item in documentInfo.Files)
-                    {
-                        counter++;
-                        if (item.IsAttachments)
-                        {
-                            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 });
-                    }
-                }
-                Documents = new Models.Doculink()
-                {
-                    linkTypeId = documentInfo.linkTypeId,
-                    documentsTranslations = documentInfo.documentsTranslations,
-                    doclinksAttachments = attachments,
-                    IsDeleted = false,
-                    CustomOrder = documentInfo.CustomOrder,
-                    IsActive = true
-                };
-
-                return Documents;
-            }
-            catch (Exception ex)
-            {
-                return new Models.Doculink();
-            }
-
-
-        }
-        public Models.Doculink UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo)
-        {
-            try
-            {
-                foreach (var item in document.doclinksAttachments)
-                {
-                    Movefile(item.Path);
-                }
-                var fullDirectoryPath = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
-                if (!Directory.Exists(fullDirectoryPath)) //Create deirectory if does not exist
-                    Directory.CreateDirectory(fullDirectoryPath);
-
-                string path = "", UserfileName = "";
-                List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
-                int counter1 = 1;
-                foreach (var item in documentInfo.Files)
-                {
-                    if (item.IsAttachments)
-                    {
-                        UserfileName = Path.GetFileName(item.FileName);
-                        var fileName = String.Format("Document_{0}_{1}{2}", document.Id, counter1, item.FileExtension);
-                        path = Path.Combine(fullDirectoryPath, fileName);
-                        File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
-                        counter1++;
-                    }
-                    else
-                        path = item.url;
-                    attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path, IsAttachments = item.IsAttachments, CustomOrder = item.CustomOrder, Language = item.Language });
-                }
-                Models.Doculink Documents = new Models.Doculink()
-                {
-                    Id = documentInfo.Id,
-                    linkTypeId = documentInfo.linkTypeId,
-                    documentsTranslations = documentInfo.documentsTranslations,
-                    IsActive = true,
-                    IsDeleted = false,
-                    CustomOrder = documentInfo.CustomOrder,
-                    doclinksAttachments = attachments
-                };
-
-                return Documents;
-            }
-
-            catch (Exception ex)
-            {
-                return new Models.Doculink();
-            }
-        }
-        public void Deletefile(string path)
-        {
-            if (path != "")
-            {
-                FileInfo file = new FileInfo(path);
-                if (file?.Exists ?? false)//check file exsit or not  
-                {
-                    file.Delete();
-                }
-            }
-        }
-        public void Movefile(string path)
-        {
-            if (path != "")
-            {
-                var pathToSave = Path.Combine(Directory.GetCurrentDirectory(), Deletepath);
-                if (!Directory.Exists(pathToSave)) //Create deirectory if does not exist
-                    Directory.CreateDirectory(pathToSave);
-                FileInfo file = new FileInfo(path);
-                if (file?.Exists ?? false)//check file exsit or not  
-                {
-                    string filename = file.Name.Replace(file.Extension, " ") + DateTime.Now.ToShortDateString().Replace("/", "_") + file.Extension;
-                    file.MoveTo(pathToSave + "\\" + filename);
-                }
-            }
-        }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/appsettings.json

@@ -1,23 +0,0 @@
-{
-  "JwtSettings": {
-    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
-  },
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"DoculinkConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "DoculinkConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
-
-  },
-  "Fileupload": {
-    "folderpath": "DASA_Documents/Active",
-    "Deletepath": "DASA_Documents/Deleted",
-    "BlobConnectionString": "DefaultEndpointsProtocol=https;AccountName=damagedoculink;AccountKey=blynpwrAQtthEneXC5f4vFewJ3tPV+QZUt1AX3nefZScPPjkr5hMoC18B9ni6/ZYdhRiERPQw+hB+AStonf+iw==;EndpointSuffix=core.windows.net",
-    "BlobContainerName": "doculinks"
-  }
-}

DamageAssesmentApi/DamageAssesment.Api.Documents.Test/DamageAssesment.Api.Documents.Test.csproj

@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DamageAssesment.Api.DocuLinks\DamageAssesment.Api.DocuLinks.csproj" />
+    <ProjectReference Include="..\DamageAssesment.Api.Documents\DamageAssesment.Api.Documents.csproj" />
   </ItemGroup>
 
 </Project>

DamageAssesmentApi/DamageAssesment.Api.Documents.Test/DocumentsServiceTest.cs

@@ -1,11 +1,11 @@
-using DamageAssesment.Api.DocuLinks.Controllers;
+using DamageAssesment.Api.Documents.Controllers;
-using DamageAssesment.Api.DocuLinks.Interfaces;
+using DamageAssesment.Api.Documents.Interfaces;
-using DamageAssesment.Api.DocuLinks.Models;
+using DamageAssesment.Api.Documents.Models;
 using Microsoft.AspNetCore.Mvc;
 using Moq;
 using Xunit;
 
-namespace DamageAssesment.Api.DocuLinks.Test
+namespace DamageAssesment.Api.Documents.Test
 {
 
     public class DocumentServiceTest
@@ -14,93 +14,68 @@ namespace DamageAssesment.Api.DocuLinks.Test
         [Fact(DisplayName = "Get Documents - NoContent Case")]
         public async Task GetDocumentsLanguageAsync_ShouldReturnStatusCode204()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNoContentResponse();
-            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", null)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetDocumnetsAsync()).ReturnsAsync(mockResponse);
 
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await DocumentProvider.GetDocumentsAsync("", "", null);
+            var result = (NoContentResult)await DocumentProvider.GetDocumentsbyFormsandLanguageAsync("", "");
 
             Assert.Equal(204, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get active Documents - NoContent Case")]
+        [Fact(DisplayName = "Get Documents - NoContent Case")]
         public async Task GetDocumentsLinkTypeAsync_ShouldReturnStatusCode204()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNoContentResponse();
-            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", true)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetDocumnetsAsync()).ReturnsAsync(mockResponse);
 
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await DocumentProvider.GetDocumentsByActiveAsync("", "");
+            var result = (NoContentResult)await DocumentProvider.GetDocumentsbyFormsandLanguageAsync("", "");
 
             Assert.Equal(204, result.StatusCode);
         }
         [Fact(DisplayName = "Get Documents - Ok case")]
         public async Task GetDocumentsAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
-            var mockResponse = await MockData.getOkResponses();
+            var mockResponse = await MockData.getOkResponse();
-            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", null)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetDocumnetsAsync()).ReturnsAsync(mockResponse);
 
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.GetDocumentsAsync("forms", "en", null);
+            var result = (OkObjectResult)await DocumentProvider.GetDocumentsAsync();
-
-            Assert.Equal(200, result.StatusCode);
-        }
-        [Fact(DisplayName = "Get active Documents - Ok case")]
-        public async Task GetActiveDocumentsAsync_ShouldReturnStatusCode200()
-        {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
-            var mockResponse = await MockData.getOkResponses();
-            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", true)).ReturnsAsync(mockResponse);
-
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.GetDocumentsByActiveAsync("forms", "en");
 
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get active Documents by linktypeid - Ok case")]
+        [Fact(DisplayName = "Get Documents - NoContent Case")]
-        public async Task GetActiveDocumentsLinkTypeIdAsync_ShouldReturnStatusCode200()
+        public async Task GetDocumentsAsync_ShouldReturnStatusCode204()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
-            var mockResponse = await MockData.getOkResponses();
-            mockDocumentService.Setup(service => service.GetdocumentsByLinkTypeIdAsync(null, "en", true)).ReturnsAsync(mockResponse);
-
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.GetDocumentsByActiveLinkTypeIdAsync(null, "en");
-
-            Assert.Equal(200, result.StatusCode);
-        }
-        [Fact(DisplayName = "Get active Documents by linktypeid  - NoContent Case")]
-        public async Task GetDocumentsLinkTypeIdAsync_ShouldReturnStatusCode204()
-        {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getNoContentResponse();
-            mockDocumentService.Setup(service => service.GetdocumentsByLinkTypeIdAsync(null, "en", true)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetDocumnetsAsync()).ReturnsAsync(mockResponse);
 
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await DocumentProvider.GetDocumentsByActiveLinkTypeIdAsync(null, "");
+            var result = (NoContentResult)await DocumentProvider.GetDocumentsAsync();
 
             Assert.Equal(204, result.StatusCode);
         }
+
         [Fact(DisplayName = "Get Document by Id - Ok case")]
         public async Task GetDocumentAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse(1);
-            mockDocumentService.Setup(service => service.GetDocumentAsync(1, "forms", "en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetDocumentAsync(1)).ReturnsAsync(mockResponse);
 
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.GetDocumentAsync(1, "forms", "en");
+            var result = (OkObjectResult)await DocumentProvider.GetDocumentAsync(1);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -108,24 +83,24 @@ namespace DamageAssesment.Api.DocuLinks.Test
         [Fact(DisplayName = "Get Document by Id - NotFound case")]
         public async Task GetDocumentAsync_ShouldReturnStatusCode404()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNotFoundResponse();
-            mockDocumentService.Setup(service => service.GetDocumentAsync(99, "forms", "en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetDocumentAsync(99)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NotFoundResult)await DocumentProvider.GetDocumentAsync(99, "forms", "en");
+            var result = (NotFoundResult)await DocumentProvider.GetDocumentAsync(99);
             Assert.Equal(404, result.StatusCode);
         }
         [Fact(DisplayName = "Post Document - Ok case")]
         public async Task PostDocumentAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse(1);
             var mockInputDocument = await MockData.getInputDocumentData();
-            var DocumentResponse = await MockData.GetDocuLinksInfo(0);
+            var DocumentResponse = await MockData.GetDocumentsInfo(0);
             mockDocumentService.Setup(service => service.PostDocumentAsync(mockInputDocument)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
             var result = (NoContentResult)await DocumentProvider.CreateDocument(DocumentResponse);
 
             Assert.Equal(204, result.StatusCode);
@@ -134,13 +109,13 @@ namespace DamageAssesment.Api.DocuLinks.Test
         [Fact(DisplayName = "Post Document - BadRequest case")]
         public async Task PostDocumentAsync_ShouldReturnStatusCode400()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockInputDocument = await MockData.getInputDocumentData();
             var mockResponse = await MockData.getBadRequestResponse();
-            ReqDoculink documentInfo = null;
+            DocumentInfo documentInfo = null;
             mockDocumentService.Setup(service => service.PostDocumentAsync(mockInputDocument)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
             var result = (BadRequestObjectResult)await DocumentProvider.CreateDocument(documentInfo);
 
             Assert.Equal(400, result.StatusCode);
@@ -149,39 +124,39 @@ namespace DamageAssesment.Api.DocuLinks.Test
         [Fact(DisplayName = "Put Document - Ok case")]
         public async Task PutDocumentAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse(1);
             var mockInputDocument = await MockData.getInputDocumentData();
-            var DocumentResponse = await MockData.GetDocuLinksInfo(1);
+            var DocumentResponse = await MockData.GetDocumentsInfo(1);
-            mockDocumentService.Setup(service => service.UpdateDocumentAsync(1, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateDocumentAsync(mockInputDocument)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NotFoundResult)await DocumentProvider.UpdateDocument(1, DocumentResponse);
+            var result = (NoContentResult)await DocumentProvider.UpdateDocument(DocumentResponse);
 
-            Assert.Equal(404, result.StatusCode);
+            Assert.Equal(204, result.StatusCode);
         }
 
         [Fact(DisplayName = "Put Document - BadRequest case")]
         public async Task PutDocumentAsync_ShouldReturnStatusCode400()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getBadRequestResponse();
             var mockInputDocument = await MockData.getInputDocumentData();
-            mockDocumentService.Setup(service => service.UpdateDocumentAsync(99, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateDocumentAsync(mockInputDocument)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (BadRequestObjectResult)await DocumentProvider.UpdateDocument(99, null);
+            var result = (BadRequestObjectResult)await DocumentProvider.UpdateDocument(null);
             Assert.Equal(400, result.StatusCode);
         }
 
         [Fact(DisplayName = "Delete Document - Ok case")]
         public async Task DeleteDocumentAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse(1);
             mockDocumentService.Setup(service => service.DeleteDocumentAsync(1)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
             var result = (OkObjectResult)await DocumentProvider.DeleteDocument(1);
 
             Assert.Equal(200, result.StatusCode);
@@ -189,11 +164,11 @@ namespace DamageAssesment.Api.DocuLinks.Test
         [Fact(DisplayName = "Delete Document - NotFound case")]
         public async Task DeleteDocumentAsync_ShouldReturnStatusCode404()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNotFoundResponse();
             mockDocumentService.Setup(service => service.DeleteDocumentAsync(1)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
             var result = (NotFoundResult)await DocumentProvider.DeleteDocument(1);
             Assert.Equal(404, result.StatusCode);
         }
@@ -205,12 +180,12 @@ namespace DamageAssesment.Api.DocuLinks.Test
         [Fact(DisplayName = "Get Link types - Ok case")]
         public async Task GetDocumentCategoriesAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getOkResponse();
-            mockDocumentService.Setup(service => service.GetLinkTypesAsync("en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetLinkTypesAsync()).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.GetLinkTypesAsync("en");
+            var result = (OkObjectResult)await DocumentProvider.GetLinkTypesAsync();
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -218,13 +193,13 @@ namespace DamageAssesment.Api.DocuLinks.Test
         [Fact(DisplayName = "Get Link types - NoContent Case")]
         public async Task GetDocumentCategoriesAsync_ShouldReturnStatusCode204()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getNoContentResponse();
-            mockDocumentService.Setup(service => service.GetLinkTypesAsync("en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetLinkTypesAsync()).ReturnsAsync(mockResponse);
 
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await DocumentProvider.GetLinkTypesAsync("en");
+            var result = (NoContentResult)await DocumentProvider.GetLinkTypesAsync();
 
             Assert.Equal(204, result.StatusCode);
         }
@@ -232,12 +207,12 @@ namespace DamageAssesment.Api.DocuLinks.Test
         [Fact(DisplayName = "Get Link Type by Id - Ok case")]
         public async Task GetDocumentcategoryAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getOkResponse(1);
-            mockDocumentService.Setup(service => service.GetLinkTypeAsync(1, "en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetLinkTypeAsync(1)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.GetLinkTypeAsync(1, "en");
+            var result = (OkObjectResult)await DocumentProvider.GetLinkTypeAsync(1);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -245,25 +220,25 @@ namespace DamageAssesment.Api.DocuLinks.Test
         [Fact(DisplayName = "Get Link Type by Id - NotFound case")]
         public async Task GetDocumentcategoryAsync_ShouldReturnStatusCode404()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getNotFoundResponse();
-            mockDocumentService.Setup(service => service.GetLinkTypeAsync(99, "en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetLinkTypeAsync(99)).ReturnsAsync(mockResponse);
 
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NotFoundResult)await DocumentProvider.GetLinkTypeAsync(99, "en");
+            var result = (NotFoundResult)await DocumentProvider.GetLinkTypeAsync(99);
             Assert.Equal(404, result.StatusCode);
         }
 
         [Fact(DisplayName = "Post Link Type - Ok case")]
         public async Task PostDocumentcategoryAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getOkResponse(1);
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(0);
             mockDocumentService.Setup(service => service.PostLinkTypeAsync(mockInputDocument)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
             var result = (OkObjectResult)await DocumentProvider.CreateLinkType(mockInputDocument);
 
             Assert.Equal(200, result.StatusCode);
@@ -272,12 +247,12 @@ namespace DamageAssesment.Api.DocuLinks.Test
         [Fact(DisplayName = "Post Link Type - BadRequest case")]
         public async Task PostDocumentcategoryAsync_ShouldReturnStatusCode400()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(99);
             var mockResponse = await LinkTypeMockData.getBadRequestResponse();
             mockDocumentService.Setup(service => service.PostLinkTypeAsync(mockInputDocument)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
             var result = (BadRequestObjectResult)await DocumentProvider.CreateLinkType(mockInputDocument);
 
             Assert.Equal(400, result.StatusCode);
@@ -286,13 +261,13 @@ namespace DamageAssesment.Api.DocuLinks.Test
         [Fact(DisplayName = "Put Document - Ok case")]
         public async Task PutDocumentcategoryAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getOkResponse(1);
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(1);
-            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(mockInputDocument)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.UpdateLinkType(1, mockInputDocument);
+            var result = (OkObjectResult)await DocumentProvider.UpdateLinkType(mockInputDocument);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -300,13 +275,13 @@ namespace DamageAssesment.Api.DocuLinks.Test
         [Fact(DisplayName = "Put Document - NotFound case")]
         public async Task PutDocumentcategoryAsync_ShouldReturnStatusCode404()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getNotFoundResponse();
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(99);
-            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(99, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(mockInputDocument)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NotFoundObjectResult)await DocumentProvider.UpdateLinkType(99, mockInputDocument);
+            var result = (NotFoundObjectResult)await DocumentProvider.UpdateLinkType(mockInputDocument);
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -314,13 +289,13 @@ namespace DamageAssesment.Api.DocuLinks.Test
         [Fact(DisplayName = "Put Document - BadRequest case")]
         public async Task PutDocumentcategoryAsync_ShouldReturnStatusCode400()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getBadRequestResponse();
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(1);
-            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(mockInputDocument)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (BadRequestObjectResult)await DocumentProvider.UpdateLinkType(1, mockInputDocument);
+            var result = (BadRequestObjectResult)await DocumentProvider.UpdateLinkType(mockInputDocument);
 
             Assert.Equal(400, result.StatusCode);
         }
@@ -328,12 +303,12 @@ namespace DamageAssesment.Api.DocuLinks.Test
         [Fact(DisplayName = "Delete Document - Ok case")]
         public async Task DeleteDocumentcategoryAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getOkResponse(1);
 
             mockDocumentService.Setup(service => service.DeleteLinkTypeAsync(1)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
             var result = (OkObjectResult)await DocumentProvider.DeleteLinkType(1);
 
             Assert.Equal(200, result.StatusCode);
@@ -341,12 +316,12 @@ namespace DamageAssesment.Api.DocuLinks.Test
         [Fact(DisplayName = "Delete Document - NotFound case")]
         public async Task DeleteDocumentcategoryAsync_ShouldReturnStatusCode404()
         {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockDocumentService = new Mock<IDocumentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getNotFoundResponse();
             mockDocumentService.Setup(service => service.DeleteLinkTypeAsync(1)).ReturnsAsync(mockResponse);
 
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
             var result = (NotFoundResult)await DocumentProvider.DeleteLinkType(99);
 
             Assert.Equal(404, result.StatusCode);

DamageAssesmentApi/DamageAssesment.Api.Documents.Test/LinkTypeMockData.cs

@@ -0,0 +1,61 @@
+using DamageAssesment.Api.Documents.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Mail;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DamageAssesment.Api.Documents.Test
+{
+    public class LinkTypeMockData
+    {
+
+        public static async Task<(bool, List<Documents.Models.LinkType>, string)> getOkResponse()
+        {
+            List<Documents.Models.LinkType> list = new List<Documents.Models.LinkType>();
+
+            for (int i = 1; i < 4; i++)
+            {
+                list.Add(new Documents.Models.LinkType()
+                {
+                    Id = i,
+                    TypeText = "sample"+i,
+                    IsActive = true
+                });
+            }
+            return (true, list, null);
+        }
+        public static async Task<(bool, Documents.Models.LinkType, string)> getOkResponse(int Id)
+        {
+            var Documents = await getOkResponse();
+            var Document = Documents.Item2.FirstOrDefault(s => s.Id == Id);
+            return (true, Document, null);
+        }
+        public static async Task<(bool, Documents.Models.LinkType, string)> getBadRequestResponse()
+        {
+            return (false, null, "Bad Request");
+        }
+
+        public static async Task<(bool, Documents.Models.LinkType, string)> getNotFoundResponse()
+        {
+            return (false, null, "Not Found");
+        }
+        public static async Task<(bool, IEnumerable<Documents.Models.LinkType>, string)> getNoContentResponse()
+        {
+            IEnumerable<Documents.Models.LinkType> list = new List<Documents.Models.LinkType>();
+            return (false, list, null);
+        }
+
+        public static async Task<Documents.Models.LinkType> getInputLinkData(int id)
+        {
+            return new Models.LinkType
+            {
+                Id = id,
+                TypeText = "sample",
+                IsActive = true
+            };
+        }
+
+    }
+}

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

@@ -0,0 +1,117 @@
+using DamageAssesment.Api.Documents.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Mail;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DamageAssesment.Api.Documents.Test
+{
+    public class MockData
+    {
+
+        public static async Task<(bool, List<Documents.Models.Document>, string)> getOkResponse()
+        {
+            List<Documents.Models.Document> list = new List<Documents.Models.Document>();
+            
+            for (int i = 1; i < 4; i++)
+            {
+                List<Documents.Models.DocumentsTranslation> documentsTranslations = new List<DocumentsTranslation>();
+                documentsTranslations.Add(new DocumentsTranslation()
+                {
+                    Language = "en",
+                    title = "tel"+i,
+                    description = "Sample"+i
+                });
+                list.Add(new Documents.Models.Document()
+                {
+
+                    Id = i,
+                    linkTypeId = i,
+                    docName = "sample"+i,
+                    url = "testurl" + i,
+                    Path = "testpath" + i,
+                    IsActive = true,
+                    documentsTranslations= documentsTranslations,
+                    dateCreated = DateTime.Now,
+                    dateUpdated = DateTime.Now
+                });
+            }
+            return (true, list, null);
+        }
+        public static async Task<(bool, Documents.Models.Document, string)> getOkResponse(int Id)
+        {
+            var Documents = await getOkResponse();
+            var Document = Documents.Item2.FirstOrDefault(s => s.Id == Id);
+            return (true, Document, null);
+        }
+
+        public static async Task<(bool, Documents.Models.Document, string)> getBadRequestResponse()
+        {
+            return (false, null, "Bad Request");
+        }
+
+        public static async Task<(bool, Documents.Models.Document, string)> getNotFoundResponse()
+        {
+            return (false, null, "Not Found");
+        }
+        public static async Task<(bool, IEnumerable<Documents.Models.Document>, string)> getNoContentResponse()
+        {
+            IEnumerable<Documents.Models.Document> list = new List<Documents.Models.Document>();
+            return (false, list, null);
+        }
+        public static async Task<Documents.Models.DocumentInfo> GetDocumentsInfo(int id)
+        {
+            FileModel fileModel = new FileModel() { FileName = "Sample", FileContent = "c2FtcGxl", FileExtension = ".txt" };
+            return new DocumentInfo() { Id=id, linkTypeId = 1, url = "Sample", File = fileModel };
+        }
+        public static async Task<Documents.Models.Document> getInputDocumentData()
+        {
+            List<Documents.Models.DocumentsTranslation> documentsTranslations = new List<DocumentsTranslation>();
+            documentsTranslations.Add(new DocumentsTranslation()
+            {
+                Language = "en",
+                title = "tel",
+                description = "Sample"
+            });
+            return new Models.Document
+            {
+                Id = 1,
+                linkTypeId = 1,
+                docName = "sample",
+                url = "testurl",
+                Path = "testpath",
+                IsActive = true,
+                documentsTranslations= documentsTranslations,
+                dateCreated = DateTime.Now,
+                dateUpdated = DateTime.Now
+            };
+        }
+        public static async Task<List<Documents.Models.Document>> getInputDocumentsData()
+        {
+            List<Documents.Models.DocumentsTranslation> documentsTranslations = new List<DocumentsTranslation>();
+            documentsTranslations.Add(new DocumentsTranslation()
+            {
+                Language = "en",
+                title = "tel",
+                description="Sample"
+            });
+            List<Documents.Models.Document> Documents = new List<Models.Document>();
+            Documents.Add(new Models.Document
+            {
+                Id = 1,
+                linkTypeId = 1,
+                docName = "sample",
+                url = "testurl",
+                Path = "testpath",
+                IsActive = true,
+                documentsTranslations= documentsTranslations,
+                dateCreated = DateTime.Now,
+                dateUpdated = DateTime.Now
+            });
+            return Documents;
+        }
+
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Controllers/DocumentsController.cs

@@ -1,127 +1,34 @@
-using DamageAssesment.Api.DocuLinks.Db;
+using DamageAssesment.Api.Documents.Db;
-using DamageAssesment.Api.DocuLinks.Interfaces;
+using DamageAssesment.Api.Documents.Interfaces;
-using DamageAssesment.Api.DocuLinks.Models;
+using DamageAssesment.Api.Documents.Models;
-using DamageAssesment.Api.DocuLinks.Providers;
+using DamageAssesment.Api.Documents.Providers;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
-namespace DamageAssesment.Api.DocuLinks.Controllers
+namespace DamageAssesment.Api.Documents.Controllers
 {
+    [Route("api")]
     [ApiController]
-    public class DoculinkController : ControllerBase
+    public class DocumentsController : ControllerBase
     {
-        private readonly IDoculinkProvider documentsProvider;
+        private readonly IDocumentsProvider documentsProvider;
         private readonly IUploadService uploadService;
-        private readonly IAzureBlobService azureBlobService;
 
-        public DoculinkController(IDoculinkProvider documentsProvider, IAzureBlobService azureBlobService)
+        public DocumentsController(IDocumentsProvider documentsProvider,IUploadService uploadService)
         {
 
             this.documentsProvider = documentsProvider;
-            this.azureBlobService = azureBlobService;
+            this.uploadService = uploadService; 
 
         }
-        /// <summary>
-        /// Get all Doculink type.
-        /// </summary>
-        [HttpGet]
-        [Authorize(Roles = "admin")]
-        [Route("doculinks/types")]
-        [Route("doculinks/types/{language:alpha}")]
-        public async Task<IActionResult> GetLinkTypesAsync(string? language)
-        {
-            var result = await this.documentsProvider.GetLinkTypesAsync(language);
-            if (result.IsSuccess)
-            {
-                return Ok(result.LinkTypes);
-            }
-            return NoContent();
-        }
-        /// <summary>
-        /// Get a Doculink type by id.
-        /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpGet]
-        [Route("doculinks/types/{id}")]
-        [Route("doculinks/types/{id}/{language:alpha}")]
-        public async Task<IActionResult> GetLinkTypeAsync(int id,string? language)
-        {
-            var result = await this.documentsProvider.GetLinkTypeAsync(id, language);
-            if (result.IsSuccess)
-            {
-                return Ok(result.LinkType);
-            }
-            return NotFound();
-        }
-        /// <summary>
-        /// Update a existing Doculink type.
-        /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpPut]
-        [Route("doculinks/types/{id}")]
-        public async Task<IActionResult> UpdateLinkType(int id,Models.LinkType linkType)
-        {
-            if (linkType != null)
-            {
-                var result = await this.documentsProvider.UpdateLinkTypeAsync(id,linkType);
-                if (result.IsSuccess)
-                {
-                    return Ok(result.LinkType);
-                }
-                if (result.ErrorMessage == "Not Found")
-                    return NotFound(result.ErrorMessage);
 
-                return BadRequest(result.ErrorMessage);
-            }
-            return CreatedAtRoute("DefaultApi", new { id = linkType.Id }, linkType);
-        }
         /// <summary>
-        /// Create a new Doculink type.
+        /// Get all documnets.
         /// </summary>
-        [Authorize(Roles = "admin")]
+        [HttpGet("{language}/{LinkType}/documents")]
-        [HttpPost]
+        public async Task<IActionResult> GetDocumentsbyFormsandLanguageAsync(string language,string LinkType)
-        [Route("doculinks/types")]
-        public async Task<IActionResult> CreateLinkType(Models.LinkType linkType)
         {
-            if (linkType != null)
+            var result = await this.documentsProvider.GetDocumnetsByLinkAsync(language, LinkType);
-            {
-                var result = await this.documentsProvider.PostLinkTypeAsync(linkType);
-                if (result.IsSuccess)
-                {
-                    return Ok(result.LinkType);
-                }
-                return BadRequest(result.ErrorMessage);
-            }
-            return CreatedAtRoute("DefaultApi", new { id = linkType.Id }, linkType);
-        }
-        /// <summary>
-        /// Delete a  existing Doculink type by id.
-        /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpDelete]
-        [Route("doculinks/types/{id}")]
-        public async Task<IActionResult> DeleteLinkType(int id)
-        {
-            var result = await this.documentsProvider.DeleteLinkTypeAsync(id);
-            if (result.IsSuccess)
-            {
-                return Ok(result.LinkType);
-            }
-            return NotFound();
-        }
-        /// <summary>
-        /// Get all documents.
-        /// </summary>
-        
-        [Authorize(Roles = "admin")]
-        [Route("doculinks")]
-        [Route("doculinks/{linktype:alpha}")]
-        [Route("doculinks/{linktype:alpha}/{language:alpha}")]
-        [HttpGet]
-        public async Task<IActionResult> GetDocumentsAsync(string? linktype, string? language,bool? isactive)
-        {
-            var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, isactive);
             if (result.IsSuccess)
             {
                 return Ok(result.documents);
@@ -129,15 +36,12 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return NoContent();
         }
         /// <summary>
-        /// Get all active Doculink.
+        /// Get all documnets.
         /// </summary>
-        [Route("doculinks/active")]
+        [HttpGet("{LinkType}/documents")]
-        [Route("doculinks/active/{linktype:alpha}")]
+        public async Task<IActionResult> GetDocumentsbyFormAsync(string LinkType)
-        [Route("doculinks/active/{linktype:alpha}/{language:alpha}")]
-        [HttpGet]
-        public async Task<IActionResult> GetDocumentsByActiveAsync(string? linktype, string? language)
         {
-            var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language,true);
+            var result = await this.documentsProvider.GetDocumnetsByLinkAsync(null, LinkType);
             if (result.IsSuccess)
             {
                 return Ok(result.documents);
@@ -145,31 +49,26 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return NoContent();
         }
         /// <summary>
-        /// Get all active Doculink.
+        /// Get all documnets.
         /// </summary>
-        [Route("doculinks/active/{linktypeid:int}")]
+        [HttpGet("documents")]
-        [Route("doculinks/active/{linktypeid:int}/{language:alpha}")]
+        public async Task<IActionResult> GetDocumentsAsync()
-        [HttpGet]
-        public async Task<IActionResult> GetDocumentsByActiveLinkTypeIdAsync(int? linktypeid, string? language)
         {
-            var result = await this.documentsProvider.GetdocumentsByLinkTypeIdAsync(linktypeid, language, true);
+            var result = await this.documentsProvider.GetDocumnetsAsync();
             if (result.IsSuccess)
             {
                 return Ok(result.documents);
             }
             return NoContent();
         }
+
         /// <summary>
-        /// Get a Doculink by id.
+        /// Get a documnet by id.
         /// </summary>
-        [Authorize(Roles = "admin")]
+        [HttpGet("documents/{id}")]
-        [HttpGet]
+        public async Task<IActionResult> GetDocumentAsync(int id)
-        [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)
         {
-            var result = await this.documentsProvider.GetDocumentAsync(id, linktype, language);
+            var result = await this.documentsProvider.GetDocumentAsync(id);
             if (result.IsSuccess)
             {
                 return Ok(result.Document);
@@ -177,46 +76,41 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return NotFound();
         }
         /// <summary>
-        /// update existing doclink.
+        /// Upload new document.
         /// </summary>
-        [Authorize(Roles = "admin")]
+        [HttpPut("documents")]
-        [HttpPut]
+        public async Task<IActionResult> UpdateDocument(DocumentInfo documentInfo)
-        [Route("doculinks/{id}")]
-        public async Task<IActionResult> UpdateDocument(int id,ReqDoculink documentInfo)
         {
             if (documentInfo != null)
             {
-                var dbdoc = await this.documentsProvider.GetDocumentByidAsync(id);
+                var dbdoc = await this.documentsProvider.GetDocumentAsync(documentInfo.Id);
                 if (dbdoc.IsSuccess)
                 {
-                    var documents = await this.documentsProvider.GetDocumentCounter();
+                    Models.Document document = uploadService.UpdateDocuments(dbdoc.Document, documentInfo);
-                    Models.Doculink DocuLink= await azureBlobService.UpdateDocuments(documents.counter,dbdoc.Document, documentInfo);
+                    var result = await this.documentsProvider.UpdateDocumentAsync(document);
-                    var result = await this.documentsProvider.UpdateDocumentAsync(id, DocuLink);
                     if (result.IsSuccess)
                     {
                         return Ok(result.Document);
                     }
                     return NoContent();
                 }
-                return NotFound();
+                return NoContent();
             }
             return BadRequest(documentInfo);
         }
         /// <summary>
-        /// Create new doclink.
+        /// update existing document.
         /// </summary>
-       // [Authorize(Roles = "admin")]
+        [HttpPost("documents")]
-        [HttpPost]
+        public async Task<IActionResult> CreateDocument(DocumentInfo documentInfo)
-        [Route("doculinks")]
-        public async Task<IActionResult> CreateDocument(ReqDoculink documentInfo)
         {
             try
             {
                 if (documentInfo != null)
                 {
-                    //var documents = await this.documentsProvider.GetDocumentCounter();
+                    var documents = await this.documentsProvider.GetDocumentCounter();
-                    Models.Doculink DocuLink= await azureBlobService.UploadDocument(1, documentInfo);
+                    Models.Document document = uploadService.UploadDocument(documents.counter, documentInfo);
-                    var result = await this.documentsProvider.PostDocumentAsync(DocuLink);
+                    var result = await this.documentsProvider.PostDocumentAsync(document);
                     if (result.IsSuccess)
                     {
                         return Ok(result.Document);
@@ -231,11 +125,9 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             }
         }
         /// <summary>
-        /// Delete Doculink by id.
+        /// Delete documnet by id.
         /// </summary>
-        [Authorize(Roles = "admin")]
+        [HttpDelete("documents/{id}")]
-        [HttpDelete]
-        [Route("doculinks/{id}")]
         public async Task<IActionResult> DeleteDocument(int id)
         {
             // database soft delete
@@ -243,14 +135,88 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             if (result.IsSuccess)
             {
                 // deleting file from folder
-                foreach (var item in result.Document.doclinksAttachments)
+                uploadService.Movefile(result.Document.Path);
-                {
-                    azureBlobService.Movefile(item.Path);
-                }
                 return Ok(result.Document);
             }
             return NotFound();
         }
-        
+        /// <summary>
+        /// Get all document link type.
+        /// </summary>
+        [HttpGet("LinkTypes")]
+        public async Task<IActionResult> GetLinkTypesAsync()
+        {
+            var result = await this.documentsProvider.GetLinkTypesAsync();
+            if (result.IsSuccess)
+            {
+                return Ok(result.LinkTypes);
+            }
+            return NoContent();
+        }
+        /// <summary>
+        /// Get a document link type by id.
+        /// </summary>
+        [HttpGet("LinkTypes/{id}")]
+        public async Task<IActionResult> GetLinkTypeAsync(int id)
+        {
+            var result = await this.documentsProvider.GetLinkTypeAsync(id);
+            if (result.IsSuccess)
+            {
+                return Ok(result.LinkType);
+            }
+            return NotFound();
+        }
+        /// <summary>
+        /// Update a existing document link type.
+        /// </summary>
+        [HttpPut("LinkTypes")]
+        public async Task<IActionResult> UpdateLinkType(Models.LinkType linkType)
+        {
+            if (linkType != null)
+            {
+                var result = await this.documentsProvider.UpdateLinkTypeAsync(linkType);
+                if (result.IsSuccess)
+                {
+                    return Ok(result.LinkType);
+                }
+                if (result.ErrorMessage == "Not Found")
+                    return NotFound(result.ErrorMessage);
+
+                return BadRequest(result.ErrorMessage);
+            }
+            return CreatedAtRoute("DefaultApi", new { id = linkType.Id }, linkType);
+        }
+        /// <summary>
+        /// Create a new document link type.
+        /// </summary>
+        [HttpPost("LinkTypes")]
+        public async Task<IActionResult> CreateLinkType(Models.LinkType linkType)
+        {
+            if (linkType != null)
+            {
+                var result = await this.documentsProvider.PostLinkTypeAsync(linkType);
+                if (result.IsSuccess)
+                {
+                    return Ok(result.LinkType);
+                }
+                return BadRequest(result.ErrorMessage);
+            }
+            return CreatedAtRoute("DefaultApi", new { id = linkType.Id }, linkType);
+        }
+        /// <summary>
+        /// Delete a  existing document link type by id.
+        /// </summary>
+        [HttpDelete("LinkTypes/{id}")]
+        public async Task<IActionResult> DeleteLinkType(int id)
+        {
+            var result = await this.documentsProvider.DeleteLinkTypeAsync(id);
+            if (result.IsSuccess)
+            {
+                return Ok(result.LinkType);
+            }
+            return NotFound();
+        }
+
+
     }
 }

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

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

DamageAssesmentApi/DamageAssesment.Api.Documents/DamageAssesment.Api.Documents.csproj

@@ -1,18 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.18.0" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.16.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
@@ -25,8 +21,11 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="DASA_Documents\" />
+  </ItemGroup>
+
 </Project>

DamageAssesmentApi/DamageAssesment.Api.Documents/Db/Document.cs

@@ -1,22 +1,22 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace DamageAssesment.Api.DocuLinks.Db
+namespace DamageAssesment.Api.Documents.Db
 {
-    [Table("Doculinks")]
+    public class Document
-    public class Doculink
     {
         [Key]
         public int Id { get; set; }
         [ForeignKey("LinkType")]
         public int linkTypeId { get; set; }
+        public string docName { get; set; }
+
+        public string url { get; set; }
+        public string Path { get; set; }
         public bool IsActive { get; set; }
-        public bool IsDeleted { get; set; }
-        public int CustomOrder { get; set; }
-        //public bool IsAttachments { get; set; }
-        //public bool IsUrl { get; set; }
         public DateTime dateCreated { get; set; }
         public DateTime dateUpdated { get; set; }
 
+
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Documents/Db/DocumentDbContext.cs

@@ -0,0 +1,30 @@
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.Documents.Db
+{
+    public class DocumentDbContext : DbContext
+    {
+        public DocumentDbContext(DbContextOptions options) : base(options)
+        {
+        }
+        public DbSet<Db.Document> Documents { get; set; }
+        public DbSet<Db.LinkType> LinkTypes { get; set; }
+        public DbSet<Db.DocumentsTranslation> DocumentsTranslations { get; set; }
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
+            modelBuilder.Entity<Document>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+            modelBuilder.Entity<LinkType>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+            modelBuilder.Entity<DocumentsTranslation>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Db/DocumentsTranslation.cs

@@ -1,10 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace DamageAssesment.Api.DocuLinks.Db
+namespace DamageAssesment.Api.Documents.Db
 {
-    [Table("DoculinkTrans")]
+    public class DocumentsTranslation
-    public class DoculinkTranslation
     {
         [Key]
         public int Id { get; set; }

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

@@ -1,14 +1,13 @@
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
-namespace DamageAssesment.Api.DocuLinks.Db
+namespace DamageAssesment.Api.Documents.Db
 {
-    [Table("DoculinkTypes")]
     public class LinkType
     {
         [Key]
         public int Id { get; set; }
+        public string TypeText { get; set; }
         public bool IsActive { get; set; }
-        public int CustomOrder { get; set; }
+        public bool IsAttachment { get; set; }
     }
 }

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

@@ -0,0 +1,10 @@
+using Azure.Storage.Blobs.Models;
+
+namespace DamageAssesment.Api.Documents.Interfaces
+{
+    public interface IAzureBlobService
+    {
+        Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files);
+        void DeleteFile(string path);
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Interfaces/IDocumentTypeProvider.cs

@@ -0,0 +1,11 @@
+namespace DamageAssesment.Api.Documents.Interfaces
+{
+    public interface ILinkTypesProvider
+    {
+        Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> GetLinkTypeAsync(int Id);
+        Task<(bool IsSuccess, IEnumerable<Models.LinkType> LinkTypes, string ErrorMessage)> GetLinkTypesAsync();
+        Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> PostLinkTypeAsync(Models.LinkType LinkType);
+        Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> UpdateLinkTypeAsync(Models.LinkType LinkType);
+        Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> DeleteLinkTypeAsync(int Id);
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Interfaces/IDocumentsProvider.cs

@@ -0,0 +1,17 @@
+using DamageAssesment.Api.Documents.Models;
+
+namespace DamageAssesment.Api.Documents.Interfaces
+{
+    public interface IDocumentsProvider : ILinkTypesProvider
+    {
+        Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> GetDocumentAsync(int Id);
+        Task<(bool IsSuccess, IEnumerable<Models.Document> documents, string ErrorMessage)> GetDocumnetsAsync();
+        Task<(bool IsSuccess, IEnumerable<Models.Document> documents, string ErrorMessage)> GetDocumnetsByLinkAsync(string Language,string LinkType);
+        Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> PostDocumentAsync(Models.Document Document);
+        Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> UpdateDocumentAsync(Models.Document Document);
+        Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> DeleteDocumentAsync(int Id);
+        Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter();
+
+
+    }
+}

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

@@ -0,0 +1,12 @@
+using DamageAssesment.Api.Documents.Models;
+
+namespace DamageAssesment.Api.Documents.Interfaces
+{
+    public interface IUploadService
+    {
+        Models.Document UploadDocument( int counter, DocumentInfo documentInfo);
+        public Models.Document UpdateDocuments( Models.Document document, DocumentInfo documentInfo);
+        void Deletefile(string path);
+        void Movefile(string path);
+    }
+}

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

@@ -0,0 +1,95 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.Documents.Db;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Documents.Migrations
+{
+    [DbContext(typeof(DocumentDbContext))]
+    [Migration("20230828165655_InitialDocumentCreate")]
+    partial class InitialDocumentCreate
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.Document", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("dateCreated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("dateUpdated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("description")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("docName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("linkTypeId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("title")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("url")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.LinkType", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("TypeText")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LinkTypes");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

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

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

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

@@ -0,0 +1,118 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.Documents.Db;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Documents.Migrations
+{
+    [DbContext(typeof(DocumentDbContext))]
+    [Migration("20230830200432_DocumentTranslation")]
+    partial class DocumentTranslation
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.Document", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("dateCreated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("dateUpdated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("docName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("linkTypeId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("url")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.DocumentsTranslation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("DocumentId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Language")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("description")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("title")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DocumentsTranslations");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.LinkType", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsAttachment")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("TypeText")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LinkTypes");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

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

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

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

@@ -0,0 +1,115 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.Documents.Db;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Documents.Migrations
+{
+    [DbContext(typeof(DocumentDbContext))]
+    partial class DocumentDbContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.Document", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("dateCreated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("dateUpdated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("docName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("linkTypeId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("url")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.DocumentsTranslation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("DocumentId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Language")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("description")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("title")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DocumentsTranslations");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.LinkType", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsAttachment")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("TypeText")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LinkTypes");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Models/Document.cs

@@ -0,0 +1,19 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.Documents.Models
+{
+    public class Document
+    {
+        public int Id { get; set; }
+
+        public int linkTypeId { get; set; }
+        public string docName { get; set; }
+
+        public string url { get; set; }
+        public string Path { get; set; }
+        public bool IsActive { get; set; }
+        public DateTime dateCreated { get; set; }
+        public DateTime dateUpdated { get; set; }
+        public List<DocumentsTranslation> documentsTranslations { get; set; }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Models/DocumentInfo.cs

@@ -0,0 +1,19 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace DamageAssesment.Api.Documents.Models
+{
+    public class DocumentInfo
+    {
+        public int Id { get; set; }
+        public int linkTypeId { get; set; }
+        public string url { get; set; }
+        public List<DocumentsTranslation> documentsTranslations { get; set; }
+        public FileModel? File { get; set; }
+    }
+    public class FileModel
+    {
+        public string? FileName { get; set; }
+        public string? FileContent { get; set; }
+        public string? FileExtension { get; set; }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Models/DocumentsTranslation.cs

@@ -1,9 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace DamageAssesment.Api.DocuLinks.Models
+namespace DamageAssesment.Api.Documents.Models
 {
-    public class DoculinkTranslation
+    public class DocumentsTranslation
     {
         public string title { get; set; }
         public string description { get; set; }

DamageAssesmentApi/DamageAssesment.Api.Documents/Models/LinkType.cs

@@ -0,0 +1,12 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.Documents.Models
+{
+    public class LinkType
+    {
+        public int Id { get; set; }
+        public string TypeText { get; set; }
+        public bool IsActive { get; set; }
+        public bool IsAttachment { get; set; }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Profiles/DocumentProfile.cs

@@ -0,0 +1,17 @@
+using AutoMapper;
+
+namespace DamageAssesment.Api.Documents.Profiles
+{
+    public class DocumentProfile : AutoMapper.Profile
+    {
+        public DocumentProfile()
+        {
+            CreateMap<Db.Document, Models.Document>();
+            CreateMap<Models.Document, Db.Document>();
+            CreateMap<Db.LinkType, Models.LinkType>();
+            CreateMap<Models.LinkType, Db.LinkType>();
+            CreateMap<Db.DocumentsTranslation, Models.DocumentsTranslation>();
+            CreateMap<Models.DocumentsTranslation, Db.DocumentsTranslation>();
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Program.cs

@@ -0,0 +1,35 @@
+using DamageAssesment.Api.Documents.Db;
+using DamageAssesment.Api.Documents.Interfaces;
+using DamageAssesment.Api.Documents.Providers;
+using Microsoft.EntityFrameworkCore;
+
+var builder = WebApplication.CreateBuilder(args);
+
+// 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();
+builder.Services.AddScoped<IDocumentsProvider, documentsProvider>();
+builder.Services.AddScoped<IUploadService, UploadService>();
+builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
+builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
+builder.Services.AddDbContext<DocumentDbContext>(option =>
+{
+    option.UseInMemoryDatabase("DocumentConnection");
+});
+var app = builder.Build();
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseSwagger();
+    app.UseSwaggerUI();
+}
+
+app.UseAuthorization();
+
+app.MapControllers();
+
+app.Run();

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

@@ -1,14 +1,23 @@
-{
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:60754",
+      "sslPort": 0
+    }
+  },
   "profiles": {
-    "DamageAssesment.Api.Doculinks": {
+    "DamageAssesment.Api.Questions": {
       "commandName": "Project",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5133",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
+      }
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5136"
     },
     "IIS Express": {
       "commandName": "IISExpress",
@@ -17,24 +26,6 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "environmentVariables": {
-        "ASPNETCORE_URLS": "http://+:80"
-      },
-      "publishAllPorts": true
-    }
-  },
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:14425",
-      "sslPort": 0
     }
   }
-}
+}

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

@@ -0,0 +1,44 @@
+
+using Azure.Storage.Blobs;
+using Azure.Storage.Blobs.Models;
+using Azure.Storage.Blobs.Specialized;
+using DamageAssesment.Api.Documents.Interfaces;
+
+namespace DamageAssesment.Api.Documents.Providers
+{
+    public class AzureBlobService: IAzureBlobService
+    {
+        BlobServiceClient _blobClient;
+        BlobContainerClient _containerClient;
+        string azureConnectionString = "<Primary Connection String>";
+        public AzureBlobService()
+        {
+            _blobClient = new BlobServiceClient(azureConnectionString);
+            _containerClient = _blobClient.GetBlobContainerClient("apiimages");
+        }
+
+        public async Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files)
+        {
+
+            var azureResponse = new List<Azure.Response<BlobContentInfo>>();
+            foreach (var file in files)
+            {
+                string fileName = file.FileName;
+                using (var memoryStream = new MemoryStream())
+                {
+                    file.CopyTo(memoryStream);
+                    memoryStream.Position = 0;
+                    var client = await _containerClient.UploadBlobAsync(fileName, memoryStream, default);
+                    azureResponse.Add(client);
+                }
+            };
+
+            return azureResponse;
+        }
+        public void DeleteFile(string url)
+        {
+            var blob = _containerClient.GetBlockBlobClient(url);
+            blob.DeleteIfExists();
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Providers/DocumentsProvider.cs

@@ -0,0 +1,363 @@
+using AutoMapper;
+using DamageAssesment.Api.Documents.Db;
+using DamageAssesment.Api.Documents.Interfaces;
+using DamageAssesment.Api.Documents.Models;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using System;
+using System.Diagnostics.Eventing.Reader;
+
+namespace DamageAssesment.Api.Documents.Providers
+{
+
+
+    public class documentsProvider : IDocumentsProvider
+    {
+        private DocumentDbContext DocumentDbContext;
+        private ILogger<documentsProvider> logger;
+        private IUploadService uploadservice;
+        private IMapper mapper;
+
+        public documentsProvider(DocumentDbContext DocumentDbContext, ILogger<documentsProvider> logger, IMapper mapper, IUploadService uploadservice)
+        {
+            this.DocumentDbContext = DocumentDbContext;
+            this.logger = logger;
+            this.mapper = mapper;
+            this.uploadservice = uploadservice;
+            SeedData();
+        }
+
+
+
+        private void SeedData()
+        {
+            if (!DocumentDbContext.LinkTypes.Any())
+            {
+                DocumentDbContext.LinkTypes.Add(new Db.LinkType() {TypeText = "Forms",IsActive=true, IsAttachment=true });
+                DocumentDbContext.LinkTypes.Add(new Db.LinkType() {TypeText = "Communiques",IsActive = true,IsAttachment=false });
+                DocumentDbContext.LinkTypes.Add(new Db.LinkType() {TypeText = "Memos",IsActive = true,IsAttachment=true });
+                DocumentDbContext.SaveChanges();
+            }
+            if (!DocumentDbContext.Documents.Any())
+            {
+                FileModel fileModel = new FileModel() { FileName = "Sample", FileContent = "c2FtcGxl", FileExtension = ".txt" };
+                DocumentInfo documentInfo = new DocumentInfo() { linkTypeId = 1, url = "Sample",  File = fileModel };
+                Models.Document document = uploadservice.UploadDocument(0, documentInfo);
+                DocumentDbContext.Documents.Add(mapper.Map<Models.Document, Db.Document>(document));
+                DocumentDbContext.SaveChanges();
+            }
+            if (!DocumentDbContext.DocumentsTranslations.Any())
+            {
+                Db.DocumentsTranslation documents = new Db.DocumentsTranslation { DocumentId = 1, title = "Test", description = "ss", Language = "en" };
+                DocumentDbContext.DocumentsTranslations.Add(documents);
+                DocumentDbContext.SaveChanges();
+            }
+        }
+        public async Task<(bool IsSuccess, IEnumerable<Models.Document> documents, string ErrorMessage)> GetDocumnetsByLinkAsync(string Language, string LinkType)
+        {
+
+            try
+            {
+                logger?.LogInformation("Query Question");
+                var documents=new List<Db.Document>();
+                if(String.IsNullOrEmpty(LinkType))
+                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => q.IsActive).ToListAsync();
+                else
+                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => q.IsActive &&
+                     q.linkTypeId == (DocumentDbContext.LinkTypes.AsNoTracking().Where(a => a.TypeText.ToLower() == LinkType.ToLower()).Select(a => a.Id).FirstOrDefault())).ToListAsync();
+                if (documents != null)
+                {
+                    var result = mapper.Map<IEnumerable<Db.Document>, IEnumerable<Models.Document>>(documents);
+                    foreach (var item in result)
+                    {
+                        if(!String.IsNullOrEmpty(Language))
+                            item.documentsTranslations = mapper.Map<List<Db.DocumentsTranslation>, List<Models.DocumentsTranslation>>(
+                                    DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == item.Id && (a.Language.ToLower() == Language.ToLower())).ToList());
+                        else
+                        item.documentsTranslations = mapper.Map<List<Db.DocumentsTranslation>, List<Models.DocumentsTranslation>>(
+                                DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == item.Id).ToList());
+                    }
+                    return (true, result, null);
+                }
+                return (false, null, "Not found");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+
+        }
+        public async Task<(bool IsSuccess, IEnumerable<Models.Document> documents, string ErrorMessage)> GetDocumnetsAsync()
+        {
+
+            try
+            {
+                logger?.LogInformation("Query Question");
+                var documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => q.IsActive).ToListAsync();
+                if (documents != null)
+                {
+                    logger?.LogInformation($"{documents.Count} Document(s) found");
+                    var result = mapper.Map<IEnumerable<Db.Document>, IEnumerable<Models.Document>>(documents);
+                    foreach (var item in result)
+                    {
+                        item.documentsTranslations = mapper.Map<List<Db.DocumentsTranslation>, List<Models.DocumentsTranslation>>(
+                                DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == item.Id).ToList());
+                    }
+                    return (true, result, null);
+                }
+                return (false, null, "Not found");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+
+        }
+        public async Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> GetDocumentAsync(int Id)
+        {
+            try
+            {
+                logger?.LogInformation("Query LinkType");
+                var Document = await DocumentDbContext.Documents.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id && q.IsActive);
+                if (Document != null)
+                {
+                    logger?.LogInformation($"{Document} customer(s) found");
+                    var result = mapper.Map<Db.Document, Models.Document>(Document);
+                    result.documentsTranslations = mapper.Map<List<Db.DocumentsTranslation>, List<Models.DocumentsTranslation>>(
+                            DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == result.Id).ToList());
+                    return (true, result, null);
+                }
+                return (false, null, "Not found");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        public async Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> PostDocumentAsync(Models.Document Document)
+        {
+            try
+            {
+                var document = mapper.Map<Models.Document, Db.Document>(Document);
+                DocumentDbContext.Documents.Add(document);
+                DocumentDbContext.SaveChanges();
+                var dbtranslation = mapper.Map<List<Models.DocumentsTranslation>, List<Db.DocumentsTranslation>>(Document.documentsTranslations);
+                dbtranslation.ForEach(i => i.DocumentId = document.Id);
+                DocumentDbContext.DocumentsTranslations.AddRange(dbtranslation);
+                DocumentDbContext.SaveChanges();
+                Document.Id = document.Id;
+                return (true, Document, null);
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+
+        public async Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> UpdateDocumentAsync(Models.Document Document)
+        {
+            try
+            {
+                if (Document != null)
+                {
+                    var existing = DocumentDbContext.Documents.AsNoTracking().FirstOrDefault(x => x.Id == Document.Id);
+                    if (existing != null)
+                    {
+                        var document = mapper.Map<Models.Document, Db.Document>(Document);
+                        DocumentDbContext.Documents.Update(document);
+                        DocumentDbContext.SaveChanges();
+                        var oldtranslations = DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == Document.Id).ToList();
+                        if (oldtranslations != null)
+                            DocumentDbContext.DocumentsTranslations.RemoveRange(oldtranslations);
+                        var dbtranslation = mapper.Map<List<Models.DocumentsTranslation>, List<Db.DocumentsTranslation>>(Document.documentsTranslations);
+                        dbtranslation.ForEach(i => i.DocumentId = Document.Id);
+                        return (true, Document, "Successful");
+                    }
+                    else
+                    {
+                        logger?.LogInformation($"{Document} Not found");
+                        return (false, null, "Not Found");
+                    }
+                }
+                else
+                {
+                    logger?.LogInformation($"{Document} Bad Request");
+                    return (false, null, "Bad request");
+                }
+
+            }
+            catch (Exception ex)
+            {
+
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        public async Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> DeleteDocumentAsync(int Id)
+        {
+
+            try
+            {
+                Db.Document Document = DocumentDbContext.Documents.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
+                if (Document == null)
+                {
+                    return (false, null, "Not Found");
+                }
+                Document.IsActive = false;
+                DocumentDbContext.Documents.Update(Document);
+                DocumentDbContext.SaveChanges();
+                return (true, mapper.Map<Db.Document, Models.Document>(Document), $"DocumentId {Id} deleted Successfuly");
+            }
+            catch (Exception ex)
+            {
+
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+
+        public async Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter()
+        {
+            try
+            {
+                int AttachmentId = DocumentDbContext.Documents.Max(a => a.Id);
+                return (true, AttachmentId, "");
+            }
+            catch (Exception ex)
+            {
+                return (false, 0, ex.Message);
+            }
+        }
+
+        //Link Type methods
+        public async Task<(bool IsSuccess, IEnumerable<Models.LinkType> LinkTypes, string ErrorMessage)> GetLinkTypesAsync()
+        {
+
+            try
+            {
+                logger?.LogInformation("Query Question");
+                var LinkType = await DocumentDbContext.LinkTypes.AsNoTracking().Where(q=>q.IsActive).ToListAsync();
+                if (LinkType != null)
+                {
+                    logger?.LogInformation($"{LinkType.Count} LinkTypes(s) found");
+                    var result = mapper.Map<IEnumerable<Db.LinkType>, IEnumerable<Models.LinkType>>(LinkType);
+                    return (true, result, null);
+                }
+                return (false, null, "Not found");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+
+        }
+
+        public async Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> GetLinkTypeAsync(int Id)
+        {
+            try
+            {
+                logger?.LogInformation("Query LinkType");
+                var LinkType = await DocumentDbContext.LinkTypes.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id&&q.IsActive);
+                if (LinkType != null)
+                {
+                    logger?.LogInformation($"{LinkType} customer(s) found");
+                    var result = mapper.Map<Db.LinkType, Models.LinkType>(LinkType);
+                    return (true, result, null);
+                }
+                return (false, null, "Not found");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        public async Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> PostLinkTypeAsync(Models.LinkType LinkType)
+        {
+            try
+            {
+                logger?.LogInformation("Query LinkType");
+                if (!LinkTypeExists(LinkType.Id))
+                {
+                    var dbLink = mapper.Map<Models.LinkType, Db.LinkType>(LinkType);
+                    DocumentDbContext.LinkTypes.Add(dbLink);
+                    DocumentDbContext.SaveChanges();
+                    var result = mapper.Map<Db.LinkType, Models.LinkType>(dbLink);
+                    return (true, result, null);
+                }
+                return (false, null, "LinkType is already exits");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        public async Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> UpdateLinkTypeAsync(Models.LinkType LinkType)
+        {
+            try
+            {
+                if (LinkType != null)
+                {
+                    var existing = DocumentDbContext.LinkTypes.AsNoTracking().FirstOrDefault(x => x.Id == LinkType.Id);
+                    if (existing != null)
+                    {
+                        var dbLink = mapper.Map<Models.LinkType, Db.LinkType>(LinkType);
+                        DocumentDbContext.LinkTypes.Update(dbLink);
+                        DocumentDbContext.SaveChanges();
+                        return (true, mapper.Map<Db.LinkType, Models.LinkType>(dbLink), "Successful");
+                    }
+                    else
+                    {
+                        logger?.LogInformation($"{LinkType} Not found");
+                        return (false, null, "Not Found");
+                    }
+                }
+                else
+                {
+                    logger?.LogInformation($"{LinkType} Bad Request");
+                    return (false, null, "Bad request");
+                }
+
+            }
+            catch (Exception ex)
+            {
+
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        public async Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> DeleteLinkTypeAsync(int Id)
+        {
+
+            try
+            {
+                Db.LinkType LinkType = DocumentDbContext.LinkTypes.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
+                if (LinkType == null)
+                {
+                    return (false, null, "Not Found");
+                }
+                LinkType.IsActive = false;
+                DocumentDbContext.LinkTypes.Update(LinkType);
+                DocumentDbContext.SaveChanges();
+                return (true, mapper.Map<Db.LinkType, Models.LinkType>(LinkType), $"LinkTypeId {Id} deleted Successfuly");
+            }
+            catch (Exception ex)
+            {
+
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        private bool LinkTypeExists(int id)
+        {
+            return DocumentDbContext.LinkTypes.AsNoTracking().Count(e => e.Id == id) > 0;
+        }
+    }
+}

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

@@ -0,0 +1,123 @@
+using AutoMapper;
+using Azure;
+using DamageAssesment.Api.Documents.Db;
+using DamageAssesment.Api.Documents.Interfaces;
+using DamageAssesment.Api.Documents.Models;
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using System.Diagnostics.Metrics;
+using System.Net.Http;
+using System.Security.AccessControl;
+using System.Security.Principal;
+
+namespace DamageAssesment.Api.Documents.Providers
+{
+    public class UploadService : IUploadService
+    {
+        private ILogger<UploadService> logger;
+        private IMapper mapper;
+        private string uploadpath = "";
+        private string Deletepath = "";
+        public UploadService(IConfiguration configuration, ILogger<UploadService> logger, IMapper mapper)
+        {
+            this.logger = logger;
+            this.mapper = mapper;
+            uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
+            Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
+        }
+
+        public Models.Document UploadDocument(int counter, DocumentInfo documentInfo)
+        {
+            Models.Document Documents = new Models.Document();
+            try 
+            {
+                string path = "", UserfileName="";
+                if (documentInfo.File != null)
+                {
+                    counter++;
+                    var fullDirectoryPath = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
+                    if (!Directory.Exists(fullDirectoryPath)) //Create deirectory if does not exist
+                        Directory.CreateDirectory(fullDirectoryPath);
+                    UserfileName = Path.GetFileName(documentInfo.File.FileName);
+                    var fileName = String.Format("Document_{0}{1}", counter, documentInfo.File.FileExtension);
+                    path = Path.Combine(fullDirectoryPath, fileName);
+                    File.WriteAllBytes(path, Convert.FromBase64String(documentInfo.File.FileContent));
+                }
+                Documents=new Models.Document (){ linkTypeId = documentInfo.linkTypeId,
+                    documentsTranslations = documentInfo.documentsTranslations,
+                    docName = UserfileName, 
+                    url = documentInfo.url, Path = path,IsActive =true,dateCreated=DateTime.Now,dateUpdated=DateTime.Now};
+            
+                return Documents;
+            }
+            catch (Exception ex) {
+                return new Models.Document();
+            }
+
+           
+        }
+        public Models.Document UpdateDocuments(Models.Document document, DocumentInfo documentInfo)
+        {
+            try
+            {
+                Deletefile(document.Path);
+                var fullDirectoryPath = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
+                if (!Directory.Exists(fullDirectoryPath)) //Create deirectory if does not exist
+                    Directory.CreateDirectory(fullDirectoryPath);
+
+                string path = "", UserfileName = "";
+                if (documentInfo.File != null)
+                {
+                    UserfileName = Path.GetFileName(documentInfo.File.FileName);
+                    var fileName = String.Format("Document_{0}{1}", documentInfo.Id, documentInfo.File.FileExtension);
+                    path = Path.Combine(fullDirectoryPath, fileName);
+                    File.WriteAllBytes(path, Convert.FromBase64String(documentInfo.File.FileContent));
+                }
+                Models.Document Documents = new Models.Document()
+                {
+                    Id = documentInfo.Id,
+                    linkTypeId = documentInfo.linkTypeId,
+                    documentsTranslations=documentInfo.documentsTranslations,
+                    docName = UserfileName,
+                    url = documentInfo.url,
+                    Path = path,
+                    IsActive = true,
+                    dateCreated = document.dateCreated,
+                    dateUpdated = DateTime.Now
+                };
+
+                return Documents;
+            }
+
+             catch (Exception ex) {
+                return new Models.Document();
+            }
+        }
+        public void Deletefile(string path)
+        {
+            if (path != "")
+            {
+                FileInfo file = new FileInfo(path);
+                if (file?.Exists??false)//check file exsit or not  
+                {
+                    file.Delete();
+                }
+            }
+        }
+        public void Movefile(string path)
+        {
+            if (path != "")
+            {
+                var pathToSave = Path.Combine(Directory.GetCurrentDirectory(), Deletepath);
+                if (!Directory.Exists(pathToSave)) //Create deirectory if does not exist
+                    Directory.CreateDirectory(pathToSave);
+                FileInfo file = new FileInfo(path);
+                if (file?.Exists ?? false)//check file exsit or not  
+                {
+                    string filename = file.Name.Replace(file.Extension, " ") + DateTime.Now.ToShortDateString().Replace("/","_") + file.Extension;
+                    file.MoveTo(pathToSave+"\\"+ filename);
+                }
+            }
+        }
+    }
+}

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

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

DamageAssesmentApi/DamageAssesment.Api.Documents/appsettings.json

@@ -0,0 +1,13 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*",
+  "Fileupload": {
+    "folderpath": "DASA_Documents/Active",
+    "Deletepath": "DASA_Documents/Deleted"
+  }
+}

DamageAssesmentApi/DamageAssesment.Api.Employees.Test/EmployeeServiceTest.cs

@@ -43,11 +43,11 @@ namespace DamageAssesment.Api.Employees.Test
         public async Task GetEmployeeAsync_ShouldReturnStatusCode200()
         {
             var mockEmployeeService = new Mock<IEmployeesProvider>();
-            var mockResponse = await MockData.getOkResponse(1);
+            var mockResponse = await MockData.getOkResponse("Emp1");
-            mockEmployeeService.Setup(service => service.GetEmployeeByIdAsync(1)).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.GetEmployeeByIdAsync("Emp1")).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (OkObjectResult)await EmployeeProvider.GetEmployeeByIdAsync(1);
+            var result = (OkObjectResult)await EmployeeProvider.GetEmployeeByIdAsync("Emp1");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -57,10 +57,10 @@ namespace DamageAssesment.Api.Employees.Test
         {
             var mockEmployeeService = new Mock<IEmployeesProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
-            mockEmployeeService.Setup(service => service.GetEmployeeByIdAsync(99999)).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.GetEmployeeByIdAsync("Emp99")).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (NotFoundResult)await EmployeeProvider.GetEmployeeByIdAsync(99999);
+            var result = (NotFoundResult)await EmployeeProvider.GetEmployeeByIdAsync("Emp99");
             Assert.Equal(404, result.StatusCode);
         }
 
@@ -68,7 +68,7 @@ namespace DamageAssesment.Api.Employees.Test
         public async Task PostEmployeeAsync_ShouldReturnStatusCode200()
         {
             var mockEmployeeService = new Mock<IEmployeesProvider>();
-            var mockResponse = await MockData.getOkResponse(1);
+            var mockResponse = await MockData.getOkResponse("Emp1");
             var mockInputEmployee = await MockData.getInputEmployeeData();
             mockEmployeeService.Setup(service => service.PostEmployeeAsync(mockInputEmployee)).ReturnsAsync(mockResponse);
 
@@ -96,12 +96,12 @@ namespace DamageAssesment.Api.Employees.Test
         public async Task PutEmployeeAsync_ShouldReturnStatusCode200()
         {
             var mockEmployeeService = new Mock<IEmployeesProvider>();
-            var mockResponse = await MockData.getOkResponse(1);
+            var mockResponse = await MockData.getOkResponse("Emp1");
             var mockInputEmployee = await MockData.getInputEmployeeData();
-            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync(1,mockInputEmployee)).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync("Emp1",mockInputEmployee)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (OkObjectResult)await EmployeeProvider.UpdateEmployee(1,mockInputEmployee);
+            var result = (OkObjectResult)await EmployeeProvider.UpdateEmployee("Emp1",mockInputEmployee);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -112,10 +112,10 @@ namespace DamageAssesment.Api.Employees.Test
             var mockEmployeeService = new Mock<IEmployeesProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
             var mockInputEmployee = await MockData.getInputEmployeeData();
-            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync(1, mockInputEmployee)).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync("Emp1", mockInputEmployee)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (NotFoundObjectResult)await EmployeeProvider.UpdateEmployee(1, mockInputEmployee);
+            var result = (NotFoundObjectResult)await EmployeeProvider.UpdateEmployee("Emp1", mockInputEmployee);
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -126,10 +126,10 @@ namespace DamageAssesment.Api.Employees.Test
             var mockEmployeeService = new Mock<IEmployeesProvider>();
             var mockResponse = await MockData.getBadRequestResponse();
             var mockInputEmployee = await MockData.getInputEmployeeData();
-            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync(1, mockInputEmployee)).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync("Emp1", mockInputEmployee)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (BadRequestObjectResult)await EmployeeProvider.UpdateEmployee(1, mockInputEmployee);
+            var result = (BadRequestObjectResult)await EmployeeProvider.UpdateEmployee("Emp1", mockInputEmployee);
 
             Assert.Equal(400, result.StatusCode);
         }
@@ -138,12 +138,12 @@ namespace DamageAssesment.Api.Employees.Test
         public async Task DeleteEmployeeAsync_ShouldReturnStatusCode200()
         {
             var mockEmployeeService = new Mock<IEmployeesProvider>();
-            var mockResponse = await MockData.getOkResponse(1);
+            var mockResponse = await MockData.getOkResponse("Emp1");
 
-            mockEmployeeService.Setup(service => service.DeleteEmployeeAsync(1)).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.DeleteEmployeeAsync("Emp1")).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (OkObjectResult)await EmployeeProvider.DeleteEmployee(1);
+            var result = (OkObjectResult)await EmployeeProvider.DeleteEmployee("Emp1");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -153,10 +153,10 @@ namespace DamageAssesment.Api.Employees.Test
         {
             var mockEmployeeService = new Mock<IEmployeesProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
-            mockEmployeeService.Setup(service => service.DeleteEmployeeAsync(1)).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.DeleteEmployeeAsync("Emp1")).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (NotFoundResult)await EmployeeProvider.DeleteEmployee(1);
+            var result = (NotFoundResult)await EmployeeProvider.DeleteEmployee("Emp1");
 
             Assert.Equal(404, result.StatusCode);
         }

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

@@ -1,4 +1,8 @@
-using System.Text;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace DamageAssesment.Api.Employees.Test
 {
@@ -11,13 +15,13 @@ namespace DamageAssesment.Api.Employees.Test
 
             for (int i = 0; i < 10; i++)
             {
-                list.Append(new Employees.Models.Employee { Id = i, Name = "Emoployee"+i, Email = "abc"+i+"@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18-i), IsActive = true, PreferredLanguage = "en" });
+                list.Append(new Employees.Models.Employee { Id = "Emp"+i, Name = "Emoployee"+i, Email = "abc"+i+"@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18-i), IsActive = true, PreferredLanguage = "en" });
             }
             return (true, list, null);
         }
 
 
-        public static async Task<(bool, Employees.Models.Employee, string)> getOkResponse(int Id)
+        public static async Task<(bool, Employees.Models.Employee, string)> getOkResponse(string Id)
         {
             var Employees = await getOkResponse();
             var Employee = Employees.Item2.FirstOrDefault(s => s.Id == Id);
@@ -41,7 +45,7 @@ namespace DamageAssesment.Api.Employees.Test
 
         public static async Task<Models.Employee> getInputEmployeeData()
         {
-            return new Models.Employee { Id = 1, Name = "ABC1", Email = "abc1@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" };
+            return new Models.Employee { Id = "Emp1", Name = "ABC1", Email = "abc1@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" };
 
         }
 

DamageAssesmentApi/DamageAssesment.Api.Employees/Controllers/EmployeesController.cs

@@ -1,10 +1,10 @@
 using DamageAssesment.Api.Employees.Interfaces;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Employees.Controllers
 {
+    //[Route("api")]
     [ApiController]
     public class EmployeesController : ControllerBase
     {
@@ -19,8 +19,8 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// <summary>
         /// GET request for retrieving employees.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
-        [HttpGet("employees")]
+        [HttpGet("Employees")]
         public async Task<ActionResult> GetEmployeesAsync()
         {
 
@@ -36,12 +36,12 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// <summary>
         /// GET request for retrieving an employee by ID.
         /// </summary>
-        [Authorize(Roles = "admin")]
+        
-        [HttpGet("employees/{id}")]
+        [HttpGet("Employees/{Id}")]
-        public async Task<ActionResult> GetEmployeeByIdAsync(int id)
+        public async Task<ActionResult> GetEmployeeByIdAsync(string Id)
         {
 
-            var result = await EmployeeProvider.GetEmployeeByIdAsync(id);
+            var result = await EmployeeProvider.GetEmployeeByIdAsync(Id);
             if (result.IsSuccess)
             {
                 return Ok(result.Employee);
@@ -49,18 +49,17 @@ namespace DamageAssesment.Api.Employees.Controllers
             return NotFound();
 
         }
-
+   
         /// <summary>
         /// PUT request for updating an existing employee.
         /// </summary>
         /// <param name="Employee">The updated employee object.</param>
-        [Authorize(Roles = "admin")]
+        [HttpPut("Employees")]
-        [HttpPut("employees/{id}")]
+        public async Task<IActionResult> UpdateEmployee(string Id, Models.Employee Employee)
-        public async Task<IActionResult> UpdateEmployee(int id, Models.Employee Employee)
         {
             if (Employee != null)
             {
-                var result = await this.EmployeeProvider.UpdateEmployeeAsync(id,Employee);
+                var result = await this.EmployeeProvider.UpdateEmployeeAsync(Id,Employee);
                 if (result.IsSuccess)
                 {
                     return Ok(result.Employee);
@@ -77,8 +76,7 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// POST request for creating a new employee.
         /// </summary>
         /// <param name="Employee">The employee information for creating a new employee.</param>
-        [Authorize(Roles = "admin")]
+        [HttpPost("Employees")]
-        [HttpPost("employees")]
         public async Task<IActionResult> CreateEmployee(Models.Employee Employee)
         {
             if (Employee != null)
@@ -90,15 +88,14 @@ namespace DamageAssesment.Api.Employees.Controllers
                 }
                 return BadRequest(result.ErrorMessage);
             }
-            return CreatedAtRoute("DefaultApi", new { Id = Employee.Id }, Employee);
+            return CreatedAtRoute("DefaultApi", new { id = Employee.Id }, Employee);
         }
         /// <summary>
         /// DELETE request for deleting an existing employee.
         /// </summary>
         /// <param name="id">The ID of the employee to be deleted.</param>
-        [Authorize(Roles = "admin")]
+        [HttpDelete("Employees/{id}")]
-        [HttpDelete("employees/{id}")]
+        public async Task<IActionResult> DeleteEmployee(string id)
-        public async Task<IActionResult> DeleteEmployee(int id)
         {
             var result = await this.EmployeeProvider.DeleteEmployeeAsync(id);
             if (result.IsSuccess)

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

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

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

@@ -1,15 +1,11 @@
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Employees.Db
 {
-    [Table("Employees")]
     public class Employee
     {
         [Key]
-        public int Id { get; set; }
+        public string Id { get; set; }
-        [StringLength(50)]
-        public string EmployeeCode { get; set; }
 
         [StringLength(50)]
         public string Name { get; set; }
@@ -21,7 +17,7 @@ namespace DamageAssesment.Api.Employees.Db
 
         [StringLength(50)]
         public string Email { get; set; }
-        public bool IsActive { get; set; }
+        public bool IsActive {get;set;}
         public string? PreferredLanguage { get; set; } = "en";
     }
 }

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

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

DamageAssesmentApi/DamageAssesment.Api.Employees/Dockerfile

@@ -1,21 +1,39 @@
 #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
+# Use the ASP.NET base image
 FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
 WORKDIR /app
 EXPOSE 80
 
+# Use the SDK image for building
 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /src
+
+# Copy the project file and restore dependencies
 COPY ["DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj", "DamageAssesment.Api.Employees/"]
 RUN dotnet restore "DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj"
+
+# Copy the source code
 COPY . .
 WORKDIR "/src/DamageAssesment.Api.Employees"
+
+# Build the application
 RUN dotnet build "DamageAssesment.Api.Employees.csproj" -c Release -o /app/build
 
+# Publish the application
 FROM build AS publish
 RUN dotnet publish "DamageAssesment.Api.Employees.csproj" -c Release -o /app/publish /p:UseAppHost=false
 
+# Set up the final image
 FROM base AS final
 WORKDIR /app
+
+# Copy the published files
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Employees.dll"]
+
+## Set up the volume and copy the XML comments
+#VOLUME /xmlcomments
+#COPY ["DamageAssesment.Api.Employees.xml", "/xmlcomments/DamageAssesment.Api.Employees.xml"]
+
+# Specify the entry point for the container
+ENTRYPOINT ["dotnet", "DamageAssesment.Api.Employees.dll"]

DamageAssesmentApi/DamageAssesment.Api.Employees/Interfaces/IEmployeesProvider.cs

@@ -3,10 +3,10 @@
     public interface IEmployeesProvider
     {
         Task<(bool IsSuccess, IEnumerable<Models.Employee> Employees, string ErrorMessage)> GetEmployeesAsync();
-        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> GetEmployeeByIdAsync(int Id);
+        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> GetEmployeeByIdAsync(string Id);
         Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> PostEmployeeAsync(Models.Employee Employee);
-        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(int Id, Models.Employee Employee);
+        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(string Id, Models.Employee Employee);
-        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> DeleteEmployeeAsync(int Id);
+        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> DeleteEmployeeAsync(string Id);
         void SeedData();
     }
 }

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

@@ -4,8 +4,7 @@ namespace DamageAssesment.Api.Employees.Models
 {
     public class Employee
     {
-        public int Id { get; set; }
+        public string Id { get; set; }
-        public string EmployeeCode { get; set; }
         public string Name { get; set; }
         public DateTime BirthDate { get; set; }
         public string OfficePhoneNumber { get; set; }

DamageAssesmentApi/DamageAssesment.Api.Employees/Profiles/EmployeesProfile.cs

@@ -7,7 +7,6 @@ namespace DamageAssesment.Api.Employees.Profiles
         public EmployeesProfile()
         {
             CreateMap<Db.Employee, Models.Employee>();
-            CreateMap<Models.Employee, Db.Employee>();
         }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Employees/Program.cs

@@ -1,81 +1,30 @@
 using DamageAssesment.Api.Employees.Db;
 using DamageAssesment.Api.Employees.Interfaces;
 using DamageAssesment.Api.Employees.Providers;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.IdentityModel.Tokens;
-using Microsoft.OpenApi.Models;
 using System.Reflection;
-using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddAuthentication(item =>
-{
-    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    item.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-}).AddJwtBearer(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
-    };
-});
 
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 //builder.Services.AddSwaggerGen();
-builder.Services.AddSwaggerGen(options =>
+builder.Services.AddSwaggerGen(c =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    options.IncludeXmlComments(xmlPath);
+    c.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.AddScoped<IEmployeesProvider, EmployeesProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<EmployeeDbContext>(option =>
 {
-    option.UseSqlServer("EmployeeConnection");
+    option.UseInMemoryDatabase("Employees");
 });
 
 var app = builder.Build();
@@ -83,18 +32,23 @@ 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 employeesProvider = services.GetRequiredService<IEmployeesProvider>();
+        var employeeProvider = services.GetRequiredService<IEmployeesProvider>();
-        employeesProvider.SeedData();
+        employeeProvider.SeedData();
     }
+
+    app.UseSwagger();
+    app.UseSwaggerUI(options =>
+    {
+        //switch for local environment
+       // options.SwaggerEndpoint("/swagger/v1/swagger.json", "");
+        options.SwaggerEndpoint("/employees/swagger/v1/swagger.json", "");
+       
+    });
 }
 
-app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -22,9 +22,6 @@
       "commandName": "Docker",
       "launchBrowser": true,
       "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "environmentVariables": {
-        "ASPNETCORE_URLS": "http://+:80"
-      },
       "publishAllPorts": true
     }
   },

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

@@ -45,12 +45,12 @@ namespace DamageAssesment.Api.Employees.Providers
 
         }
 
-        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> GetEmployeeByIdAsync(int Id)
+        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> GetEmployeeByIdAsync(string Id)
         {
             try
             {
                 logger?.LogInformation("Query Employee");
-                var Employee = await EmployeeDbContext.Employees.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
+                var Employee = await EmployeeDbContext.Employees.AsNoTracking().FirstOrDefaultAsync(q => q.Id.ToLower() == Id.ToLower());
                 if (Employee != null)
                 {
                     logger?.LogInformation($"{Employee} customer(s) found");
@@ -72,15 +72,13 @@ namespace DamageAssesment.Api.Employees.Providers
                 Db.Employee _employee = mapper.Map<Models.Employee, Db.Employee>(Employee);
 
                 logger?.LogInformation("Query Employee");
-                if (!EmployeeCodeExists(Employee.EmployeeCode))
+                if (!EmployeeExists(Employee.Id))
                 {
                     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");
+                return (false, null, "Employee is already exits");
             }
             catch (Exception ex)
             {
@@ -88,20 +86,19 @@ namespace DamageAssesment.Api.Employees.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(int Id, Models.Employee Employee)
+        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(string Id , Models.Employee Employee)
         {
             try
             {
                 if (Employee != null)
                 {
-                    var _employee = await EmployeeDbContext.Employees.AsNoTracking().Where(s => s.Id == Id).FirstOrDefaultAsync();
+                    var _employee = await EmployeeDbContext.Employees.AsNoTracking().Where(s => s.Id.ToLower() == Id.ToLower()).FirstOrDefaultAsync();
 
                     if (_employee != null)
                     {
                         Db.Employee vEmployee = mapper.Map<Models.Employee, Db.Employee>(Employee);
                         EmployeeDbContext.Employees.Update(vEmployee);
                         EmployeeDbContext.SaveChanges();
-                        Employee.Id = Id;
                         return (true, Employee, "Successful");
                     }
                     else
@@ -123,11 +120,11 @@ namespace DamageAssesment.Api.Employees.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> DeleteEmployeeAsync(int Id)
+        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> DeleteEmployeeAsync(string Id)
         {
             try
             {
-                Db.Employee Employee = EmployeeDbContext.Employees.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
+                Db.Employee Employee = EmployeeDbContext.Employees.AsNoTracking().Where(a => a.Id.ToLower() == Id.ToLower()).FirstOrDefault();
                 if (Employee == null)
                 {
                     return (false, null, "Not Found");
@@ -140,29 +137,24 @@ namespace DamageAssesment.Api.Employees.Providers
             {
 
                 logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
+                return (false,null, ex.Message);
             }
         }
-        private bool EmployeeExists(int id)
+        private bool EmployeeExists(string id)
         {
-            return EmployeeDbContext.Employees.AsNoTracking().Count(e => e.Id == id) > 0;
+            return EmployeeDbContext.Employees.AsNoTracking().Count(e => e.Id.ToLower() == id.ToLower()) > 0;
-        }
-
-        private bool EmployeeCodeExists(string employeeCode)
-        {
-            return EmployeeDbContext.Employees.AsNoTracking().Count(e => e.EmployeeCode.ToLower() == employeeCode.ToLower()) > 0;
         }
 
         public void SeedData()
         {
             if (!EmployeeDbContext.Employees.Any())
             {
-                EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "10101", Name = "David", Email = "david@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp1", Name = "ABC1", Email = "abc1@gmail.com", OfficePhoneNumber = "12345678",BirthDate=DateTime.Now.AddYears(-18), IsActive = true,PreferredLanguage="en" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "20202", Name = "Smith", Email = "smith@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-22), IsActive = true, PreferredLanguage = "fr" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp2", Name = "ABC2", Email = "abc2@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-22), IsActive = true, PreferredLanguage = "fr" });
-                //EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 3, EmployeeCode = "Emp3", Name = "ABC3", Email = "abc3@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-30), IsActive = true, PreferredLanguage = "fr" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp3", Name = "ABC3", Email = "abc3@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-30) ,IsActive = true, PreferredLanguage = "fr" });
-                //EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 4, EmployeeCode = "Emp4", Name = "ABC4", Email = "abc4@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-20), IsActive = true, PreferredLanguage = "en" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp4", Name = "ABC4", Email = "abc4@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-20) ,IsActive = true, PreferredLanguage = "en" });
-                //EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 5, EmployeeCode = "Emp5", Name = "ABC5", Email = "abc5@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-23), IsActive = true, PreferredLanguage = "es" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp5", Name = "ABC5", Email = "abc5@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-23) ,IsActive = true, PreferredLanguage = "es" });
-                //EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 6, EmployeeCode = "Emp6", Name = "ABC6", Email = "abc6@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-32), IsActive = true, PreferredLanguage = "es" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp6", Name = "ABC6", Email = "abc6@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-32) ,IsActive = true, PreferredLanguage = "es" });
                 EmployeeDbContext.SaveChanges();
             }
 

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

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

DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.json

@@ -9,9 +9,9 @@
     }
   },
   "AllowedHosts": "*",
-  "ConnectionStrings": {
+  "settings": {
-    //"EmployeeConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+    "endpoint1": "xxx",
-    "EmployeeConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
+    "endpoint2": "xxx",
-
+    "endpoint3": "xxx"
   }
 }

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>

DamageAssesmentApi/DamageAssesment.Api.Locations.Test/LocationsServiceTest.cs

@@ -40,11 +40,11 @@ namespace DamageAssesment.Api.Locations.Test
         public async Task GetLocationsByIdAsync_ShouldReturnStatusCode200()
         {
             var mockLocationService = new Mock<ILocationsProvider>();
-            var mockResponse = await MockData.getOkResponseLocation(1);
+            var mockResponse = await MockData.getOkResponseLocation("Loc1");
-            mockLocationService.Setup(service => service.GetLocationByIdAsync(1)).ReturnsAsync(mockResponse);
+            mockLocationService.Setup(service => service.GetLocationByIdAsync("Loc1")).ReturnsAsync(mockResponse);
 
             var locationProvider = new LocationsController(mockLocationService.Object);
-            var result = (OkObjectResult)await locationProvider.GetLocationByIdAsync(1);
+            var result = (OkObjectResult)await locationProvider.GetLocationByIdAsync("Loc1");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -55,10 +55,10 @@ namespace DamageAssesment.Api.Locations.Test
         {
             var mockLocationService = new Mock<ILocationsProvider>();
             var mockResponse = await MockData.getLocationNotFoundResponse();
-            mockLocationService.Setup(service => service.GetLocationByIdAsync(1)).ReturnsAsync(mockResponse);
+            mockLocationService.Setup(service => service.GetLocationByIdAsync("Loc1")).ReturnsAsync(mockResponse);
 
             var locationProvider = new LocationsController(mockLocationService.Object);
-            var result = (NotFoundResult)await locationProvider.GetLocationByIdAsync(1);
+            var result = (NotFoundResult)await locationProvider.GetLocationByIdAsync("Loc1");
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -68,8 +68,8 @@ namespace DamageAssesment.Api.Locations.Test
         public async Task PostLocationAsync_ShouldReturnStatusCode200()
         {
             var mockLocationService = new Mock<ILocationsProvider>();
-            var mockResponse = await MockData.getOkResponseLocation(1);
+            var mockResponse = await MockData.getOkResponseLocation("Loc1");
-            var mockInputLocation = new Models.Location { Id = 1, RegionId = 1, Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
+            var mockInputLocation = new Models.Location { Id = "Loc1", RegionId = "R1", Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
             mockLocationService.Setup(service => service.PostLocationAsync(mockInputLocation)).ReturnsAsync(mockResponse);
 
             var locationProvider = new LocationsController(mockLocationService.Object);
@@ -83,11 +83,11 @@ namespace DamageAssesment.Api.Locations.Test
         {
             var mockLocationService = new Mock<ILocationsProvider>();
             var mockResponse = await MockData.getLocationNotFoundResponse();
-            var mockInputLocation = new Models.Location { Id = 1, RegionId = 1, Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
+            var mockInputLocation = new Models.Location { Id = "Loc1", RegionId = "R1", Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
             mockLocationService.Setup(service => service.PostLocationAsync(mockInputLocation)).ReturnsAsync(mockResponse);
 
             var locationProvider = new LocationsController(mockLocationService.Object);
-            var result = (BadRequestObjectResult)await locationProvider.CreateLocation(mockInputLocation);
+            var result = (BadRequestResult)await locationProvider.CreateLocation(mockInputLocation);
 
             Assert.Equal(400, result.StatusCode);
         }
@@ -98,11 +98,11 @@ namespace DamageAssesment.Api.Locations.Test
         {
             var mockLocationService = new Mock<ILocationsProvider>();
             var mockResponse = await MockData.getLocation(true, "update success");
-            var mockInputLocation = new Models.Location { Id = 1, LocationCode ="Loc1", RegionId = 1, Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
+            var mockInputLocation = new Models.Location { Id = "Loc1", RegionId = "R1", Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
-            mockLocationService.Setup(service => service.UpdateLocationAsync(1,mockInputLocation)).ReturnsAsync(mockResponse);
+            mockLocationService.Setup(service => service.UpdateLocationAsync(mockInputLocation)).ReturnsAsync(mockResponse);
 
             var locationProvider = new LocationsController(mockLocationService.Object);
-            var result = (OkObjectResult)await locationProvider.UpdateLocation(1,mockInputLocation);
+            var result = (OkObjectResult)await locationProvider.UpdateLocation(mockInputLocation);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -112,11 +112,11 @@ namespace DamageAssesment.Api.Locations.Test
         {
             var mockLocationService = new Mock<ILocationsProvider>();
             var mockResponse = await MockData.getLocation(false, null);
-            var mockInputLocation = new Models.Location { Id = 1, RegionId = 1, Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
+            var mockInputLocation = new Models.Location { Id = "Loc1", RegionId = "R1", Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
-            mockLocationService.Setup(service => service.UpdateLocationAsync(1,mockInputLocation)).ReturnsAsync(mockResponse);
+            mockLocationService.Setup(service => service.UpdateLocationAsync(mockInputLocation)).ReturnsAsync(mockResponse);
 
             var locationProvider = new LocationsController(mockLocationService.Object);
-            var result = (NotFoundResult)await locationProvider.UpdateLocation(1,mockInputLocation);
+            var result = (NotFoundResult)await locationProvider.UpdateLocation(mockInputLocation);
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -127,10 +127,10 @@ namespace DamageAssesment.Api.Locations.Test
         {
             var mockLocationService = new Mock<ILocationsProvider>();
             var mockResponse = await MockData.getLocation(true, "delete success");
-            mockLocationService.Setup(service => service.DeleteLocationAsync(1)).ReturnsAsync(mockResponse);
+            mockLocationService.Setup(service => service.DeleteLocationAsync("Loc1")).ReturnsAsync(mockResponse);
 
             var locationProvider = new LocationsController(mockLocationService.Object);
-            var result = (OkObjectResult)await locationProvider.DeleteLocation(1);
+            var result = (OkObjectResult)await locationProvider.DeleteLocation("Loc1");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -140,10 +140,10 @@ namespace DamageAssesment.Api.Locations.Test
         {
             var mockLocationService = new Mock<ILocationsProvider>();
             var mockResponse = await MockData.getLocation(false, null);
-            mockLocationService.Setup(service => service.DeleteLocationAsync(1)).ReturnsAsync(mockResponse);
+            mockLocationService.Setup(service => service.DeleteLocationAsync("Loc1")).ReturnsAsync(mockResponse);
 
             var locationProvider = new LocationsController(mockLocationService.Object);
-            var result = (NotFoundResult)await locationProvider.DeleteLocation(1);
+            var result = (NotFoundResult)await locationProvider.DeleteLocation("Loc1");
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -180,11 +180,11 @@ namespace DamageAssesment.Api.Locations.Test
         public async Task GetRegionAsync_ShouldReturnStatusCode200()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
-            var mockResponse = await MockData.getOkResponse(1);
+            var mockResponse = await MockData.getOkResponse("1");
-            mockRegionService.Setup(service => service.GetRegionByIdAsync(1)).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.GetRegionByIdAsync("1")).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (OkObjectResult)await regionProvider.GetRegionAsync(1);
+            var result = (OkObjectResult)await regionProvider.GetRegionAsync("1");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -194,10 +194,10 @@ namespace DamageAssesment.Api.Locations.Test
         {
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
-            mockRegionService.Setup(service => service.GetRegionByIdAsync(99999)).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.GetRegionByIdAsync("99")).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (NotFoundResult)await regionProvider.GetRegionAsync(99);
+            var result = (NotFoundResult)await regionProvider.GetRegionAsync("99");
             Assert.Equal(404, result.StatusCode);
         }
 
@@ -205,7 +205,7 @@ namespace DamageAssesment.Api.Locations.Test
         public async Task PostRegionAsync_ShouldReturnStatusCode200()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
-            var mockResponse = await MockData.getOkResponse(1);
+            var mockResponse = await MockData.getOkResponse("1");
             var mockInputRegion = await MockData.getInputRegionData();
             mockRegionService.Setup(service => service.PostRegionAsync(mockInputRegion)).ReturnsAsync(mockResponse);
 
@@ -233,12 +233,12 @@ namespace DamageAssesment.Api.Locations.Test
         public async Task PutRegionAsync_ShouldReturnStatusCode200()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
-            var mockResponse = await MockData.getOkResponse(1);
+            var mockResponse = await MockData.getOkResponse("1");
             var mockInputRegion = await MockData.getInputRegionData();
-            mockRegionService.Setup(service => service.PutRegionAsync(1,mockInputRegion)).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.PutRegionAsync(mockInputRegion)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (OkObjectResult)await regionProvider.PutRegionAsync(1,mockInputRegion);
+            var result = (OkObjectResult)await regionProvider.PutRegionAsync(mockInputRegion);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -249,10 +249,10 @@ namespace DamageAssesment.Api.Locations.Test
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
             var mockInputRegion = await MockData.getInputRegionData();
-            mockRegionService.Setup(service => service.PutRegionAsync(1, mockInputRegion)).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.PutRegionAsync(mockInputRegion)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (NotFoundObjectResult)await regionProvider.PutRegionAsync(1,mockInputRegion);
+            var result = (NotFoundObjectResult)await regionProvider.PutRegionAsync(mockInputRegion);
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -263,10 +263,10 @@ namespace DamageAssesment.Api.Locations.Test
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getBadRequestResponse();
             var mockInputRegion = await MockData.getInputRegionData();
-            mockRegionService.Setup(service => service.PutRegionAsync(1, mockInputRegion)).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.PutRegionAsync(mockInputRegion)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (BadRequestObjectResult)await regionProvider.PutRegionAsync(1, mockInputRegion);
+            var result = (BadRequestObjectResult)await regionProvider.PutRegionAsync(mockInputRegion);
 
             Assert.Equal(400, result.StatusCode);
         }
@@ -275,12 +275,12 @@ namespace DamageAssesment.Api.Locations.Test
         public async Task DeleteRegionAsync_ShouldReturnStatusCode200()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
-            var mockResponse = await MockData.getOkResponse(1);
+            var mockResponse = await MockData.getOkResponse("1");
 
-            mockRegionService.Setup(service => service.DeleteRegionAsync(1)).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.DeleteRegionAsync("1")).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (OkObjectResult)await regionProvider.DeleteRegionAsync(1);
+            var result = (OkObjectResult)await regionProvider.DeleteRegionAsync("1");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -291,10 +291,10 @@ namespace DamageAssesment.Api.Locations.Test
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
 
-            mockRegionService.Setup(service => service.DeleteRegionAsync(1)).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.DeleteRegionAsync("1")).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (NotFoundResult)await regionProvider.DeleteRegionAsync(1);
+            var result = (NotFoundResult)await regionProvider.DeleteRegionAsync("1");
 
             Assert.Equal(404, result.StatusCode);
         }