From 3207b58b9613293582e117744020b18a55938446 Mon Sep 17 00:00:00 2001 From: Santhosh S <913341@dadeschools.net> Date: Thu, 14 Sep 2023 15:35:23 -0400 Subject: [PATCH 01/30] Dockerize with DocuLinks Inital version --- DamageAssesmentApi/.dockerignore | 25 ++++++++ .../DamageAssesment.Api.Answers.csproj | 5 +- .../DamageAssesment.Api.Answers/Dockerfile | 21 ++++++ .../Properties/launchSettings.json | 37 +++++++---- .../DamageAssesment.Api.Attachments.csproj | 3 + .../Dockerfile | 29 +++++++++ .../Properties/launchSettings.json | 37 +++++++---- .../DamageAssesment.Api.DocuLinks.csproj | 3 + .../DamageAssesment.Api.Documents/Dockerfile | 30 +++++++++ .../Properties/launchSettings.json | 37 +++++++---- .../DamageAssesment.Api.Employees.csproj | 3 + .../DamageAssesment.Api.Employees/Dockerfile | 21 ++++++ .../Properties/launchSettings.json | 37 +++++++---- .../DamageAssesment.Api.Locations.csproj | 3 + .../DamageAssesment.Api.Locations/Dockerfile | 21 ++++++ .../Properties/launchSettings.json | 37 +++++++---- .../DamageAssesment.Api.Questions.csproj | 3 + .../DamageAssesment.Api.Questions/Dockerfile | 21 ++++++ .../Properties/launchSettings.json | 37 +++++++---- ...DamageAssesment.Api.SurveyResponses.csproj | 3 + .../Dockerfile | 21 ++++++ .../Properties/launchSettings.json | 37 +++++++---- .../appsettings.json | 46 ++++++------- .../DamageAssesment.Api.Surveys.csproj | 3 + .../DamageAssesment.Api.Surveys/Dockerfile | 21 ++++++ .../Properties/launchSettings.json | 37 +++++++---- DamageAssesmentApi/DamageAssesment.sln | 6 ++ DamageAssesmentApi/docker-compose.dcproj | 18 ++++++ .../docker-compose.override.yml | 64 +++++++++++++++++++ DamageAssesmentApi/docker-compose.yml | 57 +++++++++++++++++ DamageAssesmentApi/launchSettings.json | 18 ++++++ 31 files changed, 605 insertions(+), 136 deletions(-) create mode 100644 DamageAssesmentApi/.dockerignore create mode 100644 DamageAssesmentApi/DamageAssesment.Api.Answers/Dockerfile create mode 100644 DamageAssesmentApi/DamageAssesment.Api.Attachments/Dockerfile create mode 100644 DamageAssesmentApi/DamageAssesment.Api.Documents/Dockerfile create mode 100644 DamageAssesmentApi/DamageAssesment.Api.Employees/Dockerfile create mode 100644 DamageAssesmentApi/DamageAssesment.Api.Locations/Dockerfile create mode 100644 DamageAssesmentApi/DamageAssesment.Api.Questions/Dockerfile create mode 100644 DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Dockerfile create mode 100644 DamageAssesmentApi/DamageAssesment.Api.Surveys/Dockerfile create mode 100644 DamageAssesmentApi/docker-compose.dcproj create mode 100644 DamageAssesmentApi/docker-compose.override.yml create mode 100644 DamageAssesmentApi/docker-compose.yml create mode 100644 DamageAssesmentApi/launchSettings.json diff --git a/DamageAssesmentApi/.dockerignore b/DamageAssesmentApi/.dockerignore new file mode 100644 index 0000000..3729ff0 --- /dev/null +++ b/DamageAssesmentApi/.dockerignore @@ -0,0 +1,25 @@ +**/.classpath +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/azds.yaml +**/bin +**/charts +**/docker-compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj +**/secrets.dev.yaml +**/values.dev.yaml +LICENSE +README.md \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj b/DamageAssesmentApi/DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj index f33241f..4b1c8e9 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj +++ b/DamageAssesmentApi/DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj @@ -1,10 +1,12 @@ - + net6.0 enable enable True + Linux + ..\docker-compose.dcproj @@ -12,6 +14,7 @@ + diff --git a/DamageAssesmentApi/DamageAssesment.Api.Answers/Dockerfile b/DamageAssesmentApi/DamageAssesment.Api.Answers/Dockerfile new file mode 100644 index 0000000..2ae373c --- /dev/null +++ b/DamageAssesmentApi/DamageAssesment.Api.Answers/Dockerfile @@ -0,0 +1,21 @@ +#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.Answers/DamageAssesment.Api.Answers.csproj", "DamageAssesment.Api.Answers/"] +RUN dotnet restore "DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj" +COPY . . +WORKDIR "/src/DamageAssesment.Api.Answers" +RUN dotnet build "DamageAssesment.Api.Answers.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "DamageAssesment.Api.Answers.csproj" -c Release -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "DamageAssesment.Api.Answers.dll"] \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.Api.Answers/Properties/launchSettings.json b/DamageAssesmentApi/DamageAssesment.Api.Answers/Properties/launchSettings.json index 822163a..991c121 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Answers/Properties/launchSettings.json +++ b/DamageAssesmentApi/DamageAssesment.Api.Answers/Properties/launchSettings.json @@ -1,23 +1,14 @@ -{ - "$schema": "https://json.schemastore.org/launchsettings.json", - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "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" - } + }, + "dotnetRunMessages": true, + "applicationUrl": "http://localhost:5200" }, "IIS Express": { "commandName": "IISExpress", @@ -26,6 +17,24 @@ "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:18005", + "sslPort": 0 } } -} +} \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.Api.Attachments/DamageAssesment.Api.Attachments.csproj b/DamageAssesmentApi/DamageAssesment.Api.Attachments/DamageAssesment.Api.Attachments.csproj index 46a5b7a..9aec665 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Attachments/DamageAssesment.Api.Attachments.csproj +++ b/DamageAssesmentApi/DamageAssesment.Api.Attachments/DamageAssesment.Api.Attachments.csproj @@ -5,6 +5,8 @@ enable enable True + Linux + ..\docker-compose.dcproj @@ -14,6 +16,7 @@ + diff --git a/DamageAssesmentApi/DamageAssesment.Api.Attachments/Dockerfile b/DamageAssesmentApi/DamageAssesment.Api.Attachments/Dockerfile new file mode 100644 index 0000000..82e7391 --- /dev/null +++ b/DamageAssesmentApi/DamageAssesment.Api.Attachments/Dockerfile @@ -0,0 +1,29 @@ +#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.Attachments/DamageAssesment.Api.Attachments.csproj", "DamageAssesment.Api.Attachments/"] +RUN dotnet restore "DamageAssesment.Api.Attachments/DamageAssesment.Api.Attachments.csproj" +COPY . . +WORKDIR "/src/DamageAssesment.Api.Attachments" +RUN dotnet build "DamageAssesment.Api.Attachments.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "DamageAssesment.Api.Attachments.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/DMS_Attachments/Active && \ + mkdir -p /app/DMS_Attachments/Deleted && \ + chown -R www-data:www-data /app/DMS_Attachments + +# 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"] \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.Api.Attachments/Properties/launchSettings.json b/DamageAssesmentApi/DamageAssesment.Api.Attachments/Properties/launchSettings.json index 8d37224..5aa2562 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Attachments/Properties/launchSettings.json +++ b/DamageAssesmentApi/DamageAssesment.Api.Attachments/Properties/launchSettings.json @@ -1,23 +1,14 @@ -{ - "$schema": "https://json.schemastore.org/launchsettings.json", - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "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" - } + }, + "dotnetRunMessages": true, + "applicationUrl": "http://localhost:5243" }, "IIS Express": { "commandName": "IISExpress", @@ -26,6 +17,24 @@ "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:65305", + "sslPort": 0 } } -} +} \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.Api.Documents/DamageAssesment.Api.DocuLinks.csproj b/DamageAssesmentApi/DamageAssesment.Api.Documents/DamageAssesment.Api.DocuLinks.csproj index dab0e6c..a72f082 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Documents/DamageAssesment.Api.DocuLinks.csproj +++ b/DamageAssesmentApi/DamageAssesment.Api.Documents/DamageAssesment.Api.DocuLinks.csproj @@ -5,6 +5,8 @@ enable enable True + Linux + ..\docker-compose.dcproj @@ -22,6 +24,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/DamageAssesmentApi/DamageAssesment.Api.Documents/Dockerfile b/DamageAssesmentApi/DamageAssesment.Api.Documents/Dockerfile new file mode 100644 index 0000000..74ec8b7 --- /dev/null +++ b/DamageAssesmentApi/DamageAssesment.Api.Documents/Dockerfile @@ -0,0 +1,30 @@ +#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.Documents/DamageAssesment.Api.DocuLinks.csproj", "DamageAssesment.Api.Documents/"] +RUN dotnet restore "DamageAssesment.Api.Documents/DamageAssesment.Api.DocuLinks.csproj" +COPY . . +WORKDIR "/src/DamageAssesment.Api.Documents" +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"] \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.Api.Documents/Properties/launchSettings.json b/DamageAssesmentApi/DamageAssesment.Api.Documents/Properties/launchSettings.json index e4e08ae..a3cf25e 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Documents/Properties/launchSettings.json +++ b/DamageAssesmentApi/DamageAssesment.Api.Documents/Properties/launchSettings.json @@ -1,23 +1,14 @@ -{ - "$schema": "https://json.schemastore.org/launchsettings.json", - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:60754", - "sslPort": 0 - } - }, +{ "profiles": { "DamageAssesment.Api.Questions": { "commandName": "Project", - "dotnetRunMessages": true, "launchBrowser": true, "launchUrl": "swagger", - "applicationUrl": "http://localhost:5133", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - } + }, + "dotnetRunMessages": true, + "applicationUrl": "http://localhost:5133" }, "IIS Express": { "commandName": "IISExpress", @@ -26,6 +17,24 @@ "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:60754", + "sslPort": 0 } } -} +} \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj b/DamageAssesmentApi/DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj index a696247..6789613 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj +++ b/DamageAssesmentApi/DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj @@ -5,6 +5,8 @@ enable enable True + Linux + ..\docker-compose.dcproj @@ -12,6 +14,7 @@ + diff --git a/DamageAssesmentApi/DamageAssesment.Api.Employees/Dockerfile b/DamageAssesmentApi/DamageAssesment.Api.Employees/Dockerfile new file mode 100644 index 0000000..cbc7d04 --- /dev/null +++ b/DamageAssesmentApi/DamageAssesment.Api.Employees/Dockerfile @@ -0,0 +1,21 @@ +#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.Employees/DamageAssesment.Api.Employees.csproj", "DamageAssesment.Api.Employees/"] +RUN dotnet restore "DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj" +COPY . . +WORKDIR "/src/DamageAssesment.Api.Employees" +RUN dotnet build "DamageAssesment.Api.Employees.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "DamageAssesment.Api.Employees.csproj" -c Release -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "DamageAssesment.Api.Employees.dll"] \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.Api.Employees/Properties/launchSettings.json b/DamageAssesmentApi/DamageAssesment.Api.Employees/Properties/launchSettings.json index 2c81744..b5c560b 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Employees/Properties/launchSettings.json +++ b/DamageAssesmentApi/DamageAssesment.Api.Employees/Properties/launchSettings.json @@ -1,23 +1,14 @@ -{ - "$schema": "https://json.schemastore.org/launchsettings.json", - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:14425", - "sslPort": 0 - } - }, +{ "profiles": { "DamageAssesment.Api.Employees": { "commandName": "Project", - "dotnetRunMessages": true, "launchBrowser": true, "launchUrl": "swagger", - "applicationUrl": "http://localhost:5135", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - } + }, + "dotnetRunMessages": true, + "applicationUrl": "http://localhost:5135" }, "IIS Express": { "commandName": "IISExpress", @@ -26,6 +17,24 @@ "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 } } -} +} \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.Api.Locations/DamageAssesment.Api.Locations.csproj b/DamageAssesmentApi/DamageAssesment.Api.Locations/DamageAssesment.Api.Locations.csproj index a696247..6789613 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Locations/DamageAssesment.Api.Locations.csproj +++ b/DamageAssesmentApi/DamageAssesment.Api.Locations/DamageAssesment.Api.Locations.csproj @@ -5,6 +5,8 @@ enable enable True + Linux + ..\docker-compose.dcproj @@ -12,6 +14,7 @@ + diff --git a/DamageAssesmentApi/DamageAssesment.Api.Locations/Dockerfile b/DamageAssesmentApi/DamageAssesment.Api.Locations/Dockerfile new file mode 100644 index 0000000..bb9aeb9 --- /dev/null +++ b/DamageAssesmentApi/DamageAssesment.Api.Locations/Dockerfile @@ -0,0 +1,21 @@ +#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.Locations/DamageAssesment.Api.Locations.csproj", "DamageAssesment.Api.Locations/"] +RUN dotnet restore "DamageAssesment.Api.Locations/DamageAssesment.Api.Locations.csproj" +COPY . . +WORKDIR "/src/DamageAssesment.Api.Locations" +RUN dotnet build "DamageAssesment.Api.Locations.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "DamageAssesment.Api.Locations.csproj" -c Release -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "DamageAssesment.Api.Locations.dll"] \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.Api.Locations/Properties/launchSettings.json b/DamageAssesmentApi/DamageAssesment.Api.Locations/Properties/launchSettings.json index 940c35e..36c1779 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Locations/Properties/launchSettings.json +++ b/DamageAssesmentApi/DamageAssesment.Api.Locations/Properties/launchSettings.json @@ -1,23 +1,14 @@ -{ - "$schema": "https://json.schemastore.org/launchsettings.json", - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:20458", - "sslPort": 0 - } - }, +{ "profiles": { "DamageAssesment.Api.Locations": { "commandName": "Project", - "dotnetRunMessages": true, "launchBrowser": true, "launchUrl": "swagger", - "applicationUrl": "http://localhost:5213", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - } + }, + "dotnetRunMessages": true, + "applicationUrl": "http://localhost:5213" }, "IIS Express": { "commandName": "IISExpress", @@ -26,6 +17,24 @@ "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:20458", + "sslPort": 0 } } -} +} \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.Api.Questions/DamageAssesment.Api.Questions.csproj b/DamageAssesmentApi/DamageAssesment.Api.Questions/DamageAssesment.Api.Questions.csproj index a696247..6789613 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Questions/DamageAssesment.Api.Questions.csproj +++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/DamageAssesment.Api.Questions.csproj @@ -5,6 +5,8 @@ enable enable True + Linux + ..\docker-compose.dcproj @@ -12,6 +14,7 @@ + diff --git a/DamageAssesmentApi/DamageAssesment.Api.Questions/Dockerfile b/DamageAssesmentApi/DamageAssesment.Api.Questions/Dockerfile new file mode 100644 index 0000000..11f44c9 --- /dev/null +++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Dockerfile @@ -0,0 +1,21 @@ +#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.Questions/DamageAssesment.Api.Questions.csproj", "DamageAssesment.Api.Questions/"] +RUN dotnet restore "DamageAssesment.Api.Questions/DamageAssesment.Api.Questions.csproj" +COPY . . +WORKDIR "/src/DamageAssesment.Api.Questions" +RUN dotnet build "DamageAssesment.Api.Questions.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "DamageAssesment.Api.Questions.csproj" -c Release -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "DamageAssesment.Api.Questions.dll"] \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.Api.Questions/Properties/launchSettings.json b/DamageAssesmentApi/DamageAssesment.Api.Questions/Properties/launchSettings.json index e4e08ae..a3cf25e 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Properties/launchSettings.json +++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Properties/launchSettings.json @@ -1,23 +1,14 @@ -{ - "$schema": "https://json.schemastore.org/launchsettings.json", - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:60754", - "sslPort": 0 - } - }, +{ "profiles": { "DamageAssesment.Api.Questions": { "commandName": "Project", - "dotnetRunMessages": true, "launchBrowser": true, "launchUrl": "swagger", - "applicationUrl": "http://localhost:5133", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - } + }, + "dotnetRunMessages": true, + "applicationUrl": "http://localhost:5133" }, "IIS Express": { "commandName": "IISExpress", @@ -26,6 +17,24 @@ "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:60754", + "sslPort": 0 } } -} +} \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/DamageAssesment.Api.SurveyResponses.csproj b/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/DamageAssesment.Api.SurveyResponses.csproj index 02ef277..1ee7c58 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/DamageAssesment.Api.SurveyResponses.csproj +++ b/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/DamageAssesment.Api.SurveyResponses.csproj @@ -5,6 +5,8 @@ enable enable True + Linux + ..\docker-compose.dcproj @@ -13,6 +15,7 @@ + diff --git a/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Dockerfile b/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Dockerfile new file mode 100644 index 0000000..0001073 --- /dev/null +++ b/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Dockerfile @@ -0,0 +1,21 @@ +#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.SurveyResponses/DamageAssesment.Api.SurveyResponses.csproj", "DamageAssesment.Api.SurveyResponses/"] +RUN dotnet restore "DamageAssesment.Api.SurveyResponses/DamageAssesment.Api.SurveyResponses.csproj" +COPY . . +WORKDIR "/src/DamageAssesment.Api.SurveyResponses" +RUN dotnet build "DamageAssesment.Api.SurveyResponses.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "DamageAssesment.Api.SurveyResponses.csproj" -c Release -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "DamageAssesment.Api.SurveyResponses.dll"] \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Properties/launchSettings.json b/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Properties/launchSettings.json index 0d51b15..7bd92b0 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Properties/launchSettings.json +++ b/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Properties/launchSettings.json @@ -1,23 +1,14 @@ -{ - "$schema": "https://json.schemastore.org/launchsettings.json", - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:58856", - "sslPort": 0 - } - }, +{ "profiles": { "DamageAssesment.Api.SurveyResponses": { "commandName": "Project", - "dotnetRunMessages": true, "launchBrowser": true, "launchUrl": "swagger", - "applicationUrl": "http://localhost:5104", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - } + }, + "dotnetRunMessages": true, + "applicationUrl": "http://localhost:5104" }, "IIS Express": { "commandName": "IISExpress", @@ -26,6 +17,24 @@ "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:58856", + "sslPort": 0 } } -} +} \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/appsettings.json b/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/appsettings.json index d7b64fc..6aa210e 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/appsettings.json +++ b/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/appsettings.json @@ -6,28 +6,28 @@ } }, "AllowedHosts": "*", - "EndPointSettings": { - "AnswerUrlBase": "http://localhost:5200", - "LocationUrlBase": "http://localhost:5213", - "RegionUrlBase": "http://localhost:5211", - "QuestionUrlBase": "http://localhost:5133", - "EmployeeUrlBase": "http://localhost:5135", - "AttachmentUrlBase": "http://localhost:5243", - "SurveyUrlBase": "http://localhost:5009" - }, - "RessourceSettings": { - "Employee": "/Employees", - "EmployeeById": "/Employees/{0}", - "Question": "/Questions", - "QuestionById": "/Questions/{0}", - "SurveyQuestion": "/Questions/BySurvey/{0}", - "Survey": "/Surveys", - "SurveyById": "/Surveys/{0}", - "Attachment": "/Attachments", - "Answer": "/Answers", - "AnswerByResponse": "/Answers/ByResponse/{0}", - "Location": "/Locations", - "Region": "/Regions" + + "EndPointSettings": { + "AnswerUrlBase": "http://damageassesment.api.answers:80", + "LocationUrlBase": "http://damageassesment.api.locations:80", + "QuestionUrlBase": "http://damageassesment.api.questions:80", + "EmployeeUrlBase": "http://damageassesment.api.employees:80", + "AttachmentUrlBase": "http://damageassesment.api.attachments:80", + "SurveyUrlBase": "http://damageassesment.api.survey:80" + }, + "RessourceSettings": { + "Employee": "/Employees", + "EmployeeById": "/Employees/{0}", + "Question": "/Questions", + "QuestionById": "/Questions/{0}", + "SurveyQuestion": "/Questions/BySurvey/{0}", + "Survey": "/Surveys", + "SurveyById": "/Surveys/{0}", + "Attachment": "/Attachments", + "Answer": "/Answers", + "AnswerByResponse": "/Answers/ByResponse/{0}", + "Location": "/Locations", + "Region": "/Regions" + } } -} diff --git a/DamageAssesmentApi/DamageAssesment.Api.Surveys/DamageAssesment.Api.Surveys.csproj b/DamageAssesmentApi/DamageAssesment.Api.Surveys/DamageAssesment.Api.Surveys.csproj index a696247..6789613 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/DamageAssesment.Api.Surveys.csproj +++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/DamageAssesment.Api.Surveys.csproj @@ -5,6 +5,8 @@ enable enable True + Linux + ..\docker-compose.dcproj @@ -12,6 +14,7 @@ + diff --git a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Dockerfile b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Dockerfile new file mode 100644 index 0000000..f11b36b --- /dev/null +++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Dockerfile @@ -0,0 +1,21 @@ +#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.Surveys/DamageAssesment.Api.Surveys.csproj", "DamageAssesment.Api.Surveys/"] +RUN dotnet restore "DamageAssesment.Api.Surveys/DamageAssesment.Api.Surveys.csproj" +COPY . . +WORKDIR "/src/DamageAssesment.Api.Surveys" +RUN dotnet build "DamageAssesment.Api.Surveys.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "DamageAssesment.Api.Surveys.csproj" -c Release -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "DamageAssesment.Api.Surveys.dll"] \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Properties/launchSettings.json b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Properties/launchSettings.json index 247b548..0e90cd4 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Properties/launchSettings.json +++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Properties/launchSettings.json @@ -1,23 +1,14 @@ -{ - "$schema": "https://json.schemastore.org/launchsettings.json", - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:51498", - "sslPort": 0 - } - }, +{ "profiles": { "DamageAssesment.Api.Surveys": { "commandName": "Project", - "dotnetRunMessages": true, "launchBrowser": true, "launchUrl": "swagger", - "applicationUrl": "http://localhost:5009", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - } + }, + "dotnetRunMessages": true, + "applicationUrl": "http://localhost:5009" }, "IIS Express": { "commandName": "IISExpress", @@ -26,6 +17,24 @@ "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:51498", + "sslPort": 0 } } -} +} \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.sln b/DamageAssesmentApi/DamageAssesment.sln index 0cb2d7c..17eb191 100644 --- a/DamageAssesmentApi/DamageAssesment.sln +++ b/DamageAssesmentApi/DamageAssesment.sln @@ -41,6 +41,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.DocuLin EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.DocuLinks.Test", "DamageAssesment.Api.Documents.Test\DamageAssesment.Api.DocuLinks.Test.csproj", "{884BA4AC-9170-49B1-BD6B-850B350C95C0}" EndProject +Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{0DD44934-6826-43C8-A438-320A05209967}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -111,6 +113,10 @@ Global {884BA4AC-9170-49B1-BD6B-850B350C95C0}.Debug|Any CPU.Build.0 = Debug|Any CPU {884BA4AC-9170-49B1-BD6B-850B350C95C0}.Release|Any CPU.ActiveCfg = Release|Any CPU {884BA4AC-9170-49B1-BD6B-850B350C95C0}.Release|Any CPU.Build.0 = Release|Any CPU + {0DD44934-6826-43C8-A438-320A05209967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0DD44934-6826-43C8-A438-320A05209967}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0DD44934-6826-43C8-A438-320A05209967}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0DD44934-6826-43C8-A438-320A05209967}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DamageAssesmentApi/docker-compose.dcproj b/DamageAssesmentApi/docker-compose.dcproj new file mode 100644 index 0000000..98c753f --- /dev/null +++ b/DamageAssesmentApi/docker-compose.dcproj @@ -0,0 +1,18 @@ + + + + 2.1 + Linux + 0dd44934-6826-43c8-a438-320a05209967 + LaunchBrowser + {Scheme}://localhost:{ServicePort}/swagger + damageassesment.api.answers + + + + docker-compose.yml + + + + + \ No newline at end of file diff --git a/DamageAssesmentApi/docker-compose.override.yml b/DamageAssesmentApi/docker-compose.override.yml new file mode 100644 index 0000000..6e8ea42 --- /dev/null +++ b/DamageAssesmentApi/docker-compose.override.yml @@ -0,0 +1,64 @@ +version: '3.4' + +services: + damageassesment.api.answers: + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "6001:80" + + damageassesment.api.attachments: + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "6002:80" + + + damageassesment.api.employees: + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "6003:80" + + + damageassesment.api.locations: + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "6004:80" + + + damageassesment.api.questions: + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "6005:80" + + + damageassesment.api.surveyresponses: + environment: + - ASPNETCORE_ENVIRONMENT=Development + - services__Answers=http://damageassesment.api.answers:80 + - services__Locations=http://damageassesment.api.locations:80 + - services__Questions=http://damageassesment.api.questions:80 + - services__Employees=http://damageassesment.api.employees:80 + - services__Attachments=http://damageassesment.api.attachments:80 + - services__Surveys=http://damageassesment.api.survey:80 + + ports: + - "6006:80" + + + damageassesment.api.surveys: + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "6007:80" + + + damageassesment.api.doculinks: + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "6009:80" + diff --git a/DamageAssesmentApi/docker-compose.yml b/DamageAssesmentApi/docker-compose.yml new file mode 100644 index 0000000..70b823e --- /dev/null +++ b/DamageAssesmentApi/docker-compose.yml @@ -0,0 +1,57 @@ +version: '3.4' + +services: + damageassesment.api.answers: + image: ${DOCKER_REGISTRY-}damageassesmentapianswers + build: + context: . + dockerfile: DamageAssesment.Api.Answers/Dockerfile + + damageassesment.api.attachments: + image: ${DOCKER_REGISTRY-}damageassesmentapiattachments + build: + context: . + dockerfile: DamageAssesment.Api.Attachments/Dockerfile + + + damageassesment.api.employees: + image: ${DOCKER_REGISTRY-}damageassesmentapiemployees + build: + context: . + dockerfile: DamageAssesment.Api.Employees/Dockerfile + + + damageassesment.api.locations: + image: ${DOCKER_REGISTRY-}damageassesmentapilocations + build: + context: . + dockerfile: DamageAssesment.Api.Locations/Dockerfile + + + damageassesment.api.questions: + image: ${DOCKER_REGISTRY-}damageassesmentapiquestions + build: + context: . + dockerfile: DamageAssesment.Api.Questions/Dockerfile + + + damageassesment.api.surveyresponses: + image: ${DOCKER_REGISTRY-}damageassesmentapisurveyresponses + build: + context: . + dockerfile: DamageAssesment.Api.SurveyResponses/Dockerfile + + + damageassesment.api.surveys: + image: ${DOCKER_REGISTRY-}damageassesmentapisurveys + build: + context: . + dockerfile: DamageAssesment.Api.Surveys/Dockerfile + + + damageassesment.api.doculinks: + image: ${DOCKER_REGISTRY-}damageassesmentapidoculinks + build: + context: . + dockerfile: DamageAssesment.Api.Documents/Dockerfile + diff --git a/DamageAssesmentApi/launchSettings.json b/DamageAssesmentApi/launchSettings.json new file mode 100644 index 0000000..4c96d28 --- /dev/null +++ b/DamageAssesmentApi/launchSettings.json @@ -0,0 +1,18 @@ +{ + "profiles": { + "Docker Compose": { + "commandName": "DockerCompose", + "commandVersion": "1.0", + "serviceActions": { + "damageassesment.api.answers": "StartDebugging", + "damageassesment.api.attachments": "StartDebugging", + "damageassesment.api.employees": "StartDebugging", + "damageassesment.api.locations": "StartDebugging", + "damageassesment.api.questions": "StartDebugging", + "damageassesment.api.surveyresponses": "StartDebugging", + "damageassesment.api.surveys": "StartDebugging", + "damageassesment.api.doculinks": "StartDebugging" + } + } + } +} \ No newline at end of file From eab826cf092d4aeb90915ccaa2971f05a5f660d2 Mon Sep 17 00:00:00 2001 From: Santhosh S <913341@dadeschools.net> Date: Mon, 25 Sep 2023 22:24:17 -0400 Subject: [PATCH 02/30] Resolved conflict with doculink port --- .../Properties/launchSettings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Properties/launchSettings.json b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Properties/launchSettings.json index e4e08ae..fcc4c27 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Properties/launchSettings.json +++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Properties/launchSettings.json @@ -14,7 +14,7 @@ "dotnetRunMessages": true, "launchBrowser": true, "launchUrl": "swagger", - "applicationUrl": "http://localhost:5133", + "applicationUrl": "http://localhost:5136", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } From fb5a69fa199e7b5ecff07098b1d59a410380eb55 Mon Sep 17 00:00:00 2001 From: Santhosh S <913341@dadeschools.net> Date: Mon, 25 Sep 2023 22:51:54 -0400 Subject: [PATCH 03/30] latest fixes sprint 4 --- .../DamageAssesment.Api.DocuLinks.Test.csproj | 4 --- .../Properties/launchSettings.json | 10 ++---- DamageAssesmentApi/DamageAssesment.sln | 31 ++++++------------- 3 files changed, 13 insertions(+), 32 deletions(-) diff --git a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DamageAssesment.Api.DocuLinks.Test.csproj b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DamageAssesment.Api.DocuLinks.Test.csproj index 6d6c72f..f1d57f9 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DamageAssesment.Api.DocuLinks.Test.csproj +++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DamageAssesment.Api.DocuLinks.Test.csproj @@ -20,8 +20,4 @@ - - - - diff --git a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Properties/launchSettings.json b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Properties/launchSettings.json index fe5dfd7..64344c2 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Properties/launchSettings.json +++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Properties/launchSettings.json @@ -1,18 +1,14 @@ { "profiles": { - "DamageAssesment.Api.Questions": { + "DamageAssesment.Api.Doculinks": { "commandName": "Project", "launchBrowser": true, "launchUrl": "swagger", -<<<<<<< HEAD:DamageAssesmentApi/DamageAssesment.Api.Documents/Properties/launchSettings.json -======= - "applicationUrl": "http://localhost:5136", ->>>>>>> dev:DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Properties/launchSettings.json "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, "dotnetRunMessages": true, - "applicationUrl": "http://localhost:5133" + "applicationUrl": "http://localhost:5136" }, "IIS Express": { "commandName": "IISExpress", @@ -37,7 +33,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:60754", + "applicationUrl": "http://localhost:14425", "sslPort": 0 } } diff --git a/DamageAssesmentApi/DamageAssesment.sln b/DamageAssesmentApi/DamageAssesment.sln index e55e3ae..b58afae 100644 --- a/DamageAssesmentApi/DamageAssesment.sln +++ b/DamageAssesmentApi/DamageAssesment.sln @@ -37,12 +37,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Employe EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Employees.Test", "DamageAssesment.Api.Employees.Test\DamageAssesment.Api.Employees.Test.csproj", "{D6BF9AE9-72FA-4726-A326-35A35D27FFB8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.DocuLinks", "DamageAssesment.Api.DocuLinks\DamageAssesment.Api.DocuLinks.csproj", "{D356A3C9-B275-4B1A-9B1B-F48600E85E4F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.DocuLinks.Test", "DamageAssesment.Api.DocuLinks.Test\DamageAssesment.Api.DocuLinks.Test.csproj", "{A7F17ED7-71D2-4FD0-87E5-D83415078FC0}" EndProject Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{0DD44934-6826-43C8-A438-320A05209967}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.DocuLinks", "DamageAssesment.Api.DocuLinks\DamageAssesment.Api.DocuLinks.csproj", "{1D04C061-3736-46D5-8F49-C8DE33AF4632}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -105,29 +105,18 @@ Global {D6BF9AE9-72FA-4726-A326-35A35D27FFB8}.Debug|Any CPU.Build.0 = Debug|Any CPU {D6BF9AE9-72FA-4726-A326-35A35D27FFB8}.Release|Any CPU.ActiveCfg = Release|Any CPU {D6BF9AE9-72FA-4726-A326-35A35D27FFB8}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD - {977C1053-9D63-4153-B61B-C3D2F1010F9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {977C1053-9D63-4153-B61B-C3D2F1010F9F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {977C1053-9D63-4153-B61B-C3D2F1010F9F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {977C1053-9D63-4153-B61B-C3D2F1010F9F}.Release|Any CPU.Build.0 = Release|Any CPU - {884BA4AC-9170-49B1-BD6B-850B350C95C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {884BA4AC-9170-49B1-BD6B-850B350C95C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {884BA4AC-9170-49B1-BD6B-850B350C95C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {884BA4AC-9170-49B1-BD6B-850B350C95C0}.Release|Any CPU.Build.0 = Release|Any CPU - {0DD44934-6826-43C8-A438-320A05209967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0DD44934-6826-43C8-A438-320A05209967}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0DD44934-6826-43C8-A438-320A05209967}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0DD44934-6826-43C8-A438-320A05209967}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {D356A3C9-B275-4B1A-9B1B-F48600E85E4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D356A3C9-B275-4B1A-9B1B-F48600E85E4F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D356A3C9-B275-4B1A-9B1B-F48600E85E4F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D356A3C9-B275-4B1A-9B1B-F48600E85E4F}.Release|Any CPU.Build.0 = Release|Any CPU {A7F17ED7-71D2-4FD0-87E5-D83415078FC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A7F17ED7-71D2-4FD0-87E5-D83415078FC0}.Debug|Any CPU.Build.0 = Debug|Any CPU {A7F17ED7-71D2-4FD0-87E5-D83415078FC0}.Release|Any CPU.ActiveCfg = Release|Any CPU {A7F17ED7-71D2-4FD0-87E5-D83415078FC0}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> dev + {0DD44934-6826-43C8-A438-320A05209967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0DD44934-6826-43C8-A438-320A05209967}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0DD44934-6826-43C8-A438-320A05209967}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0DD44934-6826-43C8-A438-320A05209967}.Release|Any CPU.Build.0 = Release|Any CPU + {1D04C061-3736-46D5-8F49-C8DE33AF4632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1D04C061-3736-46D5-8F49-C8DE33AF4632}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1D04C061-3736-46D5-8F49-C8DE33AF4632}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1D04C061-3736-46D5-8F49-C8DE33AF4632}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 86f4eebe72219967be85876147d89b4d374a403f Mon Sep 17 00:00:00 2001 From: Santhosh Nair <913441@dadeschools.net> Date: Tue, 26 Sep 2023 03:11:36 +0000 Subject: [PATCH 04/30] Update docker-compose.yml for Azure Pipelines --- DamageAssesmentApi/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DamageAssesmentApi/docker-compose.yml b/DamageAssesmentApi/docker-compose.yml index 70b823e..ae58eb6 100644 --- a/DamageAssesmentApi/docker-compose.yml +++ b/DamageAssesmentApi/docker-compose.yml @@ -53,5 +53,5 @@ services: image: ${DOCKER_REGISTRY-}damageassesmentapidoculinks build: context: . - dockerfile: DamageAssesment.Api.Documents/Dockerfile + dockerfile: DamageAssesment.Api.Doculinks/Dockerfile From 947efebdf358baeb1b33a3510e01c08a2b40b53d Mon Sep 17 00:00:00 2001 From: Santhosh Nair <913441@dadeschools.net> Date: Tue, 26 Sep 2023 03:15:19 +0000 Subject: [PATCH 05/30] Update docker-compose.yml for Azure Pipelines --- DamageAssesmentApi/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DamageAssesmentApi/docker-compose.yml b/DamageAssesmentApi/docker-compose.yml index ae58eb6..cec6504 100644 --- a/DamageAssesmentApi/docker-compose.yml +++ b/DamageAssesmentApi/docker-compose.yml @@ -53,5 +53,5 @@ services: image: ${DOCKER_REGISTRY-}damageassesmentapidoculinks build: context: . - dockerfile: DamageAssesment.Api.Doculinks/Dockerfile + dockerfile: DamageAssesment.Api.DocuLinks/Dockerfile From 7a59d300d46e06133bb04d4e08340b67c8b7b772 Mon Sep 17 00:00:00 2001 From: Santhosh S <913341@dadeschools.net> Date: Mon, 25 Sep 2023 23:26:54 -0400 Subject: [PATCH 06/30] Response project name conflict --- .../DamageAssesment.Api.SurveyResponses/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Dockerfile b/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Dockerfile index 0001073..6f34876 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Dockerfile +++ b/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Dockerfile @@ -6,16 +6,16 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["DamageAssesment.Api.SurveyResponses/DamageAssesment.Api.SurveyResponses.csproj", "DamageAssesment.Api.SurveyResponses/"] -RUN dotnet restore "DamageAssesment.Api.SurveyResponses/DamageAssesment.Api.SurveyResponses.csproj" +COPY ["DamageAssesment.Api.SurveyResponses/DamageAssesment.Api.Responses.csproj", "DamageAssesment.Api.SurveyResponses/"] +RUN dotnet restore "DamageAssesment.Api.SurveyResponses/DamageAssesment.Api.Responses.csproj" COPY . . WORKDIR "/src/DamageAssesment.Api.SurveyResponses" RUN dotnet build "DamageAssesment.Api.SurveyResponses.csproj" -c Release -o /app/build FROM build AS publish -RUN dotnet publish "DamageAssesment.Api.SurveyResponses.csproj" -c Release -o /app/publish /p:UseAppHost=false +RUN dotnet publish "DamageAssesment.Api.Responses.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "DamageAssesment.Api.SurveyResponses.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "DamageAssesment.Api.Responses.dll"] \ No newline at end of file From 49d809bbfff2da6690251f5b436e342da8340ef2 Mon Sep 17 00:00:00 2001 From: Santhosh S <913341@dadeschools.net> Date: Mon, 25 Sep 2023 23:34:52 -0400 Subject: [PATCH 07/30] Update docker for Responses --- .../DamageAssesment.Api.SurveyResponses/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Dockerfile b/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Dockerfile index 6f34876..2f736aa 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Dockerfile +++ b/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Dockerfile @@ -10,7 +10,7 @@ COPY ["DamageAssesment.Api.SurveyResponses/DamageAssesment.Api.Responses.csproj" RUN dotnet restore "DamageAssesment.Api.SurveyResponses/DamageAssesment.Api.Responses.csproj" COPY . . WORKDIR "/src/DamageAssesment.Api.SurveyResponses" -RUN dotnet build "DamageAssesment.Api.SurveyResponses.csproj" -c Release -o /app/build +RUN dotnet build "DamageAssesment.Api.Responses.csproj" -c Release -o /app/build FROM build AS publish RUN dotnet publish "DamageAssesment.Api.Responses.csproj" -c Release -o /app/publish /p:UseAppHost=false From 31eeb2b63dd8b15468e0e4e1a451f7f6d2988854 Mon Sep 17 00:00:00 2001 From: Santhosh S <913341@dadeschools.net> Date: Mon, 25 Sep 2023 23:38:20 -0400 Subject: [PATCH 08/30] Updated Doculink Docker --- DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Dockerfile b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Dockerfile index 74ec8b7..c03dbcd 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Dockerfile +++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Dockerfile @@ -6,10 +6,10 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["DamageAssesment.Api.Documents/DamageAssesment.Api.DocuLinks.csproj", "DamageAssesment.Api.Documents/"] -RUN dotnet restore "DamageAssesment.Api.Documents/DamageAssesment.Api.DocuLinks.csproj" +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.Documents" +WORKDIR "/src/DamageAssesment.Api.DocuLinks" RUN dotnet build "DamageAssesment.Api.DocuLinks.csproj" -c Release -o /app/build FROM build AS publish From 7f82b10bbc0cba6e7d41f225f215f48c100b73dc Mon Sep 17 00:00:00 2001 From: Santhosh S <913341@dadeschools.net> Date: Wed, 27 Sep 2023 22:02:07 -0400 Subject: [PATCH 09/30] added docker-compose for service cluster --- DamageAssesmentApi/docker-compose.asf.yml | 72 +++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 DamageAssesmentApi/docker-compose.asf.yml diff --git a/DamageAssesmentApi/docker-compose.asf.yml b/DamageAssesmentApi/docker-compose.asf.yml new file mode 100644 index 0000000..cf60fca --- /dev/null +++ b/DamageAssesmentApi/docker-compose.asf.yml @@ -0,0 +1,72 @@ +version: '3.4' + +services: + answers: + image: santhoshsnair/damageassesmentapianswers:latest + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "80/http" + + attachments: + image: santhoshsnair/damageassesmentapiattachments:latest + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "80/http" + + + employees: + image: santhoshsnair/damageassesmentapiemployees:latest + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "80/http" + + + locations: + image: santhoshsnair/damageassesmentapilocations:latest + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "80/http" + + + questions: + image: santhoshsnair/damageassesmentapiquestions:latest + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "80/http" + + + responses: + image: santhoshsnair/damageassesmentapisurveyresponses:latest + environment: + - ASPNETCORE_ENVIRONMENT=Development + - services__Answers=http://10.0.0.4:19081/dasapp/answers/ + - services__Locations=http://10.0.0.4:19081/dasapp/locations/ + - services__Questions=http://10.0.0.4:19081/dasapp/questions/ + - services__Employees=http://10.0.0.4:19081/dasapp/employees/ + - services__Attachments=http://10.0.0.4:19081/dasapp/attachments/ + - services__Surveys=http://10.0.0.4:19081/dasapp/survey/ + + ports: + - "6006:80" + + + surveys: + image: santhoshsnair/damageassesmentapisurveys:latest + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "80/http" + + + doculinks: + image: santhoshsnair/damageassesmentapidoculinks:latest + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "80/http" + From 8744761b008f4a5d98a8484a4e8ad8229440ded0 Mon Sep 17 00:00:00 2001 From: Santhosh S <913341@dadeschools.net> Date: Fri, 29 Sep 2023 01:11:19 -0400 Subject: [PATCH 10/30] Proxy Port update for AzureFabricsService test --- DamageAssesmentApi/docker-compose.asf.yml | 12 ++++++------ DamageAssesmentApi/docker-compose.dcproj | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/DamageAssesmentApi/docker-compose.asf.yml b/DamageAssesmentApi/docker-compose.asf.yml index cf60fca..cfdf8ec 100644 --- a/DamageAssesmentApi/docker-compose.asf.yml +++ b/DamageAssesmentApi/docker-compose.asf.yml @@ -44,12 +44,12 @@ services: image: santhoshsnair/damageassesmentapisurveyresponses:latest environment: - ASPNETCORE_ENVIRONMENT=Development - - services__Answers=http://10.0.0.4:19081/dasapp/answers/ - - services__Locations=http://10.0.0.4:19081/dasapp/locations/ - - services__Questions=http://10.0.0.4:19081/dasapp/questions/ - - services__Employees=http://10.0.0.4:19081/dasapp/employees/ - - services__Attachments=http://10.0.0.4:19081/dasapp/attachments/ - - services__Surveys=http://10.0.0.4:19081/dasapp/survey/ + - services__Answers=http://10.0.0.4:19080/dasapp/answers/ + - services__Locations=http://10.0.0.4:19080/dasapp/locations/ + - services__Questions=http://10.0.0.4:19080/dasapp/questions/ + - services__Employees=http://10.0.0.4:19080/dasapp/employees/ + - services__Attachments=http://10.0.0.4:19080/dasapp/attachments/ + - services__Surveys=http://10.0.0.4:19080/dasapp/survey/ ports: - "6006:80" diff --git a/DamageAssesmentApi/docker-compose.dcproj b/DamageAssesmentApi/docker-compose.dcproj index 98c753f..54bf0c1 100644 --- a/DamageAssesmentApi/docker-compose.dcproj +++ b/DamageAssesmentApi/docker-compose.dcproj @@ -9,6 +9,7 @@ damageassesment.api.answers + docker-compose.yml From c5f3473ccbea697445aac996d93c8e5035b85837 Mon Sep 17 00:00:00 2001 From: Santhosh S <913341@dadeschools.net> Date: Fri, 29 Sep 2023 10:11:53 -0400 Subject: [PATCH 11/30] port change for cluster --- DamageAssesmentApi/docker-compose.asf.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/DamageAssesmentApi/docker-compose.asf.yml b/DamageAssesmentApi/docker-compose.asf.yml index cfdf8ec..b7674c6 100644 --- a/DamageAssesmentApi/docker-compose.asf.yml +++ b/DamageAssesmentApi/docker-compose.asf.yml @@ -6,14 +6,14 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80/http" + - "80:80" attachments: image: santhoshsnair/damageassesmentapiattachments:latest environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80/http" + - "80:80" employees: @@ -21,7 +21,7 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80/http" + - "80:80" locations: @@ -29,7 +29,7 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80/http" + - "80:80" questions: @@ -37,7 +37,7 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80/http" + - "80:80" responses: @@ -60,7 +60,7 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80/http" + - "80:80" doculinks: @@ -68,5 +68,5 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80/http" + - "80:80" From 17b4177a26b5bf86ae07c35feb86d4eab7dfda0b Mon Sep 17 00:00:00 2001 From: Santhosh S <913341@dadeschools.net> Date: Fri, 29 Sep 2023 11:08:11 -0400 Subject: [PATCH 12/30] Proxy Port update for AzureFabricsService 6006 changed to doculink --- DamageAssesmentApi/docker-compose.asf.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DamageAssesmentApi/docker-compose.asf.yml b/DamageAssesmentApi/docker-compose.asf.yml index b7674c6..9afa58a 100644 --- a/DamageAssesmentApi/docker-compose.asf.yml +++ b/DamageAssesmentApi/docker-compose.asf.yml @@ -52,7 +52,7 @@ services: - services__Surveys=http://10.0.0.4:19080/dasapp/survey/ ports: - - "6006:80" + - "80:80" surveys: @@ -68,5 +68,5 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80:80" + - "6006:80" From f5c2b2da4448fe3eef3d53609299b10f528f0ff2 Mon Sep 17 00:00:00 2001 From: Santhosh S <913341@dadeschools.net> Date: Fri, 29 Sep 2023 11:38:43 -0400 Subject: [PATCH 13/30] Proxy Port update for AzureFabricsService test reverted --- DamageAssesmentApi/docker-compose.asf.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DamageAssesmentApi/docker-compose.asf.yml b/DamageAssesmentApi/docker-compose.asf.yml index 9afa58a..b7674c6 100644 --- a/DamageAssesmentApi/docker-compose.asf.yml +++ b/DamageAssesmentApi/docker-compose.asf.yml @@ -52,7 +52,7 @@ services: - services__Surveys=http://10.0.0.4:19080/dasapp/survey/ ports: - - "80:80" + - "6006:80" surveys: @@ -68,5 +68,5 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "6006:80" + - "80:80" From 82c768a0d97505b20d0f26561b9b51a80663727d Mon Sep 17 00:00:00 2001 From: Santhosh S <913341@dadeschools.net> Date: Sun, 1 Oct 2023 21:15:42 -0400 Subject: [PATCH 14/30] change of port for testing socker-compose.asf.yml --- DamageAssesmentApi/docker-compose.asf.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/DamageAssesmentApi/docker-compose.asf.yml b/DamageAssesmentApi/docker-compose.asf.yml index b7674c6..cfdf8ec 100644 --- a/DamageAssesmentApi/docker-compose.asf.yml +++ b/DamageAssesmentApi/docker-compose.asf.yml @@ -6,14 +6,14 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80:80" + - "80/http" attachments: image: santhoshsnair/damageassesmentapiattachments:latest environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80:80" + - "80/http" employees: @@ -21,7 +21,7 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80:80" + - "80/http" locations: @@ -29,7 +29,7 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80:80" + - "80/http" questions: @@ -37,7 +37,7 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80:80" + - "80/http" responses: @@ -60,7 +60,7 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80:80" + - "80/http" doculinks: @@ -68,5 +68,5 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80:80" + - "80/http" From 8e3169104473398d7955e67fe005766110e213fc Mon Sep 17 00:00:00 2001 From: Santhosh S <913341@dadeschools.net> Date: Sun, 1 Oct 2023 23:20:04 -0400 Subject: [PATCH 15/30] change of port for testing socker-compose.asf.yml --- DamageAssesmentApi/docker-compose.asf.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/DamageAssesmentApi/docker-compose.asf.yml b/DamageAssesmentApi/docker-compose.asf.yml index cfdf8ec..cf60fca 100644 --- a/DamageAssesmentApi/docker-compose.asf.yml +++ b/DamageAssesmentApi/docker-compose.asf.yml @@ -44,12 +44,12 @@ services: image: santhoshsnair/damageassesmentapisurveyresponses:latest environment: - ASPNETCORE_ENVIRONMENT=Development - - services__Answers=http://10.0.0.4:19080/dasapp/answers/ - - services__Locations=http://10.0.0.4:19080/dasapp/locations/ - - services__Questions=http://10.0.0.4:19080/dasapp/questions/ - - services__Employees=http://10.0.0.4:19080/dasapp/employees/ - - services__Attachments=http://10.0.0.4:19080/dasapp/attachments/ - - services__Surveys=http://10.0.0.4:19080/dasapp/survey/ + - services__Answers=http://10.0.0.4:19081/dasapp/answers/ + - services__Locations=http://10.0.0.4:19081/dasapp/locations/ + - services__Questions=http://10.0.0.4:19081/dasapp/questions/ + - services__Employees=http://10.0.0.4:19081/dasapp/employees/ + - services__Attachments=http://10.0.0.4:19081/dasapp/attachments/ + - services__Surveys=http://10.0.0.4:19081/dasapp/survey/ ports: - "6006:80" From fa0ec795c1607979887f0bafb3128ab3ea2dc248 Mon Sep 17 00:00:00 2001 From: Santhosh S <913341@dadeschools.net> Date: Wed, 4 Oct 2023 00:07:33 -0400 Subject: [PATCH 16/30] Employee uri to employee --- .../Controllers/EmployeesController.cs | 10 +-- .../Providers/SurveyResponsesProvider.cs | 2 +- DamageAssesmentApi/docker-compose.asf.yml | 24 ++++-- DamageAssesmentApi/docker-compose.dcproj | 1 + DamageAssesmentApi/docker-compose.sql.yml | 78 +++++++++++++++++++ 5 files changed, 101 insertions(+), 14 deletions(-) create mode 100644 DamageAssesmentApi/docker-compose.sql.yml diff --git a/DamageAssesmentApi/DamageAssesment.Api.Employees/Controllers/EmployeesController.cs b/DamageAssesmentApi/DamageAssesment.Api.Employees/Controllers/EmployeesController.cs index f5e0d88..05901c5 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Employees/Controllers/EmployeesController.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Employees/Controllers/EmployeesController.cs @@ -19,7 +19,7 @@ namespace DamageAssesment.Api.Employees.Controllers /// GET request for retrieving employees. /// - [HttpGet("Employees")] + [HttpGet("employees")] public async Task GetEmployeesAsync() { @@ -36,7 +36,7 @@ namespace DamageAssesment.Api.Employees.Controllers /// GET request for retrieving an employee by ID. /// - [HttpGet("Employees/{id}")] + [HttpGet("employees/{id}")] public async Task GetEmployeeByIdAsync(int id) { @@ -53,7 +53,7 @@ namespace DamageAssesment.Api.Employees.Controllers /// PUT request for updating an existing employee. /// /// The updated employee object. - [HttpPut("Employees/{id}")] + [HttpPut("employees/{id}")] public async Task UpdateEmployee(int id, Models.Employee Employee) { if (Employee != null) @@ -75,7 +75,7 @@ namespace DamageAssesment.Api.Employees.Controllers /// POST request for creating a new employee. /// /// The employee information for creating a new employee. - [HttpPost("Employees")] + [HttpPost("employees")] public async Task CreateEmployee(Models.Employee Employee) { if (Employee != null) @@ -93,7 +93,7 @@ namespace DamageAssesment.Api.Employees.Controllers /// DELETE request for deleting an existing employee. /// /// The ID of the employee to be deleted. - [HttpDelete("Employees/{id}")] + [HttpDelete("employees/{id}")] public async Task DeleteEmployee(int id) { var result = await this.EmployeeProvider.DeleteEmployeeAsync(id); diff --git a/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Providers/SurveyResponsesProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Providers/SurveyResponsesProvider.cs index 03eada1..c46ecc4 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Providers/SurveyResponsesProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Providers/SurveyResponsesProvider.cs @@ -31,7 +31,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers this.questionServiceProvider = questionServiceProvider; this.surveyServiceProvider = surveyServiceProvider; this.mapper = mapper; - // seedData(); + seedData(); } private void seedData() diff --git a/DamageAssesmentApi/docker-compose.asf.yml b/DamageAssesmentApi/docker-compose.asf.yml index cf60fca..2a5587c 100644 --- a/DamageAssesmentApi/docker-compose.asf.yml +++ b/DamageAssesmentApi/docker-compose.asf.yml @@ -6,14 +6,14 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80/http" + - "6001:80" attachments: image: santhoshsnair/damageassesmentapiattachments:latest environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80/http" + - "6002:80" employees: @@ -21,7 +21,7 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80/http" + - "6003:80" locations: @@ -29,7 +29,7 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80/http" + - "6004:80" questions: @@ -37,7 +37,7 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80/http" + - "6005:80" responses: @@ -60,7 +60,7 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80/http" + - "6007:80" doculinks: @@ -68,5 +68,13 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development ports: - - "80/http" - + - "6009:80" + sqlserver: + image: mcr.microsoft.com/mssql/server:2019-latest + environment: + - SA_PASSWORD=your_password + - ACCEPT_EULA=Y + ports: + - "1433:1433" + volumes: + - ./sql_data:/var/opt/mssql/data \ No newline at end of file diff --git a/DamageAssesmentApi/docker-compose.dcproj b/DamageAssesmentApi/docker-compose.dcproj index 54bf0c1..178f3d6 100644 --- a/DamageAssesmentApi/docker-compose.dcproj +++ b/DamageAssesmentApi/docker-compose.dcproj @@ -9,6 +9,7 @@ damageassesment.api.answers + docker-compose.yml diff --git a/DamageAssesmentApi/docker-compose.sql.yml b/DamageAssesmentApi/docker-compose.sql.yml new file mode 100644 index 0000000..e029b38 --- /dev/null +++ b/DamageAssesmentApi/docker-compose.sql.yml @@ -0,0 +1,78 @@ +version: '3.4' + +services: + answers: + image: santhoshsnair/damageassesmentapianswers:latest + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "6001:80" + + attachments: + image: santhoshsnair/damageassesmentapiattachments:latest + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "6002:80" + + + employees: + image: santhoshsnair/damageassesmentapiemployees:latest + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "6003:80" + + + locations: + image: santhoshsnair/damageassesmentapilocations:latest + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "6004:80" + + + questions: + image: santhoshsnair/damageassesmentapiquestions:latest + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "6005:80" + + + responses: + image: santhoshsnair/damageassesmentapisurveyresponses:latest + environment: + - ASPNETCORE_ENVIRONMENT=Development + - services__Answers=http://10.0.0.4:19081/dasapp/answers/ + - services__Locations=http://10.0.0.4:19081/dasapp/locations/ + - services__Questions=http://10.0.0.4:19081/dasapp/questions/ + - services__Employees=http://10.0.0.4:19081/dasapp/employees/ + - services__Attachments=http://10.0.0.4:19081/dasapp/attachments/ + - services__Surveys=http://10.0.0.4:19081/dasapp/survey/ + + ports: + - "6006:80" + + + surveys: + image: santhoshsnair/damageassesmentapisurveys:latest + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "6007:80" + + + doculinks: + image: santhoshsnair/damageassesmentapidoculinks:latest + environment: + - ASPNETCORE_ENVIRONMENT=Development + ports: + - "6009:80" + sqlserver: + image: mcr.microsoft.com/mssql/server:2019-latest + environment: + - SA_PASSWORD=your_password + - ACCEPT_EULA=Y + ports: + - "1433:1433" From 30751bc49113247b53a655ab9f5b57a2967ccb8a Mon Sep 17 00:00:00 2001 From: Santhosh S <913341@dadeschools.net> Date: Wed, 4 Oct 2023 00:28:04 -0400 Subject: [PATCH 17/30] fix doculink test reference --- .../DamageAssesment.Api.DocuLinks.Test.csproj | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DamageAssesment.Api.DocuLinks.Test.csproj b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DamageAssesment.Api.DocuLinks.Test.csproj index f1d57f9..99e222c 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DamageAssesment.Api.DocuLinks.Test.csproj +++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DamageAssesment.Api.DocuLinks.Test.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -20,4 +20,8 @@ + + + + From 6ae57c9818c9710fab8a2d564aac1f6603aa417e Mon Sep 17 00:00:00 2001 From: Santhosh S <913341@dadeschools.net> Date: Wed, 4 Oct 2023 18:45:51 -0400 Subject: [PATCH 18/30] Fix for Namespace SurveyResponses --- .../MockData.cs | 4 +- .../SurveyResponsesServiceTest.cs | 46 +++++++++---------- .../Controllers/SurveyResponsesController.cs | 6 +-- .../Db/SurveyResponse.cs | 2 +- .../Db/SurveyResponseDbContext.cs | 2 +- .../DamageAssesment.Api.Responses/Dockerfile | 6 +-- .../Interfaces/IAnswerServiceProvider.cs | 4 +- .../Interfaces/IAttachmentServiceProvider.cs | 4 +- .../Interfaces/IEmployeeServiceProvider.cs | 4 +- .../Interfaces/IHttpUtil.cs | 4 +- .../Interfaces/ILocationServiceProvider.cs | 4 +- .../Interfaces/IQuestionServiceProvider.cs | 4 +- .../Interfaces/IRegionServiceProvider.cs | 4 +- .../Interfaces/ISurveyServiceProvider.cs | 4 +- .../Interfaces/ISurveysResponse.cs | 4 +- .../Models/Answer.cs | 2 +- .../Models/AnswerRequest.cs | 2 +- .../Models/Attachment.cs | 2 +- .../Models/AttachmentInfo.cs | 2 +- .../Models/Employee.cs | 2 +- .../Models/Location.cs | 2 +- .../Models/Question.cs | 2 +- .../Models/Region.cs | 2 +- .../Models/Request.cs | 2 +- .../Models/Survey.cs | 2 +- .../Models/SurveyQuestion.cs | 2 +- .../Models/SurveyResponse.cs | 2 +- .../Models/SurveyTranslation.cs | 2 +- .../Profiles/SurveyResponsesProvider.cs | 2 +- .../DamageAssesment.Api.Responses/Program.cs | 10 ++-- .../Providers/SurveyResponsesProvider.cs | 18 ++++---- .../Services/AnswerServiceProvider.cs | 6 +-- .../Services/AttachmentServiceProvider.cs | 6 +-- .../Services/EmployeeServiceProvider.cs | 6 +-- .../Services/HttpUtil.cs | 4 +- .../Services/LocationServiceProvider.cs | 6 +-- .../Services/QuestionServiceProvider.cs | 6 +-- .../Services/RegionServiceProvider.cs | 6 +-- .../Services/ServiceProviderBase.cs | 4 +- .../Services/SurveyServiceProvider.cs | 6 +-- .../docker-compose.override.yml | 4 +- DamageAssesmentApi/docker-compose.yml | 17 +++++-- DamageAssesmentApi/launchSettings.json | 3 +- 43 files changed, 121 insertions(+), 111 deletions(-) diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses.Test/MockData.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses.Test/MockData.cs index 5be421f..c7a52de 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses.Test/MockData.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses.Test/MockData.cs @@ -1,9 +1,9 @@  -using DamageAssesment.Api.SurveyResponses.Models; +using DamageAssesment.Api.Responses.Models; using System.Collections.Generic; using System.Text; -namespace DamageAssesment.Api.SurveyResponses.Test +namespace DamageAssesment.Api.Responses.Test { public class MockData { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses.Test/SurveyResponsesServiceTest.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses.Test/SurveyResponsesServiceTest.cs index c081e2d..48cec58 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses.Test/SurveyResponsesServiceTest.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses.Test/SurveyResponsesServiceTest.cs @@ -1,7 +1,7 @@ -using DamageAssesment.Api.SurveyResponses.Controllers; -using DamageAssesment.Api.SurveyResponses.Interfaces; -using DamageAssesment.Api.SurveyResponses.Models; -using DamageAssesment.Api.SurveyResponses.Test; +using DamageAssesment.Api.Responses.Controllers; +using DamageAssesment.Api.Responses.Interfaces; +using DamageAssesment.Api.Responses.Models; +using DamageAssesment.Api.Responses.Test; using Microsoft.AspNetCore.Mvc; using Moq; using Xunit; @@ -17,7 +17,7 @@ namespace DamageAssesment.SurveyResponses.Test mockSurveyResponseService = new Mock(); } - [Fact(DisplayName = "Get SurveyResponses - Ok case")] + [Fact(DisplayName = "Get Responses - Ok case")] public async Task GetSurveyResponsesAsync_ShouldReturnStatusCode200() { SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); @@ -28,7 +28,7 @@ namespace DamageAssesment.SurveyResponses.Test Assert.Equal(200, result.StatusCode); } - [Fact(DisplayName = "Get SurveyResponses - BadRequest case")] + [Fact(DisplayName = "Get Responses - BadRequest case")] public async Task GetSurveyResponsesAsync_ShouldReturnStatusCode204() { var mockResponse = await MockData.getResponse(); @@ -38,7 +38,7 @@ namespace DamageAssesment.SurveyResponses.Test Assert.Equal(400, result.StatusCode); } - [Fact(DisplayName = "Get SurveyResponses by surveyId - Ok case")] + [Fact(DisplayName = "Get Responses by surveyId - Ok case")] public async Task GetSurveyResponsesBySurveyAsync_ShouldReturnStatusCode200() { SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); @@ -49,7 +49,7 @@ namespace DamageAssesment.SurveyResponses.Test Assert.Equal(200, result.StatusCode); } - [Fact(DisplayName = "Get SurveyResponses by surveyId - NoContent case")] + [Fact(DisplayName = "Get Responses by surveyId - NoContent case")] public async Task GetSurveyResponsesBySurveyAsync_ShouldReturnStatusCode204() { var mockResponse = await MockData.getResponse(); @@ -62,7 +62,7 @@ namespace DamageAssesment.SurveyResponses.Test - [Fact(DisplayName = "Get SurveyResponses by surveyId and locationId - Ok case")] + [Fact(DisplayName = "Get Responses by surveyId and locationId - Ok case")] public async Task GetSurveyResponsesBySurveyLocationAsync_ShouldReturnStatusCode200() { SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); @@ -73,7 +73,7 @@ namespace DamageAssesment.SurveyResponses.Test Assert.Equal(200, result.StatusCode); } - [Fact(DisplayName = "Get SurveyResponses by surveyId and locationId - NoContent case")] + [Fact(DisplayName = "Get Responses by surveyId and locationId - NoContent case")] public async Task GetSurveyResponsesBySurveyLocationAsync_ShouldReturnStatusCode204() { var mockResponse = await MockData.getResponse(); @@ -83,7 +83,7 @@ namespace DamageAssesment.SurveyResponses.Test Assert.Equal(204, result.StatusCode); } - [Fact(DisplayName = "Get SurveyResponses by surveyId and QuestionId and Answer - Ok case")] + [Fact(DisplayName = "Get Responses by surveyId and QuestionId and Answer - Ok case")] public async Task GetSurveyResponsesBySurveyQuestionAnswerAsync_ShouldReturnStatusCode200() { SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); @@ -94,7 +94,7 @@ namespace DamageAssesment.SurveyResponses.Test Assert.Equal(200, result.StatusCode); } - [Fact(DisplayName = "Get SurveyResponses by surveyId and QuestionId and Answer - NoContent case")] + [Fact(DisplayName = "Get Responses by surveyId and QuestionId and Answer - NoContent case")] public async Task GetSurveyResponsesBySurveyQuestionAnswerAsync_ShouldReturnStatusCode204() { var mockResponse = await MockData.getResponse(); @@ -105,7 +105,7 @@ namespace DamageAssesment.SurveyResponses.Test } - [Fact(DisplayName = "Get SurveyResponses by region and surveyId - Ok case")] + [Fact(DisplayName = "Get Responses by region and surveyId - Ok case")] public async Task GetSurveyResponsesByRegionSurveyAsync_ShouldReturnStatusCode200() { SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); @@ -116,7 +116,7 @@ namespace DamageAssesment.SurveyResponses.Test Assert.Equal(200, result.StatusCode); } - [Fact(DisplayName = "Get SurveyResponses by region and surveyId - NoContent Case")] + [Fact(DisplayName = "Get Responses by region and surveyId - NoContent Case")] public async Task GetSurveyResponsesByRegionSurveyAsync_ShouldReturnStatusCode204() { var mockResponse = await MockData.getResponse(); @@ -126,7 +126,7 @@ namespace DamageAssesment.SurveyResponses.Test Assert.Equal(204, result.StatusCode); } - [Fact(DisplayName = "Get SurveyResponses by maintenanceCenter and surveyId - Ok case")] + [Fact(DisplayName = "Get Responses by maintenanceCenter and surveyId - Ok case")] public async Task GetSurveyResponsesMaintenanceCenterSurveyAsync_ShouldReturnStatusCode200() { SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); @@ -137,7 +137,7 @@ namespace DamageAssesment.SurveyResponses.Test Assert.Equal(200, result.StatusCode); } - [Fact(DisplayName = "Get SurveyResponses by maintenanceCenter and surveyId - No Content Case")] + [Fact(DisplayName = "Get Responses by maintenanceCenter and surveyId - No Content Case")] public async Task GetSurveyResponsesMaintenanceCenterSurveyAsync_ShouldReturnStatusCode204() { var mockResponse = await MockData.getResponse(); @@ -158,7 +158,7 @@ namespace DamageAssesment.SurveyResponses.Test Assert.Equal(200, result.StatusCode); } - [Fact(DisplayName = "Get SurveyResponses by maintenanceCenter and surveyId - NoContent Case")] + [Fact(DisplayName = "Get Responses by maintenanceCenter and surveyId - NoContent Case")] public async Task GetSurveyResponsesByResponseIdyAsync_ShouldReturnStatusCode204() { var mockResponse = await MockData.getResponse(); @@ -169,7 +169,7 @@ namespace DamageAssesment.SurveyResponses.Test } - [Fact(DisplayName = "Post SurveyResponses - Ok case")] + [Fact(DisplayName = "Post Responses - Ok case")] public async Task PostSurveyAsync_ShouldReturnStatusCode200() { SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); @@ -180,7 +180,7 @@ namespace DamageAssesment.SurveyResponses.Test Assert.Equal(200, result.StatusCode); } - [Fact(DisplayName = "Post SurveyResponses - BadRequest case")] + [Fact(DisplayName = "Post Responses - BadRequest case")] public async Task PostSurveyAsync_ShouldReturnStatusCode400() { SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); @@ -191,7 +191,7 @@ namespace DamageAssesment.SurveyResponses.Test Assert.Equal(400, result.StatusCode); } - [Fact(DisplayName = "Put SurveyResponses - Ok case")] + [Fact(DisplayName = "Put Responses - Ok case")] public async Task PutSurveyAsync_ShouldReturnStatusCode200() { SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); @@ -202,7 +202,7 @@ namespace DamageAssesment.SurveyResponses.Test Assert.Equal(200, result.StatusCode); } - [Fact(DisplayName = "Put SurveyResponses - BadRequest case")] + [Fact(DisplayName = "Put Responses - BadRequest case")] public async Task PutSurveyAsync_ShouldReturnStatusCode404() { SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); @@ -213,7 +213,7 @@ namespace DamageAssesment.SurveyResponses.Test Assert.Equal(400, result.StatusCode); } - [Fact(DisplayName = "Delete SurveyResponses - Ok case")] + [Fact(DisplayName = "Delete Responses - Ok case")] public async Task DeleteSurveyAsync_ShouldReturnStatusCode200() { SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); @@ -224,7 +224,7 @@ namespace DamageAssesment.SurveyResponses.Test Assert.Equal(200, result.StatusCode); } - [Fact(DisplayName = "Delete SurveyResponses - NotFound case")] + [Fact(DisplayName = "Delete Responses - NotFound case")] public async Task DeleteSurveyAsync_ShouldReturnStatusCode404() { var mockResponse = await MockData.getResponse(); diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Controllers/SurveyResponsesController.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Controllers/SurveyResponsesController.cs index bf38838..d5f6192 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Controllers/SurveyResponsesController.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Controllers/SurveyResponsesController.cs @@ -1,8 +1,8 @@ -using DamageAssesment.Api.SurveyResponses.Interfaces; -using DamageAssesment.Api.SurveyResponses.Models; +using DamageAssesment.Api.Responses.Interfaces; +using DamageAssesment.Api.Responses.Models; using Microsoft.AspNetCore.Mvc; -namespace DamageAssesment.Api.SurveyResponses.Controllers +namespace DamageAssesment.Api.Responses.Controllers { [ApiController] public class SurveyResponsesController : ControllerBase diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Db/SurveyResponse.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Db/SurveyResponse.cs index 2169097..14704cb 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Db/SurveyResponse.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Db/SurveyResponse.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace DamageAssesment.Api.SurveyResponses.Db +namespace DamageAssesment.Api.Responses.Db { public class SurveyResponse { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Db/SurveyResponseDbContext.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Db/SurveyResponseDbContext.cs index 61726ad..c1fae2d 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Db/SurveyResponseDbContext.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Db/SurveyResponseDbContext.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore; -namespace DamageAssesment.Api.SurveyResponses.Db +namespace DamageAssesment.Api.Responses.Db { public class SurveyResponseDbContext:DbContext { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Dockerfile b/DamageAssesmentApi/DamageAssesment.Api.Responses/Dockerfile index 2f736aa..86ed050 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Dockerfile +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Dockerfile @@ -6,10 +6,10 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["DamageAssesment.Api.SurveyResponses/DamageAssesment.Api.Responses.csproj", "DamageAssesment.Api.SurveyResponses/"] -RUN dotnet restore "DamageAssesment.Api.SurveyResponses/DamageAssesment.Api.Responses.csproj" +COPY ["DamageAssesment.Api.Responses/DamageAssesment.Api.Responses.csproj", "DamageAssesment.Api.Responses/"] +RUN dotnet restore "DamageAssesment.Api.Responses/DamageAssesment.Api.Responses.csproj" COPY . . -WORKDIR "/src/DamageAssesment.Api.SurveyResponses" +WORKDIR "/src/DamageAssesment.Api.Responses" RUN dotnet build "DamageAssesment.Api.Responses.csproj" -c Release -o /app/build FROM build AS publish diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IAnswerServiceProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IAnswerServiceProvider.cs index e947659..43ba9a1 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IAnswerServiceProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IAnswerServiceProvider.cs @@ -1,6 +1,6 @@ -using DamageAssesment.Api.SurveyResponses.Models; +using DamageAssesment.Api.Responses.Models; -namespace DamageAssesment.Api.SurveyResponses.Interfaces +namespace DamageAssesment.Api.Responses.Interfaces { public interface IAnswerServiceProvider { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IAttachmentServiceProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IAttachmentServiceProvider.cs index a20c91c..7350071 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IAttachmentServiceProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IAttachmentServiceProvider.cs @@ -1,6 +1,6 @@ -using DamageAssesment.Api.SurveyResponses.Models; +using DamageAssesment.Api.Responses.Models; -namespace DamageAssesment.Api.SurveyResponses.Interfaces +namespace DamageAssesment.Api.Responses.Interfaces { public interface IAttachmentServiceProvider { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IEmployeeServiceProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IEmployeeServiceProvider.cs index 62031d5..ef9eb00 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IEmployeeServiceProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IEmployeeServiceProvider.cs @@ -1,6 +1,6 @@ -using DamageAssesment.Api.SurveyResponses.Models; +using DamageAssesment.Api.Responses.Models; -namespace DamageAssesment.Api.SurveyResponses.Interfaces +namespace DamageAssesment.Api.Responses.Interfaces { public interface IEmployeeServiceProvider { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IHttpUtil.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IHttpUtil.cs index e3f1e66..a8578e0 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IHttpUtil.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IHttpUtil.cs @@ -1,6 +1,6 @@ -using DamageAssesment.Api.SurveyResponses.Models; +using DamageAssesment.Api.Responses.Models; -namespace DamageAssesment.Api.SurveyResponses.Interfaces +namespace DamageAssesment.Api.Responses.Interfaces { public interface IHttpUtil { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/ILocationServiceProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/ILocationServiceProvider.cs index 75db3f1..75945cd 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/ILocationServiceProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/ILocationServiceProvider.cs @@ -1,6 +1,6 @@ -using DamageAssesment.Api.SurveyResponses.Models; +using DamageAssesment.Api.Responses.Models; -namespace DamageAssesment.Api.SurveyResponses.Interfaces +namespace DamageAssesment.Api.Responses.Interfaces { public interface ILocationServiceProvider { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IQuestionServiceProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IQuestionServiceProvider.cs index ab5f5ba..5c54e57 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IQuestionServiceProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IQuestionServiceProvider.cs @@ -1,6 +1,6 @@ -using DamageAssesment.Api.SurveyResponses.Models; +using DamageAssesment.Api.Responses.Models; -namespace DamageAssesment.Api.SurveyResponses.Interfaces +namespace DamageAssesment.Api.Responses.Interfaces { public interface IQuestionServiceProvider { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IRegionServiceProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IRegionServiceProvider.cs index 8aeb1f8..be3b1c3 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IRegionServiceProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IRegionServiceProvider.cs @@ -1,6 +1,6 @@ -using DamageAssesment.Api.SurveyResponses.Models; +using DamageAssesment.Api.Responses.Models; -namespace DamageAssesment.Api.SurveyResponses.Interfaces +namespace DamageAssesment.Api.Responses.Interfaces { public interface IRegionServiceProvider { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/ISurveyServiceProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/ISurveyServiceProvider.cs index 2b01d16..64252c9 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/ISurveyServiceProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/ISurveyServiceProvider.cs @@ -1,6 +1,6 @@ -using DamageAssesment.Api.SurveyResponses.Models; +using DamageAssesment.Api.Responses.Models; -namespace DamageAssesment.Api.SurveyResponses.Interfaces +namespace DamageAssesment.Api.Responses.Interfaces { public interface ISurveyServiceProvider { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/ISurveysResponse.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/ISurveysResponse.cs index 2bbab9a..dea50eb 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/ISurveysResponse.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/ISurveysResponse.cs @@ -1,7 +1,7 @@ -using DamageAssesment.Api.SurveyResponses.Models; +using DamageAssesment.Api.Responses.Models; using Microsoft.AspNetCore.Mvc; -namespace DamageAssesment.Api.SurveyResponses.Interfaces +namespace DamageAssesment.Api.Responses.Interfaces { public interface ISurveysResponse { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Answer.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Answer.cs index d607a2f..d507630 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Answer.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Answer.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace DamageAssesment.Api.SurveyResponses.Models +namespace DamageAssesment.Api.Responses.Models { public class Answer { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/AnswerRequest.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/AnswerRequest.cs index 3d86488..2921faf 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/AnswerRequest.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/AnswerRequest.cs @@ -1,4 +1,4 @@ -namespace DamageAssesment.Api.SurveyResponses.Models +namespace DamageAssesment.Api.Responses.Models { public class AnswerRequest { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Attachment.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Attachment.cs index 92ab874..6194789 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Attachment.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Attachment.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace DamageAssesment.Api.SurveyResponses.Models +namespace DamageAssesment.Api.Responses.Models { public class Attachment { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/AttachmentInfo.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/AttachmentInfo.cs index e3e30b9..8c31831 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/AttachmentInfo.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/AttachmentInfo.cs @@ -1,4 +1,4 @@ -namespace DamageAssesment.Api.SurveyResponses.Models +namespace DamageAssesment.Api.Responses.Models { public class AttachmentInfo { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Employee.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Employee.cs index 9a06020..72ceffc 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Employee.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Employee.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace DamageAssesment.Api.SurveyResponses.Models +namespace DamageAssesment.Api.Responses.Models { public class Employee { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Location.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Location.cs index 078a5ef..d5996d2 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Location.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Location.cs @@ -1,4 +1,4 @@ -namespace DamageAssesment.Api.SurveyResponses.Models +namespace DamageAssesment.Api.Responses.Models { public class Location { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Question.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Question.cs index 37abb4b..aac31f5 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Question.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Question.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace DamageAssesment.Api.SurveyResponses.Models +namespace DamageAssesment.Api.Responses.Models { public class Question { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Region.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Region.cs index 3fc5ad7..0f3ee9d 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Region.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Region.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace DamageAssesment.Api.SurveyResponses.Models +namespace DamageAssesment.Api.Responses.Models { public class Region { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Request.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Request.cs index 5060914..322314d 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Request.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Request.cs @@ -1,4 +1,4 @@ -namespace DamageAssesment.Api.SurveyResponses.Models +namespace DamageAssesment.Api.Responses.Models { public class Request { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Survey.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Survey.cs index b47193e..8265046 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Survey.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Survey.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace DamageAssesment.Api.SurveyResponses.Models +namespace DamageAssesment.Api.Responses.Models { public class Survey { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/SurveyQuestion.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/SurveyQuestion.cs index d510b4e..da3668f 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/SurveyQuestion.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/SurveyQuestion.cs @@ -1,4 +1,4 @@ -namespace DamageAssesment.Api.SurveyResponses.Models +namespace DamageAssesment.Api.Responses.Models { public class SurveyQuestions { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/SurveyResponse.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/SurveyResponse.cs index 37862ca..56d2048 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/SurveyResponse.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/SurveyResponse.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace DamageAssesment.Api.SurveyResponses.Models +namespace DamageAssesment.Api.Responses.Models { public class SurveyResponse { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/SurveyTranslation.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/SurveyTranslation.cs index 29a1b7c..022172f 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/SurveyTranslation.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/SurveyTranslation.cs @@ -1,4 +1,4 @@ -namespace DamageAssesment.Api.SurveyResponses.Models +namespace DamageAssesment.Api.Responses.Models { public class SurveyTranslation { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Profiles/SurveyResponsesProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Profiles/SurveyResponsesProvider.cs index d7c65a0..8208db7 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Profiles/SurveyResponsesProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Profiles/SurveyResponsesProvider.cs @@ -1,4 +1,4 @@ -namespace DamageAssesment.Api.SurveyResponses.Profiles +namespace DamageAssesment.Api.Responses.Profiles { public class SurveyResponsesProvider : AutoMapper.Profile { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs index 8d27911..f7b7216 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs @@ -1,7 +1,7 @@ -using DamageAssesment.Api.SurveyResponses.Db; -using DamageAssesment.Api.SurveyResponses.Interfaces; -using DamageAssesment.Api.SurveyResponses.Services; -using DamageAssesment.Api.SurveyResponses.Providers; +using DamageAssesment.Api.Responses.Db; +using DamageAssesment.Api.Responses.Interfaces; +using DamageAssesment.Api.Responses.Services; +using DamageAssesment.Api.Responses.Providers; using Microsoft.EntityFrameworkCore; using Polly; using System.Reflection; @@ -44,7 +44,7 @@ builder.Services.AddSwaggerGen(c => }); builder.Services.AddDbContext(option => { - option.UseInMemoryDatabase("SurveyResponses"); + option.UseInMemoryDatabase("Responses"); }); var app = builder.Build(); diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/SurveyResponsesProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/SurveyResponsesProvider.cs index ffbc181..a33dbf8 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/SurveyResponsesProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/SurveyResponsesProvider.cs @@ -1,10 +1,10 @@ using AutoMapper; -using DamageAssesment.Api.SurveyResponses.Db; -using DamageAssesment.Api.SurveyResponses.Interfaces; -using DamageAssesment.Api.SurveyResponses.Models; +using DamageAssesment.Api.Responses.Db; +using DamageAssesment.Api.Responses.Interfaces; +using DamageAssesment.Api.Responses.Models; using Microsoft.EntityFrameworkCore; -namespace DamageAssesment.Api.SurveyResponses.Providers +namespace DamageAssesment.Api.Responses.Providers { public class SurveyResponsesProvider : ISurveysResponse { @@ -40,10 +40,10 @@ namespace DamageAssesment.Api.SurveyResponses.Providers { surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 1, LocationId = 1, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now }); surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 2, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now }); - //surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 3, SurveyId = 3, EmployeeId = 4, LocationId = 1, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now }); - //surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 4, SurveyId = 4, EmployeeId = 1, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "false", CreatedDate = DateTime.Now }); - //surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 6, SurveyId = 1, EmployeeId = 4, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now }); - //surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 7, SurveyId = 1, EmployeeId = 4, LocationId = 3, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "false", CreatedDate = DateTime.Now }); + //surveyResponseDbContext.Responses.Add(new Db.SurveyResponse { Id = 3, SurveyId = 3, EmployeeId = 4, LocationId = 1, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now }); + //surveyResponseDbContext.Responses.Add(new Db.SurveyResponse { Id = 4, SurveyId = 4, EmployeeId = 1, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "false", CreatedDate = DateTime.Now }); + //surveyResponseDbContext.Responses.Add(new Db.SurveyResponse { Id = 6, SurveyId = 1, EmployeeId = 4, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now }); + //surveyResponseDbContext.Responses.Add(new Db.SurveyResponse { Id = 7, SurveyId = 1, EmployeeId = 4, LocationId = 3, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "false", CreatedDate = DateTime.Now }); surveyResponseDbContext.SaveChanges(); } } @@ -851,7 +851,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers } } - //var surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == survey.Id).ToListAsync(); + //var surveyResponses = await surveyResponseDbContext.Responses.Where(x => x.SurveyId == survey.Id).ToListAsync(); // var employees = await employeeServiceProvider.getEmployeesAsync(); var answers = await answerServiceProvider.getAnswersAsync(); var attachments = await attachmentServiceProvider.getAttachmentsAsync(); diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/AnswerServiceProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/AnswerServiceProvider.cs index 695ad3e..5b8eeeb 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/AnswerServiceProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/AnswerServiceProvider.cs @@ -1,9 +1,9 @@ -using DamageAssesment.Api.SurveyResponses.Interfaces; -using DamageAssesment.Api.SurveyResponses.Models; +using DamageAssesment.Api.Responses.Interfaces; +using DamageAssesment.Api.Responses.Models; using Newtonsoft.Json; -namespace DamageAssesment.Api.SurveyResponses.Services +namespace DamageAssesment.Api.Responses.Services { public class AnswerServiceProvider : ServiceProviderBase, IAnswerServiceProvider { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/AttachmentServiceProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/AttachmentServiceProvider.cs index 120e60f..bfbce94 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/AttachmentServiceProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/AttachmentServiceProvider.cs @@ -1,8 +1,8 @@ -using DamageAssesment.Api.SurveyResponses.Interfaces; -using DamageAssesment.Api.SurveyResponses.Models; +using DamageAssesment.Api.Responses.Interfaces; +using DamageAssesment.Api.Responses.Models; using Newtonsoft.Json; -namespace DamageAssesment.Api.SurveyResponses.Services +namespace DamageAssesment.Api.Responses.Services { public class AttachmentServiceProvider : ServiceProviderBase, IAttachmentServiceProvider { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/EmployeeServiceProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/EmployeeServiceProvider.cs index 8dd1352..22f63de 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/EmployeeServiceProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/EmployeeServiceProvider.cs @@ -1,9 +1,9 @@ -using DamageAssesment.Api.SurveyResponses.Interfaces; -using DamageAssesment.Api.SurveyResponses.Models; +using DamageAssesment.Api.Responses.Interfaces; +using DamageAssesment.Api.Responses.Models; using Microsoft.AspNetCore.Mvc.Routing; using Newtonsoft.Json; -namespace DamageAssesment.Api.SurveyResponses.Services +namespace DamageAssesment.Api.Responses.Services { public class EmployeeServiceProvider : ServiceProviderBase, IEmployeeServiceProvider { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/HttpUtil.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/HttpUtil.cs index 8b4755d..053ffad 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/HttpUtil.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/HttpUtil.cs @@ -1,8 +1,8 @@ -using DamageAssesment.Api.SurveyResponses.Interfaces; +using DamageAssesment.Api.Responses.Interfaces; using System.Net.Http.Headers; using System.Text; -namespace DamageAssesment.Api.SurveyResponses.Services +namespace DamageAssesment.Api.Responses.Services { public class HttpUtil : IHttpUtil { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/LocationServiceProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/LocationServiceProvider.cs index 2e3fa32..e6b36f6 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/LocationServiceProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/LocationServiceProvider.cs @@ -1,8 +1,8 @@ -using DamageAssesment.Api.SurveyResponses.Interfaces; -using DamageAssesment.Api.SurveyResponses.Models; +using DamageAssesment.Api.Responses.Interfaces; +using DamageAssesment.Api.Responses.Models; using Newtonsoft.Json; -namespace DamageAssesment.Api.SurveyResponses.Services +namespace DamageAssesment.Api.Responses.Services { public class LocationServiceProvider :ServiceProviderBase, ILocationServiceProvider { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/QuestionServiceProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/QuestionServiceProvider.cs index 138011f..95086b8 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/QuestionServiceProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/QuestionServiceProvider.cs @@ -1,8 +1,8 @@ -using DamageAssesment.Api.SurveyResponses.Interfaces; -using DamageAssesment.Api.SurveyResponses.Models; +using DamageAssesment.Api.Responses.Interfaces; +using DamageAssesment.Api.Responses.Models; using Newtonsoft.Json; -namespace DamageAssesment.Api.SurveyResponses.Services +namespace DamageAssesment.Api.Responses.Services { public class QuestionServiceProvider : ServiceProviderBase, IQuestionServiceProvider { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/RegionServiceProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/RegionServiceProvider.cs index 091512e..49d3e28 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/RegionServiceProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/RegionServiceProvider.cs @@ -1,8 +1,8 @@ -using DamageAssesment.Api.SurveyResponses.Interfaces; -using DamageAssesment.Api.SurveyResponses.Models; +using DamageAssesment.Api.Responses.Interfaces; +using DamageAssesment.Api.Responses.Models; using Newtonsoft.Json; -namespace DamageAssesment.Api.SurveyResponses.Services +namespace DamageAssesment.Api.Responses.Services { public class RegionServiceProvider : ServiceProviderBase, IRegionServiceProvider { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/ServiceProviderBase.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/ServiceProviderBase.cs index af1aa65..1196f5b 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/ServiceProviderBase.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/ServiceProviderBase.cs @@ -1,6 +1,6 @@ -using DamageAssesment.Api.SurveyResponses.Interfaces; +using DamageAssesment.Api.Responses.Interfaces; -namespace DamageAssesment.Api.SurveyResponses.Services +namespace DamageAssesment.Api.Responses.Services { public class ServiceProviderBase { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/SurveyServiceProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/SurveyServiceProvider.cs index 19c081a..a77e1a7 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/SurveyServiceProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/SurveyServiceProvider.cs @@ -1,8 +1,8 @@ -using DamageAssesment.Api.SurveyResponses.Interfaces; -using DamageAssesment.Api.SurveyResponses.Models; +using DamageAssesment.Api.Responses.Interfaces; +using DamageAssesment.Api.Responses.Models; using Newtonsoft.Json; -namespace DamageAssesment.Api.SurveyResponses.Services +namespace DamageAssesment.Api.Responses.Services { public class SurveyServiceProvider : ServiceProviderBase, ISurveyServiceProvider { diff --git a/DamageAssesmentApi/docker-compose.override.yml b/DamageAssesmentApi/docker-compose.override.yml index 6e8ea42..c05d349 100644 --- a/DamageAssesmentApi/docker-compose.override.yml +++ b/DamageAssesmentApi/docker-compose.override.yml @@ -35,7 +35,7 @@ services: - "6005:80" - damageassesment.api.surveyresponses: + damageassesment.api.responses: environment: - ASPNETCORE_ENVIRONMENT=Development - services__Answers=http://damageassesment.api.answers:80 @@ -62,3 +62,5 @@ services: ports: - "6009:80" + + diff --git a/DamageAssesmentApi/docker-compose.yml b/DamageAssesmentApi/docker-compose.yml index cec6504..f421f5a 100644 --- a/DamageAssesmentApi/docker-compose.yml +++ b/DamageAssesmentApi/docker-compose.yml @@ -35,11 +35,11 @@ services: dockerfile: DamageAssesment.Api.Questions/Dockerfile - damageassesment.api.surveyresponses: - image: ${DOCKER_REGISTRY-}damageassesmentapisurveyresponses - build: - context: . - dockerfile: DamageAssesment.Api.SurveyResponses/Dockerfile + # damageassesment.api.surveyresponses: + # image: ${DOCKER_REGISTRY-}damageassesmentapisurveyresponses + # build: + # context: . + # dockerfile: DamageAssesment.Api.SurveyResponses/Dockerfile damageassesment.api.surveys: @@ -55,3 +55,10 @@ services: context: . dockerfile: DamageAssesment.Api.DocuLinks/Dockerfile + + damageassesment.api.responses: + image: ${DOCKER_REGISTRY-}damageassesmentapiresponses + build: + context: . + dockerfile: DamageAssesment.Api.Responses/Dockerfile + diff --git a/DamageAssesmentApi/launchSettings.json b/DamageAssesmentApi/launchSettings.json index 4c96d28..eebfc00 100644 --- a/DamageAssesmentApi/launchSettings.json +++ b/DamageAssesmentApi/launchSettings.json @@ -11,7 +11,8 @@ "damageassesment.api.questions": "StartDebugging", "damageassesment.api.surveyresponses": "StartDebugging", "damageassesment.api.surveys": "StartDebugging", - "damageassesment.api.doculinks": "StartDebugging" + "damageassesment.api.doculinks": "StartDebugging", + "damageassesment.api.responses": "StartDebugging" } } } From bac2eef4fb8d715bc53103737c4e5ee73343d6d4 Mon Sep 17 00:00:00 2001 From: uppuv Date: Thu, 5 Oct 2023 14:27:24 -0400 Subject: [PATCH 19/30] added doculinks seed data for multi language titles and descriptions --- .../Providers/DoculinkProvider.cs | 5 ++++- .../Providers/EmployeesProvider.cs | 4 ++-- .../Providers/SurveyResponsesProvider.cs | 2 +- .../Providers/SurveysProvider.cs | 7 ++++--- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs index cf8bcfe..9d8eae8 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs @@ -65,7 +65,10 @@ namespace DamageAssesment.Api.DocuLinks.Providers { 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 } }; - Db.DoculinkTranslation documents = new Db.DoculinkTranslation { DocumentId = i, title = "Test"+i, description = "ss"+i, Language = "en" }; + List documents = new List(); + documents.Add(new Db.DoculinkTranslation { DocumentId = i, title = "test" + i, description = "test" + i, Language = "en" }); + documents.Add(new Db.DoculinkTranslation { DocumentId = i, title = "prueba" + i, description = "prueba" + i, Language = "es" }); + documents.Add(new Db.DoculinkTranslation { DocumentId = i, title = "test" + i, description = "test" + i, Language = "fr" }); Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo); DocumentDbContext.Documents.Add(mapper.Map(document)); DocumentDbContext.SaveChanges(); diff --git a/DamageAssesmentApi/DamageAssesment.Api.Employees/Providers/EmployeesProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Employees/Providers/EmployeesProvider.cs index 3713991..eed1e09 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Employees/Providers/EmployeesProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Employees/Providers/EmployeesProvider.cs @@ -156,8 +156,8 @@ namespace DamageAssesment.Api.Employees.Providers { if (!EmployeeDbContext.Employees.Any()) { - EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "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 = "Emp2", Name = "ABC2", Email = "abc2@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-22), IsActive = true, PreferredLanguage = "fr" }); + EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "Emp1", Name = "David", Email = "David@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" }); + EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "Emp2", Name = "Smith", Email = "Smith@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 = 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 = 5, EmployeeCode = "Emp5", Name = "ABC5", Email = "abc5@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-23), IsActive = true, PreferredLanguage = "es" }); diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/SurveyResponsesProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/SurveyResponsesProvider.cs index a33dbf8..0631932 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/SurveyResponsesProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/SurveyResponsesProvider.cs @@ -39,7 +39,7 @@ namespace DamageAssesment.Api.Responses.Providers if (!surveyResponseDbContext.SurveyResponses.Any()) { surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 1, LocationId = 1, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now }); - surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 2, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now }); + surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 2, EmployeeId = 2, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now }); //surveyResponseDbContext.Responses.Add(new Db.SurveyResponse { Id = 3, SurveyId = 3, EmployeeId = 4, LocationId = 1, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now }); //surveyResponseDbContext.Responses.Add(new Db.SurveyResponse { Id = 4, SurveyId = 4, EmployeeId = 1, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "false", CreatedDate = DateTime.Now }); //surveyResponseDbContext.Responses.Add(new Db.SurveyResponse { Id = 6, SurveyId = 1, EmployeeId = 4, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now }); diff --git a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs index 8755a8a..d2f2299 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs @@ -26,6 +26,7 @@ namespace DamageAssesment.Api.Surveys.Providers if (!surveyDbContext.Surveys.Any()) { surveyDbContext.Surveys.Add(new Db.Survey {IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }); + surveyDbContext.Surveys.Add(new Db.Survey { IsEnabled = false, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }); //surveyDbContext.Surveys.Add(new Db.Survey { Id = 2, IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }); //surveyDbContext.Surveys.Add(new Db.Survey { Id = 3, IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }); surveyDbContext.SaveChangesAsync(); @@ -37,9 +38,9 @@ namespace DamageAssesment.Api.Surveys.Providers surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 1, Language = "es", Title = "Impacto de la tormenta tropical Emily en la economía de Florida" }); surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 1, Language = "fr", Title = "Impact de la tempête tropicale Emily sur l'économie de la Floride" }); - //surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { Id = 4, SurveyId = 2, Language = "en", Title = "Hurricane Andrew Aftermath Survey" }); - //surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { Id = 5, SurveyId = 2, Language = "es", Title = "Encuesta sobre las secuelas del huracán Andrew" }); - //surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { Id = 6, SurveyId = 2, Language = "fr", Title = "Enquête sur les conséquences de l'ouragan Andrew" }); + surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 2, Language = "en", Title = "Hurricane Andrew Aftermath Survey" }); + surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 2, Language = "es", Title = "Encuesta sobre las secuelas del huracán Andrew" }); + surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 2, Language = "fr", Title = "Enquête sur les conséquences de l'ouragan Andrew" }); //surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { Id = 7, SurveyId = 3, Language = "en", Title = "Public Perception of Hurricane Michael's Response" }); //surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { Id = 8, SurveyId = 3, Language = "es", Title = "Percepción pública de la respuesta del huracán Michael" }); From 2aca01c8b44d6c7ccdf75e2b4887d14cd08c3a65 Mon Sep 17 00:00:00 2001 From: uppuv Date: Thu, 5 Oct 2023 15:42:41 -0400 Subject: [PATCH 20/30] seed data changes for answers and new survey --- .../Providers/AnswerProvider.cs | 4 ++-- .../Providers/QuestionsProvider.cs | 21 ++++++++++++------- .../appsettings.json | 10 ++++++++- .../Providers/SurveysProvider.cs | 2 +- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/DamageAssesmentApi/DamageAssesment.Api.Answers/Providers/AnswerProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Answers/Providers/AnswerProvider.cs index bec47ba..9291628 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Answers/Providers/AnswerProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Answers/Providers/AnswerProvider.cs @@ -191,8 +191,8 @@ namespace DamageAssesment.Api.Answers.Providers { if (!answerDbContext.Answers.Any()) { - answerDbContext.Answers.Add(new Db.Answer() { AnswerText = "Yes", Comment = "Comment test 4", QuestionId = 1, SurveyResponseId = 1 }); - answerDbContext.Answers.Add(new Db.Answer() { AnswerText = "No", Comment = "Comment test 5", QuestionId = 2, SurveyResponseId = 1 }); + answerDbContext.Answers.Add(new Db.Answer() { Id = 1, AnswerText = "Yes", Comment = "Comment test 4", QuestionId = 1, SurveyResponseId = 1 }); + answerDbContext.Answers.Add(new Db.Answer() { Id = 2, AnswerText = "No", Comment = "Comment test 5", QuestionId = 2, SurveyResponseId = 1 }); //answerDbContext.Answers.Add(new Db.Answer() { Id = 3, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 }); //answerDbContext.Answers.Add(new Db.Answer() { Id = 4, AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 }); //answerDbContext.Answers.Add(new Db.Answer() { Id = 5, AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 }); diff --git a/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs index f6272b6..850c165 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs @@ -29,20 +29,25 @@ namespace DamageAssesment.Api.Questions.Providers { questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 1, QuestionText = "Can You Open ?", Language = "en" }); questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 1, QuestionText = "Peux-tu ouvrir ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 1, QuestionText = "Puedes abrir ?", Language = "es" }); questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 2, QuestionText = "Are the grounds flodded ?", Language = "en" }); questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 2, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" }); - //questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 5, QuestionId = 3, QuestionText = "Is the access blocked by flooding ?", Language = "en" }); - //questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 6, QuestionId = 3, QuestionText = "L'accès est-il bloqué par les inondations ?", Language = "fr" }); - //questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 7, QuestionId = 1, QuestionText = "Puedes abrir ?", Language = "es" }); - //questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 8, QuestionId = 2, QuestionText = "¿Están inundados los terrenos?", Language = "es" }); - //questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 9, QuestionId = 3, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 2, QuestionText = "¿Están inundados los terrenos?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 3, QuestionText = "Is the access blocked by flooding ?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 3, QuestionText = "L'accès est-il bloqué par les inondations ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 3, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Are the grounds flodded ?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "¿Están inundados los terrenos?", Language = "es" }); questionDbContext.SaveChanges(); } if (!questionDbContext.Questions.Any()) { - questionDbContext.Questions.Add(new Db.Question() { QuestionTypeId = 2, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=1 }); - questionDbContext.Questions.Add(new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }); - //questionDbContext.Questions.Add(new Db.Question() { Id = 3, QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 3, IsRequired = true, Comment = false, Key = true, CategoryId = 2 }); + questionDbContext.Questions.Add(new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=1 }); + questionDbContext.Questions.Add(new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }); + questionDbContext.Questions.Add(new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }); + questionDbContext.Questions.Add(new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }); + //questionDbContext.Questions.Add(new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 3, IsRequired = true, Comment = false, Key = true, CategoryId = 2 }); questionDbContext.SaveChanges(); } if (!questionDbContext.QuestionTypes.Any()) diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.json b/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.json index c812b9e..914d671 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.json +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.json @@ -7,7 +7,15 @@ }, "AllowedHosts": "*", - + //"EndPointSettings": { + // "AnswerUrlBase": "http://localhost:5200", + // "LocationUrlBase": "http://localhost:5213", + // "RegionUrlBase": "http://localhost:5211", + // "QuestionUrlBase": "http://localhost:5133", + // "EmployeeUrlBase": "http://localhost:5135", + // "AttachmentUrlBase": "http://localhost:5243", + // "SurveyUrlBase": "http://localhost:5009" + //}, "EndPointSettings": { "AnswerUrlBase": "http://damageassesment.api.answers:80", "LocationUrlBase": "http://damageassesment.api.locations:80", diff --git a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs index d2f2299..3d08544 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs @@ -26,7 +26,7 @@ namespace DamageAssesment.Api.Surveys.Providers if (!surveyDbContext.Surveys.Any()) { surveyDbContext.Surveys.Add(new Db.Survey {IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }); - surveyDbContext.Surveys.Add(new Db.Survey { IsEnabled = false, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }); + surveyDbContext.Surveys.Add(new Db.Survey { IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }); //surveyDbContext.Surveys.Add(new Db.Survey { Id = 2, IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }); //surveyDbContext.Surveys.Add(new Db.Survey { Id = 3, IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }); surveyDbContext.SaveChangesAsync(); From cee61c9b87b948d393e68a3952b0fedd42da8832 Mon Sep 17 00:00:00 2001 From: Santhosh Nair <913441@dadeschools.net> Date: Fri, 6 Oct 2023 01:53:05 +0000 Subject: [PATCH 21/30] Deleted appsettings.Development.json --- .../appsettings.Development.json | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.Development.json diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.Development.json b/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.Development.json deleted file mode 100644 index 06d7caa..0000000 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.Development.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - }, - "EndPointSettings": { - "AnswerUrlBase": "http://localhost:5200", - "LocationUrlBase": "http://localhost:5213", - "RegionUrlBase": "http://localhost:5211", - "QuestionUrlBase": "http://localhost:5133", - "EmployeeUrlBase": "http://localhost:5135", - "AttachmentUrlBase": "http://localhost:5243", - "SurveyUrlBase": "http://localhost:5009" - }, - - "RessourceSettings": { - "Employee": "/Employees", - "EmployeeById": "/Employees/{0}", - "Question": "/Questions", - "QuestionById": "/Questions/{0}", - "SurveyQuestion": "/Questions/BySurvey/{0}", - "Survey": "/Surveys", - "SurveyById": "/Surveys/{0}", - "Attachment": "/Attachments", - "Answer": "/Answers", - "AnswerByResponse": "/Answers/ByResponse/{0}", - "Location": "/Locations", - "Region": "/Regions" - } - } -} From 7d3968bb62001255482d7f28ea02b0c67baf49a9 Mon Sep 17 00:00:00 2001 From: Santhosh Nair <913441@dadeschools.net> Date: Fri, 6 Oct 2023 01:53:24 +0000 Subject: [PATCH 22/30] Deleted appsettings.Production.json --- .../appsettings.Production.json | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.Production.json diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.Production.json b/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.Production.json deleted file mode 100644 index ba719e5..0000000 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.Production.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ConnectionStrings": { - "DefaultConnection": "Server=(localdb)\\MSSQLLocalDB;Database=_CHANGE_ME;Trusted_Connection=True;MultipleActiveResultSets=true" - } -} \ No newline at end of file From 15b5fba35e453ae5926632e64dd3d3bacf85f4db Mon Sep 17 00:00:00 2001 From: Santhosh Nair <913441@dadeschools.net> Date: Fri, 6 Oct 2023 01:53:42 +0000 Subject: [PATCH 23/30] Deleted appsettings.Test.json --- .../DamageAssesment.Api.Responses/appsettings.Test.json | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.Test.json diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.Test.json b/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.Test.json deleted file mode 100644 index ba719e5..0000000 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.Test.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ConnectionStrings": { - "DefaultConnection": "Server=(localdb)\\MSSQLLocalDB;Database=_CHANGE_ME;Trusted_Connection=True;MultipleActiveResultSets=true" - } -} \ No newline at end of file From 1510c3ab12ba36461c4ee64f1c3bc973f86123a6 Mon Sep 17 00:00:00 2001 From: uppuv Date: Fri, 6 Oct 2023 16:25:38 -0400 Subject: [PATCH 24/30] Seed changes for doculink microservice --- .../Providers/DoculinkProvider.cs | 41 +++++++++++++++---- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs index 9d8eae8..5ae15b1 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs @@ -63,16 +63,15 @@ namespace DamageAssesment.Api.DocuLinks.Providers 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 } }; - List documents = new List(); - documents.Add(new Db.DoculinkTranslation { DocumentId = i, title = "test" + i, description = "test" + i, Language = "en" }); - documents.Add(new Db.DoculinkTranslation { DocumentId = i, title = "prueba" + i, description = "prueba" + i, Language = "es" }); - documents.Add(new Db.DoculinkTranslation { DocumentId = i, title = "test" + i, description = "test" + i, Language = "fr" }); + FileModel fileModel = new FileModel(); + if (i < 3) + fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1 }; + else + fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1 }; + ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i, CustomOrder = i, Files = new List() { fileModel } }; Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo); DocumentDbContext.Documents.Add(mapper.Map(document)); DocumentDbContext.SaveChanges(); - DocumentDbContext.DocumentsTranslations.AddRange(documents); var dbattachments = mapper.Map, List>(document.doclinksAttachments); dbattachments.ForEach(a => a.DocumentId = i); DocumentDbContext.DoclinksAttachments.AddRange(dbattachments); @@ -80,6 +79,34 @@ namespace DamageAssesment.Api.DocuLinks.Providers counter++; } } + if (!DocumentDbContext.DocumentsTranslations.Any()) + { + string[] titles = { + "Mobile App Damage Assessment Instructions", + "PC Damage Assessment Instructions", + "Emergency Evacuation centers", + "Mobile App Damage Assessment Instructions" }; + string[] esTranslations = { + "Instrucciones de Evaluación de Daños de la Aplicación Móvil", + "Instrucciones de Evaluación de Daños del PC", + "Centros de Evacuación de Emergencia", + "Instrucciones de Evaluación de Daños de la Aplicación Móvil" }; + string[] frTranslations = { + "Instructions d'Évaluation des Dommages de l'Application Mobile", + "Instructions d'Évaluation des Dommages du PC", + "Centres d'Évacuation d'Urgence", + "Instructions d'Évaluation des Dommages de l'Application Mobile" }; + List documents = new List(); + for (int i = 0; i < 4; i++) + { + documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = titles[i], description = titles[i], Language = "en" }); + documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = esTranslations[i], description = esTranslations[i], Language = "es" }); + documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = frTranslations[i], description = frTranslations[i], Language = "fr" }); + } + DocumentDbContext.DocumentsTranslations.AddRange(documents); + DocumentDbContext.SaveChanges(); + } + } public List GetDocumentTranslations(int id, string? language) { From 9b91afd329a3f9a4d76690b79ede48379e2bce22 Mon Sep 17 00:00:00 2001 From: Santhosh S <913341@dadeschools.net> Date: Fri, 6 Oct 2023 18:22:37 -0400 Subject: [PATCH 25/30] bug fix with seed data changes --- .../Providers/AnswerProvider.cs | 36 +++++---- .../Response-1/Answer-1/Attachment_1.txt | 1 + .../DASA_Documents/Active/Document_1.txt | 1 + .../DASA_Documents/Active/Document_2.txt | 1 + .../DamageAssesment.Api.DocuLinks.csproj | 2 +- .../Providers/EmployeesProvider.cs | 6 +- .../Providers/LocationsProvider.cs | 7 +- .../Providers/RegionsProvider.cs | 6 +- .../Providers/QuestionsProvider.cs | 62 ++++++++------- .../Providers/SurveyResponsesProvider.cs | 15 ++-- .../appsettings.json | 3 +- .../Providers/SurveysProvider.cs | 75 +++++++++++-------- DamageAssesmentApi/docker-compose.yml | 9 +-- 13 files changed, 124 insertions(+), 100 deletions(-) create mode 100644 DamageAssesmentApi/DamageAssesment.Api.Attachments/DMS_Attachments/Active/Response-1/Answer-1/Attachment_1.txt create mode 100644 DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DASA_Documents/Active/Document_1.txt create mode 100644 DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DASA_Documents/Active/Document_2.txt diff --git a/DamageAssesmentApi/DamageAssesment.Api.Answers/Providers/AnswerProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Answers/Providers/AnswerProvider.cs index 9291628..84dff1d 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Answers/Providers/AnswerProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Answers/Providers/AnswerProvider.cs @@ -8,19 +8,20 @@ namespace DamageAssesment.Api.Answers.Providers { public class AnswersProvider : IAnswersProvider { - private AnswerDbContext answerDbContext; private ILogger logger; private IMapper mapper; + // Constructor with dependency injection and data seeding public AnswersProvider(AnswerDbContext answerDbContext, ILogger logger, IMapper mapper) { this.answerDbContext = answerDbContext; this.logger = logger; this.mapper = mapper; - SeedData(); + SeedData(); // Seed initial data if the table is empty } + // Get all answers public async Task<(bool IsSuccess, IEnumerable Answers, string ErrorMessage)> GetAnswersAsync() { try @@ -40,9 +41,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 @@ -63,6 +64,8 @@ namespace DamageAssesment.Api.Answers.Providers return (false, null, ex.Message); } } + + // Get answers by survey response ID public async Task<(bool IsSuccess, IEnumerable Answers, string ErrorMessage)> GetAnswersAsync(int surveyResponseId) { try @@ -74,17 +77,17 @@ namespace DamageAssesment.Api.Answers.Providers { var result = mapper.Map, IEnumerable>(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 Answers, string ErrorMessage)> GetAnswersByQuestionAsync(int questionId) { try @@ -96,17 +99,17 @@ namespace DamageAssesment.Api.Answers.Providers { var result = mapper.Map, IEnumerable>(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 @@ -120,7 +123,7 @@ namespace DamageAssesment.Api.Answers.Providers var result = mapper.Map(answer); return (true, result, null); } - return (false, null, "Answer is already exits"); + return (false, null, "Answer is already exists"); } catch (Exception ex) { @@ -128,6 +131,8 @@ 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 @@ -156,14 +161,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(); @@ -173,26 +178,29 @@ namespace DamageAssesment.Api.Answers.Providers } answerDbContext.Answers.Remove(answer); answerDbContext.SaveChanges(); - return (true, mapper.Map(answer), $"AnswerId {Id} deleted Successfuly"); + return (true, mapper.Map(answer), $"AnswerId {Id} deleted successfully"); } 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() { Id = 1, AnswerText = "Yes", Comment = "Comment test 4", QuestionId = 1, SurveyResponseId = 1 }); answerDbContext.Answers.Add(new Db.Answer() { Id = 2, AnswerText = "No", Comment = "Comment test 5", QuestionId = 2, SurveyResponseId = 1 }); + // Uncomment the lines below to add more initial data if needed //answerDbContext.Answers.Add(new Db.Answer() { Id = 3, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 }); //answerDbContext.Answers.Add(new Db.Answer() { Id = 4, AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 }); //answerDbContext.Answers.Add(new Db.Answer() { Id = 5, AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 }); diff --git a/DamageAssesmentApi/DamageAssesment.Api.Attachments/DMS_Attachments/Active/Response-1/Answer-1/Attachment_1.txt b/DamageAssesmentApi/DamageAssesment.Api.Attachments/DMS_Attachments/Active/Response-1/Answer-1/Attachment_1.txt new file mode 100644 index 0000000..eed7e79 --- /dev/null +++ b/DamageAssesmentApi/DamageAssesment.Api.Attachments/DMS_Attachments/Active/Response-1/Answer-1/Attachment_1.txt @@ -0,0 +1 @@ +sample \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DASA_Documents/Active/Document_1.txt b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DASA_Documents/Active/Document_1.txt new file mode 100644 index 0000000..eed7e79 --- /dev/null +++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DASA_Documents/Active/Document_1.txt @@ -0,0 +1 @@ +sample \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DASA_Documents/Active/Document_2.txt b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DASA_Documents/Active/Document_2.txt new file mode 100644 index 0000000..eed7e79 --- /dev/null +++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DASA_Documents/Active/Document_2.txt @@ -0,0 +1 @@ +sample \ No newline at end of file diff --git a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DamageAssesment.Api.DocuLinks.csproj b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DamageAssesment.Api.DocuLinks.csproj index 2e8659c..45347ee 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DamageAssesment.Api.DocuLinks.csproj +++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DamageAssesment.Api.DocuLinks.csproj @@ -1,4 +1,4 @@ - + net6.0 diff --git a/DamageAssesmentApi/DamageAssesment.Api.Employees/Providers/EmployeesProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Employees/Providers/EmployeesProvider.cs index eed1e09..b1741be 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Employees/Providers/EmployeesProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Employees/Providers/EmployeesProvider.cs @@ -19,7 +19,7 @@ namespace DamageAssesment.Api.Employees.Providers this.EmployeeDbContext = EmployeeDbContext; this.logger = logger; this.mapper = mapper; - SeedData(); + // SeedData(); } public async Task<(bool IsSuccess, IEnumerable Employees, string ErrorMessage)> GetEmployeesAsync() @@ -156,8 +156,8 @@ namespace DamageAssesment.Api.Employees.Providers { if (!EmployeeDbContext.Employees.Any()) { - EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "Emp1", Name = "David", Email = "David@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" }); - EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "Emp2", Name = "Smith", Email = "Smith@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-22), IsActive = true, PreferredLanguage = "fr" }); + 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() { 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 = 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 = 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 = 5, EmployeeCode = "Emp5", Name = "ABC5", Email = "abc5@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-23), IsActive = true, PreferredLanguage = "es" }); diff --git a/DamageAssesmentApi/DamageAssesment.Api.Locations/Providers/LocationsProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Locations/Providers/LocationsProvider.cs index 9952655..198a765 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Locations/Providers/LocationsProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Locations/Providers/LocationsProvider.cs @@ -17,7 +17,7 @@ namespace DamageAssesment.Api.Locations.Providers this.locationDbContext = locationDbContext; this.logger = logger; this.mapper = mapper; - SeedData(); + // SeedData(); } public async Task<(bool IsSuccess, IEnumerable Locations, string ErrorMessage)> GetLocationsAsync() @@ -139,8 +139,9 @@ namespace DamageAssesment.Api.Locations.Providers { if (!locationDbContext.Locations.Any()) { - locationDbContext.Locations.Add(new Db.Location() { LocationCode = "Loc1", RegionId = 1, Name = "BOB GRAHAM EDUCATION CENTER 1", MaintenanceCenter = "1", SchoolType = "US" }); - locationDbContext.Locations.Add(new Db.Location() { LocationCode = "Loc2", RegionId = 2, Name = "BOB GRAHAM EDUCATION CENTER 2", MaintenanceCenter = "1", SchoolType = "US" }); + locationDbContext.Locations.Add(new Db.Location() { LocationCode = "0091", RegionId = 5, Name = "BOB GRAHAM EDUCATION CENTER", MaintenanceCenter = "1", SchoolType = "K8" }); + locationDbContext.Locations.Add(new Db.Location() { LocationCode = "0092", RegionId = 1, Name = "NORMAN S. EDELCUP/SUNNY ISLES BEACH K-8", MaintenanceCenter = "1", SchoolType = "K8" }); + locationDbContext.Locations.Add(new Db.Location() { LocationCode = "7511", RegionId = 4, Name = "MIAMI SPRINGS SHS", MaintenanceCenter = "2", SchoolType = "S" }); //locationDbContext.Locations.Add(new Db.Location() { Id = 3, LocationCode = "Loc3", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 3", MaintenanceCenter = "1", SchoolType = "US" }); //locationDbContext.Locations.Add(new Db.Location() { Id = 4, LocationCode = "Loc4", RegionId = 1, Name = "BOB GRAHAM EDUCATION CENTER 4", MaintenanceCenter = "1", SchoolType = "US" }); //locationDbContext.Locations.Add(new Db.Location() { Id = 5, LocationCode = "Loc5", RegionId = 2, Name = "BOB GRAHAM EDUCATION CENTER 5", MaintenanceCenter = "1", SchoolType = "US" }); diff --git a/DamageAssesmentApi/DamageAssesment.Api.Locations/Providers/RegionsProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Locations/Providers/RegionsProvider.cs index 7e140ab..2eb72ac 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Locations/Providers/RegionsProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Locations/Providers/RegionsProvider.cs @@ -16,7 +16,7 @@ namespace DamageAssesment.Api.Locations.Providers this.locationDbContext = regionDbContext; this.logger = logger; this.mapper = mapper; - SeedData(); + // SeedData(); } public async Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> GetRegionByIdAsync(int Id) @@ -166,8 +166,10 @@ namespace DamageAssesment.Api.Locations.Providers if (!locationDbContext.Regions.Any()) { locationDbContext.Regions.Add(new Db.Region() { Name = "North", Abbreviation = "N" }); - locationDbContext.Regions.Add(new Db.Region() { Name = "South", Abbreviation = "S" }); locationDbContext.Regions.Add(new Db.Region() { Name = "Central", Abbreviation = "C" }); + locationDbContext.Regions.Add(new Db.Region() { Name = "South", Abbreviation = "S" }); + locationDbContext.Regions.Add(new Db.Region() { Name = "Charter Schools", Abbreviation = "CS" }); + locationDbContext.Regions.Add(new Db.Region() { Name = "Alternate and Special Centers", Abbreviation = "AC" }); locationDbContext.SaveChanges(); } } diff --git a/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs index 850c165..92da2b1 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs @@ -19,37 +19,11 @@ namespace DamageAssesment.Api.Questions.Providers this.questionDbContext = questionDbContext; this.logger = logger; this.mapper = mapper; - SeedData(); + // SeedData(); } public void SeedData() { - - if (!questionDbContext.QuestionsTranslations.Any()) - { - questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 1, QuestionText = "Can You Open ?", Language = "en" }); - questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 1, QuestionText = "Peux-tu ouvrir ?", Language = "fr" }); - questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 1, QuestionText = "Puedes abrir ?", Language = "es" }); - questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 2, QuestionText = "Are the grounds flodded ?", Language = "en" }); - questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 2, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" }); - questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 2, QuestionText = "¿Están inundados los terrenos?", Language = "es" }); - questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 3, QuestionText = "Is the access blocked by flooding ?", Language = "en" }); - questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 3, QuestionText = "L'accès est-il bloqué par les inondations ?", Language = "fr" }); - questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 3, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "es" }); - questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Are the grounds flodded ?", Language = "en" }); - questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" }); - questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "¿Están inundados los terrenos?", Language = "es" }); - questionDbContext.SaveChanges(); - } - if (!questionDbContext.Questions.Any()) - { - questionDbContext.Questions.Add(new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=1 }); - questionDbContext.Questions.Add(new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }); - questionDbContext.Questions.Add(new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }); - questionDbContext.Questions.Add(new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }); - //questionDbContext.Questions.Add(new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 3, IsRequired = true, Comment = false, Key = true, CategoryId = 2 }); - questionDbContext.SaveChanges(); - } if (!questionDbContext.QuestionTypes.Any()) { questionDbContext.QuestionTypes.Add(new Db.QuestionType() { TypeText = "RadioButton" }); @@ -60,7 +34,7 @@ namespace DamageAssesment.Api.Questions.Providers if (!questionDbContext.QuestionCategories.Any()) { - questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Flooding", IconLibrary= "https://example.com/images/img1.png" }); + questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Flooding", IconLibrary = "https://example.com/images/img1.png" }); questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Electrical", IconLibrary = "https://example.com/images/img2.png" }); questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Structural", IconLibrary = "https://example.com/images/img3.png" }); questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Utility", IconLibrary = "https://example.com/images/img4.png" }); @@ -70,7 +44,6 @@ namespace DamageAssesment.Api.Questions.Providers if (!questionDbContext.CategoryTranslations.Any()) { - questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 1, Title = "Flooding", Language = "en" }); questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 2, Title = "Electrical", Language = "en" }); questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 3, Title = "Structural", Language = "en" }); @@ -88,6 +61,37 @@ namespace DamageAssesment.Api.Questions.Providers questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 5, Title = "Escombros", Language = "es" }); questionDbContext.SaveChanges(); } + + if (!questionDbContext.Questions.Any()) + { + var question1 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; + var question2 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }; + var question3 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; + var question4 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }; + + questionDbContext.Questions.Add(question1); + questionDbContext.Questions.Add(question2); + questionDbContext.Questions.Add(question3); + questionDbContext.Questions.Add(question4); + questionDbContext.SaveChanges(); + } + + if (!questionDbContext.QuestionsTranslations.Any()) + { + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 1, QuestionText = "Can You Open ?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 1, QuestionText = "Peux-tu ouvrir ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 1, QuestionText = "Puedes abrir ?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 2, QuestionText = "Are the grounds flooded ?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 2, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 2, QuestionText = "¿Están inundados los terrenos?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 3, QuestionText = "Is the access blocked by flooding ?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 3, QuestionText = "L'accès est-il bloqué par les inondations ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 3, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Are the grounds flooded ?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "¿Están inundados los terrenos?", Language = "es" }); + questionDbContext.SaveChanges(); + } } public List GetCategoryTranslations(int id, string? language) diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/SurveyResponsesProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/SurveyResponsesProvider.cs index 0631932..5278c5c 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/SurveyResponsesProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/SurveyResponsesProvider.cs @@ -31,23 +31,24 @@ namespace DamageAssesment.Api.Responses.Providers this.questionServiceProvider = questionServiceProvider; this.surveyServiceProvider = surveyServiceProvider; this.mapper = mapper; - seedData(); + SeedData(); } - private void seedData() + public void SeedData() { + // Check if SurveyResponses exist, if not, seed data if (!surveyResponseDbContext.SurveyResponses.Any()) { + + // Create and save SurveyResponse records with references to existing Employee and Location records surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 1, LocationId = 1, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now }); - surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 2, EmployeeId = 2, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now }); - //surveyResponseDbContext.Responses.Add(new Db.SurveyResponse { Id = 3, SurveyId = 3, EmployeeId = 4, LocationId = 1, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now }); - //surveyResponseDbContext.Responses.Add(new Db.SurveyResponse { Id = 4, SurveyId = 4, EmployeeId = 1, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "false", CreatedDate = DateTime.Now }); - //surveyResponseDbContext.Responses.Add(new Db.SurveyResponse { Id = 6, SurveyId = 1, EmployeeId = 4, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now }); - //surveyResponseDbContext.Responses.Add(new Db.SurveyResponse { Id = 7, SurveyId = 1, EmployeeId = 4, LocationId = 3, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "false", CreatedDate = DateTime.Now }); + surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 2, LocationId = 2, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now }); + surveyResponseDbContext.SaveChanges(); } } + public async Task<(bool IsSuccess, dynamic Answers, string ErrorMessage)> GetAnswersByRegionAsync(int surveyId, int employeeid) { try diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.json b/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.json index 914d671..f23b75a 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.json +++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.json @@ -16,13 +16,14 @@ // "AttachmentUrlBase": "http://localhost:5243", // "SurveyUrlBase": "http://localhost:5009" //}, + //Endpoints for docker-container "EndPointSettings": { "AnswerUrlBase": "http://damageassesment.api.answers:80", "LocationUrlBase": "http://damageassesment.api.locations:80", "QuestionUrlBase": "http://damageassesment.api.questions:80", "EmployeeUrlBase": "http://damageassesment.api.employees:80", "AttachmentUrlBase": "http://damageassesment.api.attachments:80", - "SurveyUrlBase": "http://damageassesment.api.survey:80" + "SurveyUrlBase": "http://damageassesment.api.surveys:80" }, "RessourceSettings": { diff --git a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs index 3d08544..2d6cbc9 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs @@ -18,39 +18,44 @@ namespace DamageAssesment.Api.Surveys.Providers this.surveyDbContext = surveysDbContext; this.logger = logger; this.mapper = mapper; - seedData(); + //seedData(); } + // Method to seed initial data into the database public void seedData() { if (!surveyDbContext.Surveys.Any()) { - surveyDbContext.Surveys.Add(new Db.Survey {IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }); - surveyDbContext.Surveys.Add(new Db.Survey { IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }); - //surveyDbContext.Surveys.Add(new Db.Survey { Id = 2, IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }); - //surveyDbContext.Surveys.Add(new Db.Survey { Id = 3, IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }); - surveyDbContext.SaveChangesAsync(); - } + var survey1 = new Db.Survey { IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }; + var survey2 = new Db.Survey { IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }; + var survey3 = new Db.Survey { IsEnabled = false, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }; - if (!surveyDbContext.SurveysTranslation.Any()) - { - surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 1, Language = "en", Title = "Impact of Tropical Storm Emily on Florida's Economy" }); - surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 1, Language = "es", Title = "Impacto de la tormenta tropical Emily en la economía de Florida" }); - surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 1, Language = "fr", Title = "Impact de la tempête tropicale Emily sur l'économie de la Floride" }); + surveyDbContext.Surveys.Add(survey1); + surveyDbContext.Surveys.Add(survey2); + surveyDbContext.Surveys.Add(survey3); + surveyDbContext.SaveChanges(); - surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 2, Language = "en", Title = "Hurricane Andrew Aftermath Survey" }); - surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 2, Language = "es", Title = "Encuesta sobre las secuelas del huracán Andrew" }); - surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 2, Language = "fr", Title = "Enquête sur les conséquences de l'ouragan Andrew" }); + if (!surveyDbContext.SurveysTranslation.Any()) + { + surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey1.Id, Language = "en", Title = "Impact of Tropical Storm Emily on Florida's Economy" }); + surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey1.Id, Language = "es", Title = "Impacto de la tormenta tropical Emily en la economía de Florida" }); + surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey1.Id, Language = "fr", Title = "Impact de la tempête tropicale Emily sur l'économie de la Floride" }); - //surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { Id = 7, SurveyId = 3, Language = "en", Title = "Public Perception of Hurricane Michael's Response" }); - //surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { Id = 8, SurveyId = 3, Language = "es", Title = "Percepción pública de la respuesta del huracán Michael" }); - //surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { Id = 9, SurveyId = 3, Language = "fr", Title = "Perception du public de la réponse de l'ouragan Michael" }); + surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey2.Id, Language = "en", Title = "Hurricane Andrew Aftermath Survey" }); + surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey2.Id, Language = "es", Title = "Encuesta sobre las secuelas del huracán Andrew" }); + surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey2.Id, Language = "fr", Title = "Enquête sur les conséquences de l'ouragan Andrew" }); + + surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "en", Title = "Hurricane Idalia Aftermath Survey" }); + surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "es", Title = "Encuesta sobre las secuelas del huracán Idalia" }); + surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "fr", Title = "Enquête sur les conséquences de l'ouragan Idalia" }); - surveyDbContext.SaveChangesAsync(); + surveyDbContext.SaveChanges(); + } } } - public IEnumerable GetSurveyTranslations(int id, IEnumerable SurveyTranslation,string? language) + // Method to get survey translations for a given survey ID and language + public IEnumerable GetSurveyTranslations(int id, IEnumerable SurveyTranslation, string? language) { if (SurveyTranslation == null) { @@ -67,6 +72,8 @@ namespace DamageAssesment.Api.Surveys.Providers } return SurveyTranslation; } + + // Method to create a multi-language object from survey translations public object CreateMultiLanguageObject(IEnumerable surveyTranslations) { object MultiLanguage = new object(); @@ -78,28 +85,27 @@ namespace DamageAssesment.Api.Surveys.Providers MultiLanguage = dict; return MultiLanguage; } + + // Method to get surveys asynchronously with multi-language support public async Task<(bool IsSuccess, IEnumerable Surveys, string ErrorMessage)> GetSurveysAsync(string language) { IEnumerable surveysList = null; try { - logger?.LogInformation("Gell all Surveys from DB"); + logger?.LogInformation("Get all Surveys from DB"); var surveys = await surveyDbContext.Surveys.Where(s => s.IsEnabled == true).ToListAsync(); - //var surveyTranslations = await surveyDbContext.SurveysTranslation.ToListAsync(); if (surveys != null) { surveysList = from s in surveys - select new - Models.MultiLanSurvey + select new Models.MultiLanSurvey { Id = s.Id, StartDate = s.StartDate, EndDate = s.EndDate, IsEnabled = s.IsEnabled, CreatedDate = s.CreatedDate, - Titles = CreateMultiLanguageObject(GetSurveyTranslations(s.Id,null, language)) - + Titles = CreateMultiLanguageObject(GetSurveyTranslations(s.Id, null, language)) }; logger?.LogInformation($"{surveys.Count} Items(s) found"); @@ -113,12 +119,15 @@ namespace DamageAssesment.Api.Surveys.Providers return (false, null, ex.Message); } } + + // Method to get a specific survey by ID asynchronously with multi-language support public async Task<(bool IsSuccess, Models.MultiLanSurvey Surveys, string ErrorMessage)> GetSurveysAsync(int id, string language) { try { logger?.LogInformation("Query Survey"); var survey = await surveyDbContext.Surveys.SingleOrDefaultAsync(s => s.Id == id && s.IsEnabled == true); + if (survey != null) { Models.MultiLanSurvey result = null; @@ -130,8 +139,7 @@ namespace DamageAssesment.Api.Surveys.Providers EndDate = survey.EndDate, IsEnabled = survey.IsEnabled, CreatedDate = survey.CreatedDate, - Titles = CreateMultiLanguageObject(GetSurveyTranslations(survey.Id,null, language)) - + Titles = CreateMultiLanguageObject(GetSurveyTranslations(survey.Id, null, language)) }; logger?.LogInformation($"Survey Id: {id} found"); return (true, result, null); @@ -145,6 +153,7 @@ namespace DamageAssesment.Api.Surveys.Providers } } + // Method to create a new survey asynchronously with multi-language support public async Task<(bool IsSuccess, Models.MultiLanSurvey Survey, string ErrorMessage)> PostSurveyAsync(Models.Survey survey) { try @@ -156,14 +165,14 @@ namespace DamageAssesment.Api.Surveys.Providers surveyDbContext.Surveys.Add(_survey); await surveyDbContext.SaveChangesAsync(); - + foreach (var title in survey.Titles) { - surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation {SurveyId = _survey.Id, Language = title.Language, Title = title.Title }); + surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = _survey.Id, Language = title.Language, Title = title.Title }); } await surveyDbContext.SaveChangesAsync(); var result = mapper.Map(_survey); - result.Titles = CreateMultiLanguageObject(GetSurveyTranslations(_survey.Id, survey.Titles, "")); + result.Titles = CreateMultiLanguageObject(GetSurveyTranslations(_survey.Id, survey.Titles, "")); return (true, result, "Successful"); } else @@ -179,6 +188,7 @@ namespace DamageAssesment.Api.Surveys.Providers } } + // Method to update an existing survey asynchronously with multi-language support public async Task<(bool IsSuccess, Models.MultiLanSurvey Survey, string ErrorMessage)> PutSurveyAsync(int Id, Models.Survey survey) { try @@ -228,6 +238,7 @@ namespace DamageAssesment.Api.Surveys.Providers } } + // Method to delete a survey by ID asynchronously with multi-language support public async Task<(bool IsSuccess, Models.MultiLanSurvey Survey, string ErrorMessage)> DeleteSurveyAsync(int Id) { try @@ -240,7 +251,7 @@ namespace DamageAssesment.Api.Surveys.Providers result.Titles = CreateMultiLanguageObject(GetSurveyTranslations(survey.Id, null, "")); surveyDbContext.Surveys.Remove(survey); await surveyDbContext.SaveChangesAsync(); - return (true, result, $"Survey Id: {Id} deleted Successfuly"); + return (true, result, $"Survey Id: {Id} deleted Successfully"); } else { diff --git a/DamageAssesmentApi/docker-compose.yml b/DamageAssesmentApi/docker-compose.yml index f421f5a..0e6f487 100644 --- a/DamageAssesmentApi/docker-compose.yml +++ b/DamageAssesmentApi/docker-compose.yml @@ -34,14 +34,7 @@ services: context: . dockerfile: DamageAssesment.Api.Questions/Dockerfile - - # damageassesment.api.surveyresponses: - # image: ${DOCKER_REGISTRY-}damageassesmentapisurveyresponses - # build: - # context: . - # dockerfile: DamageAssesment.Api.SurveyResponses/Dockerfile - - + damageassesment.api.surveys: image: ${DOCKER_REGISTRY-}damageassesmentapisurveys build: From 39119808423e9c576e1aa0996f70f1db8f481eb0 Mon Sep 17 00:00:00 2001 From: uppuv Date: Mon, 9 Oct 2023 20:38:35 -0400 Subject: [PATCH 26/30] doculink changes for grouping moving to docker branch --- .../DoculinkServiceTest.cs | 34 +++++++++++-- .../MockData.cs | 49 +++++++++++++++++- .../Controllers/DoculinkController.cs | 16 +++++- .../Interfaces/IDoculinkProvider.cs | 3 +- .../Models/Doculink.cs | 5 ++ .../Providers/DoculinkProvider.cs | 51 +++++++++++++++++-- 6 files changed, 148 insertions(+), 10 deletions(-) diff --git a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DoculinkServiceTest.cs b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DoculinkServiceTest.cs index b953eeb..14ddaaa 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DoculinkServiceTest.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DoculinkServiceTest.cs @@ -16,7 +16,7 @@ namespace DamageAssesment.Api.DocuLinks.Test { var mockDocumentService = new Mock(); var mockUploadService = new Mock(); - var mockResponse = await MockData.getNoContentResponse(); + var mockResponse = await MockData.getNoContentResponses(); mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en",null)).ReturnsAsync(mockResponse); var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); @@ -30,7 +30,7 @@ namespace DamageAssesment.Api.DocuLinks.Test { var mockDocumentService = new Mock(); var mockUploadService = new Mock(); - var mockResponse = await MockData.getNoContentResponse(); + var mockResponse = await MockData.getNoContentResponses(); mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", true)).ReturnsAsync(mockResponse); var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); @@ -43,7 +43,7 @@ namespace DamageAssesment.Api.DocuLinks.Test { var mockDocumentService = new Mock(); var mockUploadService = new Mock(); - var mockResponse = await MockData.getOkResponse(); + var mockResponse = await MockData.getOkResponses(); mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en", null)).ReturnsAsync(mockResponse); var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); @@ -56,7 +56,7 @@ namespace DamageAssesment.Api.DocuLinks.Test { var mockDocumentService = new Mock(); var mockUploadService = new Mock(); - var mockResponse = await MockData.getOkResponse(); + var mockResponse = await MockData.getOkResponses(); mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", true)).ReturnsAsync(mockResponse); var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); @@ -65,6 +65,32 @@ namespace DamageAssesment.Api.DocuLinks.Test Assert.Equal(200, result.StatusCode); } + [Fact(DisplayName = "Get active Documents by linktypeid - Ok case")] + public async Task GetActiveDocumentsLinkTypeIdAsync_ShouldReturnStatusCode200() + { + var mockDocumentService = new Mock(); + var mockUploadService = new Mock(); + 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(); + var mockUploadService = new Mock(); + var mockResponse = await MockData.getNoContentResponses(); + mockDocumentService.Setup(service => service.GetdocumentsByLinkTypeIdAsync(null, "en", true)).ReturnsAsync(mockResponse); + + var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); + var result = (NoContentResult)await DocumentProvider.GetDocumentsByActiveLinkTypeIdAsync(null, ""); + + Assert.Equal(204, result.StatusCode); + } [Fact(DisplayName = "Get Document by Id - Ok case")] public async Task GetDocumentAsync_ShouldReturnStatusCode200() { diff --git a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/MockData.cs b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/MockData.cs index bd10e4b..23ffae4 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/MockData.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/MockData.cs @@ -11,7 +11,7 @@ namespace DamageAssesment.Api.DocuLinks.Test public class MockData { - public static async Task<(bool, List, string)> getOkResponse() + public static async Task<(bool, List, string)> getOkResponses() { List list = new List(); @@ -46,6 +46,48 @@ namespace DamageAssesment.Api.DocuLinks.Test doclinksAttachments= doclinksAttachments }); } + List doculinks = list.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList(); + return (true, doculinks, null); + } + + + public static async Task<(bool, List, string)> getOkResponse() + { + List list = new List(); + + for (int i = 1; i < 4; i++) + { + Dictionary dicttitle = new Dictionary(); + Dictionary dictdesc = new Dictionary(); + dicttitle.Add("en", "test"); dicttitle.Add("fr", "tester"); + dictdesc.Add("en", "test"); dictdesc.Add("fr", "tester"); + List DocuLinksTranslations = new List(); + DocuLinksTranslations.Add(new DoculinkTranslation() + { + Language = "en", + title = "tel" + i, + description = "Sample" + i + }); + List doclinksAttachments = new List(); + 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) @@ -64,6 +106,11 @@ namespace DamageAssesment.Api.DocuLinks.Test { return (false, null, "Not Found"); } + public static async Task<(bool, IEnumerable, string)> getNoContentResponses() + { + IEnumerable list = new List(); + return (false, list, null); + } public static async Task<(bool, IEnumerable, string)> getNoContentResponse() { IEnumerable list = new List(); diff --git a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Controllers/DoculinkController.cs b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Controllers/DoculinkController.cs index cfbd508..99d00a8 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Controllers/DoculinkController.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Controllers/DoculinkController.cs @@ -136,7 +136,21 @@ namespace DamageAssesment.Api.DocuLinks.Controllers } return NoContent(); } - + /// + /// Get all active Doculink. + /// + [Route("doculinks/active/{linktypeid:int}")] + [Route("doculinks/active/{linktypeid:int}/{language:alpha}")] + [HttpGet] + public async Task GetDocumentsByActiveLinkTypeIdAsync(int? linktypeid, string? language) + { + var result = await this.documentsProvider.GetdocumentsByLinkTypeIdAsync(linktypeid, language, true); + if (result.IsSuccess) + { + return Ok(result.documents); + } + return NoContent(); + } /// /// Get a Doculink by id. /// diff --git a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Interfaces/IDoculinkProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Interfaces/IDoculinkProvider.cs index f4f9c84..6d271fd 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Interfaces/IDoculinkProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Interfaces/IDoculinkProvider.cs @@ -7,7 +7,8 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> GetDocumentAsync(int id, string? linktype, string? language); Task<(bool IsSuccess, Models.Doculink Document, string ErrorMessage)> GetDocumentByidAsync(int id); // Task<(bool IsSuccess, IEnumerable documents, string ErrorMessage)> GetDocumnetsAsync(string? language); - Task<(bool IsSuccess, IEnumerable documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive); + Task<(bool IsSuccess, IEnumerable documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive); + Task<(bool IsSuccess, IEnumerable 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); diff --git a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Models/Doculink.cs b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Models/Doculink.cs index 6fb538b..33259e1 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Models/Doculink.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Models/Doculink.cs @@ -7,6 +7,11 @@ namespace DamageAssesment.Api.DocuLinks.Models { public List documentsTranslations { get; set; } } + public class ResDoculinks + { + public int linkTypeId { get; set; } + public List doculinks { get; set; } + } public class ResDoculink:BaseDoculink { public object titles { get; set; } diff --git a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs index 5ae15b1..81535ab 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs @@ -6,8 +6,10 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Internal; using System; +using System.Collections.Immutable; using System.Diagnostics.Eventing.Reader; using System.Reflection.Metadata; +using System.Xml; using System.Xml.Linq; namespace DamageAssesment.Api.DocuLinks.Providers @@ -63,12 +65,17 @@ namespace DamageAssesment.Api.DocuLinks.Providers int counter = 0; for (int i = 1; i <= 4; i++) { + int linkTypeId = 2; FileModel fileModel = new FileModel(); if (i < 3) + { + linkTypeId = 1; + fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1 }; + } else fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1 }; - ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i, CustomOrder = i, Files = new List() { fileModel } }; + ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = linkTypeId, CustomOrder = i, Files = new List() { fileModel } }; Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo); DocumentDbContext.Documents.Add(mapper.Map(document)); DocumentDbContext.SaveChanges(); @@ -163,7 +170,44 @@ namespace DamageAssesment.Api.DocuLinks.Providers MultiLanguage = dicttitle; return MultiLanguage; } - public async Task<(bool IsSuccess, IEnumerable documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive) + + public async Task<(bool IsSuccess, IEnumerable documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive) + { + + try + { + logger?.LogInformation("Query Question"); + var documents = new List(); + 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>(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 = mapper.Map, List>( + DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList()); + } + List doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList(); + return (true, doculinks, null); + } + return (false, null, "Not found"); + } + catch (Exception ex) + { + logger?.LogError(ex.ToString()); + return (false, null, ex.Message); + } + + } + public async Task<(bool IsSuccess, IEnumerable documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive) { try @@ -187,7 +231,8 @@ namespace DamageAssesment.Api.DocuLinks.Providers item.doclinksAttachments = mapper.Map, List>( DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList()); } - return (true, result, null); + List doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList(); + return (true, doculinks, null); } return (false, null, "Not found"); } From fa3e3bbd990c3e8f933f7fa8f861601537e54b95 Mon Sep 17 00:00:00 2001 From: uppuv Date: Wed, 11 Oct 2023 15:33:10 -0400 Subject: [PATCH 27/30] added seed data for questions and surveys for demo --- .../Providers/DoculinkProvider.cs | 2 +- .../Providers/QuestionsProvider.cs | 95 +++++++++++++++++++ .../Providers/SurveysProvider.cs | 8 +- 3 files changed, 100 insertions(+), 5 deletions(-) diff --git a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs index 81535ab..371b8b3 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs @@ -75,7 +75,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers } else fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1 }; - ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = linkTypeId, CustomOrder = i, Files = new List() { fileModel } }; + ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i, CustomOrder = i, Files = new List() { fileModel } }; Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo); DocumentDbContext.Documents.Add(mapper.Map(document)); DocumentDbContext.SaveChanges(); diff --git a/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs index 92da2b1..aba4e48 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs @@ -68,11 +68,48 @@ namespace DamageAssesment.Api.Questions.Providers var question2 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }; var question3 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; var question4 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }; + var question5 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; + var question6 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }; + var question7 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; + var question8 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }; + var question9 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = true, Key = true, CategoryId = 1 }; + var question10 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = false, Key = true, CategoryId = 1 }; + var question11 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 1 }; + var question12 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 1 }; + var question13 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; + var question14 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }; + var question15 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 1 }; + var question16 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 1 }; + var question17 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 1 }; + var question18 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }; + var question19 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; + var question20 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }; + var question21 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; + var question22 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 1 }; questionDbContext.Questions.Add(question1); questionDbContext.Questions.Add(question2); questionDbContext.Questions.Add(question3); questionDbContext.Questions.Add(question4); + questionDbContext.Questions.Add(question5); + questionDbContext.Questions.Add(question6); + questionDbContext.Questions.Add(question7); + questionDbContext.Questions.Add(question8); + questionDbContext.Questions.Add(question9); + questionDbContext.Questions.Add(question10); + questionDbContext.Questions.Add(question11); + questionDbContext.Questions.Add(question12); + questionDbContext.Questions.Add(question13); + questionDbContext.Questions.Add(question14); + questionDbContext.Questions.Add(question15); + questionDbContext.Questions.Add(question16); + questionDbContext.Questions.Add(question17); + questionDbContext.Questions.Add(question18); + questionDbContext.Questions.Add(question19); + questionDbContext.Questions.Add(question20); + questionDbContext.Questions.Add(question21); + questionDbContext.Questions.Add(question22); + questionDbContext.SaveChanges(); } @@ -90,6 +127,64 @@ namespace DamageAssesment.Api.Questions.Providers questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Are the grounds flooded ?", Language = "en" }); questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" }); questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "¿Están inundados los terrenos?", Language = "es" }); + + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "Can you open?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "Is debris blocking access?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "Are the grounds flooded?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "Is the access blocked by flooding?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "Are any utility wires down?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "Do you have damage to windows, doors, or walls?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "Do you have roof damage?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "Do you have major water intrusion?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "Are any portable classrooms damaged and unusable?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "Does your facility need to be secured/boarded?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "Are you without commercial power?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "Are you without water pressure?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "Are you without telephones?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "Are traffic signals damaged/missing?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "Are you without an operable fire alarm?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "Are you without an operable public address?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "Do you have major debris?", Language = "en" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "Are there any problems or issues not addressed above that would impede you from opening? If yes, please explain below?", Language = "en" }); + + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "Pouvez-vous ouvrir ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "Est-ce que des débris bloquent l'accès ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "L'accès est-il bloqué par des inondations ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "Des câbles d'utilité sont-ils tombés ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "Avez-vous des dommages aux fenêtres, portes ou murs ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "Avez-vous des dommages au toit ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "Avez-vous une intrusion d'eau majeure ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "Les salles de classe portables sont-elles endommagées et inutilisables ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "Votre établissement a-t-il besoin d'être sécurisé/protégé ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "Êtes-vous sans alimentation électrique commerciale ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "Êtes-vous sans pression d'eau ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "Êtes-vous sans téléphones ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "Les feux de circulation sont-ils endommagés/absents ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "N'avez-vous pas d'alarme incendie fonctionnelle ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "N'avez-vous pas de système de sonorisation opérationnel ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "Avez-vous une grande quantité de débris ?", Language = "fr" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "Y a-t-il des problèmes ou des problèmes non abordés ci-dessus qui vous empêcheraient d'ouvrir ? Si oui, veuillez expliquer ci-dessous.", Language = "fr" }); + + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "¿Puedes abrir ?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "¿Los escombros bloquean el acceso?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "¿Están inundados los terrenos?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "¿Hay cables de utilidad caídos?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "¿Tienes daños en ventanas, puertas o paredes?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "¿Tienes daños en el techo?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "¿Tienes una gran intrusión de agua?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "¿Hay aulas portátiles dañadas e inutilizables?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "¿Tu instalación necesita ser asegurada/tabicada?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "¿No tienes energía comercial?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "¿No tienes presión de agua?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "¿No tienes teléfonos?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "¿Los semáforos están dañados/faltan?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "¿No tienes una alarma de incendios operativa?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "¿No tienes un sistema de megafonía operativo?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "¿Tienes una gran cantidad de escombros?", Language = "es" }); + questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "¿Hay algún problema o asunto no abordado anteriormente que le impida abrir? Si es así, por favor explíquelo a continuación.", Language = "es" }); + questionDbContext.SaveChanges(); } } diff --git a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs index 2d6cbc9..3332f6d 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs @@ -28,7 +28,7 @@ namespace DamageAssesment.Api.Surveys.Providers { var survey1 = new Db.Survey { IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }; var survey2 = new Db.Survey { IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }; - var survey3 = new Db.Survey { IsEnabled = false, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }; + var survey3 = new Db.Survey { IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now }; surveyDbContext.Surveys.Add(survey1); surveyDbContext.Surveys.Add(survey2); @@ -45,9 +45,9 @@ namespace DamageAssesment.Api.Surveys.Providers surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey2.Id, Language = "es", Title = "Encuesta sobre las secuelas del huracán Andrew" }); surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey2.Id, Language = "fr", Title = "Enquête sur les conséquences de l'ouragan Andrew" }); - surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "en", Title = "Hurricane Idalia Aftermath Survey" }); - surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "es", Title = "Encuesta sobre las secuelas del huracán Idalia" }); - surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "fr", Title = "Enquête sur les conséquences de l'ouragan Idalia" }); + surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "en", Title = "Hurricane Irma" }); + surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "es", Title = "Huracán Irma" }); + surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "fr", Title = "Ouragan Irma" }); surveyDbContext.SaveChanges(); } From 885fdeb1172d86d00118789439c6a5a68edbef8a Mon Sep 17 00:00:00 2001 From: uppuv Date: Wed, 11 Oct 2023 19:24:50 -0400 Subject: [PATCH 28/30] updated question category --- .../Providers/QuestionsProvider.cs | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs index aba4e48..5a010fa 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs @@ -65,27 +65,27 @@ namespace DamageAssesment.Api.Questions.Providers if (!questionDbContext.Questions.Any()) { var question1 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; - var question2 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }; + var question2 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 }; var question3 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; - var question4 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }; + var question4 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 }; var question5 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; - var question6 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }; - var question7 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; - var question8 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }; - var question9 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = true, Key = true, CategoryId = 1 }; + var question6 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 }; + var question7 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 3}; + var question8 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 4 }; + var question9 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = true, Key = true, CategoryId = 5 }; var question10 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = false, Key = true, CategoryId = 1 }; - var question11 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 1 }; - var question12 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 1 }; - var question13 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; - var question14 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }; + var question11 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 2 }; + var question12 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 3 }; + var question13 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 4 }; + var question14 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 5 }; var question15 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 1 }; - var question16 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 1 }; - var question17 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 1 }; - var question18 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }; - var question19 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; + var question16 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 2 }; + var question17 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 3 }; + var question18 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 4 }; + var question19 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 5 }; var question20 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }; - var question21 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; - var question22 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 1 }; + var question21 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 2 }; + var question22 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 3 }; questionDbContext.Questions.Add(question1); questionDbContext.Questions.Add(question2); From 26e79432e2cb02daa37b9669c4bb9c58c020be31 Mon Sep 17 00:00:00 2001 From: uppuv Date: Thu, 12 Oct 2023 16:01:24 -0400 Subject: [PATCH 29/30] table name changes --- .vs/Backend-API-Services/v17/.wsuo | Bin 0 -> 11264 bytes .vs/VSWorkspaceState.json | 7 +++++++ .../DamageAssesment.Api.Answers/Db/Answer.cs | 1 + .../Db/Attachment.cs | 1 + .../Db/Doculink.cs | 1 + .../Db/DoculinkAttachments.cs | 1 + .../Db/DoculinkTranslation.cs | 1 + .../Db/LinkType.cs | 2 ++ .../Db/LinksTranslation.cs | 1 + .../Db/Employee.cs | 2 ++ .../Db/Location.cs | 1 + .../DamageAssesment.Api.Locations/Db/Region.cs | 2 ++ .../Db/CategoryTranslation.cs | 1 + .../Db/Question.cs | 1 + .../Db/QuestionCategory.cs | 2 ++ .../Db/QuestionType.cs | 2 ++ .../Db/QuestionsTranslation.cs | 1 + .../Db/SurveyResponse.cs | 1 + .../DamageAssesment.Api.Surveys/Db/Survey.cs | 1 + .../Db/SurveyTranslation.cs | 1 + 20 files changed, 30 insertions(+) create mode 100644 .vs/Backend-API-Services/v17/.wsuo create mode 100644 .vs/VSWorkspaceState.json diff --git a/.vs/Backend-API-Services/v17/.wsuo b/.vs/Backend-API-Services/v17/.wsuo new file mode 100644 index 0000000000000000000000000000000000000000..f4f848c44f6b2976f17d057405bd81e8b92e3b7f GIT binary patch literal 11264 zcmeHNOK%%h6h3Y#P|B;M1SnM%RS~LM99-H4w}>hsZE2*2ggR-EC=1&&d62}m#uG}H ztPuiMtWbpnn=X*LV@v-)Sg@fh_yuf{P!qoIdaivvo|(*yQ<@MTYdrV;-FqJQo_p+H z*AD*i{oTWVijOYHURmGRFOM7L86z#vi#&@w%hoqGHdw_pl0Di%9JnS`d|VljOH#qx zky{jHZ0eVNO_}f8q}SJX2HkJ|`8{(0?M9wxG@b%tRX&k%pwA(7Nj}?Tl=kX=+0(=) z+uLh{b4O4N^;M+tiCdFp%)k*FPXW9r;<3GUVXr~ilQG2|*3K+{4w>J)f=O8g%CanC z{e0#P+nBJe<7erM-lypoL4$2C3t@mKyy57`dsux>vCQ49ew=; z$AC|NQtwIr`k*}bw-a8)7*<~d7SR@ge6wQ~K_j%v;D5F4d99l86zxOTUIbcv%*ZtLsJ)?|~Hfyth#Xq<10jsw~M0a2>qk`n`?bB1gb~-urk~(0p`x)cYk= z9`_ndEAB7JRdBx!sTZ(v`rxjVl~!)X1Ny&vF_u1iqHuLxKN39CNc8)uaSn8@2wk|0 zc`Pg5>zjd%nYf`^aXtnA+vQ(XD_sF5wSE@(6|umBn=*y(I`S?a+GY?ha#+9i$>Z|> zMXdX*TD^#0|G0kQb6=qSmocv>dJXv0C++`7wbgaxz1F{Q{9Dk;5@xZiy9K_1zoqs! zf%UEcmG@v%7D2q{gs}f5#;30}?XAYY{sty3p>Y!(#jUi4{gLvgCa~0`Vep@Fr%dC@ zpS~UMj3jf76R-eUL1QNxg3hlho2-H(?*W$@QIq%4g4){P$OYiPf^le5aq+od(3c>^ z#h(T`b%C}}Gb{o2mmxn7S!T-~P_+rr8m8B+Rho{K}+p{iK9rFMc< z@X6&cg7qhsKl!EipCtG^r(EpVJe4b$^#aBjNr6vZanB$XuwL%`9F1B=glj0H-E)l} zK<4BK&&GOlmu~dscOLkRAuy&8m;dJe7bX8GpjPm)!S%~()h)dvHVOKlnE%v$E&nL| z>uTjLY_*7;NS{#bVSzIXN(;gN4DXX%JBf4JjCfw@{VxiC78sPmBs89H^1)AUrdU5? zMf(0rTigm7KlS(7+drS=(VmE`YI(_avL&ZjDKDhx|5e``w?9Aeg_{;X(PaOJjcEtn z=s>sqsfXR*(~j7`HAZa&+1S+W{9^+}G^9QHshcwYSPwIwF*u(FNBbdZ`mzt@Ucxgb z=jDdXz^}c56S9c&Yf0^ymSklV=leL`JnI~F%JX!qCu&KoAfoT_k$fCf6|1bJx3QXc zG~zklv?02N+8Aho_8tk~i*JS{)4D#|6{8)ZRQCO_*Va5N5*Q4#jfnNM)cgKGwaNC=~j^U334;YcK zsQn{N{Dt==egBFYJ8qq6O>z5dWxJh>?~gyFi2teo0X@R_pNfC+KOK}q9J!kD2mkta zTl~+zenyuV5n6&rSXJ>C*NFXfMnMsOQ2gh`KQ902vudv=4t^(UOUlQAPyd(kw7B^E zy{O_1;m7Ci0lXd5-~)z7-M!9uG5$?lO|6>n6xXife?j<-U%)KP!cxCaM9qisU+$%S zcsPe})K(3Ds|myJ$v?6D72kKN{M&CMEgeakN*jOcHvUK5XZ)F(pC Date: Fri, 13 Oct 2023 13:21:33 -0400 Subject: [PATCH 30/30] added muilti language return format for question categories for question by survey --- .../appsettings.Development.json | 8 -------- .../appsettings.Development.json | 8 -------- .../appsettings.Development.json | 8 -------- .../appsettings.Development.json | 8 -------- .../appsettings.Development.json | 8 -------- .../Models/SurveyQuestion.cs | 1 + .../Providers/QuestionsProvider.cs | 1 + .../appsettings.Development.json | 8 -------- .../appsettings.Development.json | 8 -------- 9 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 DamageAssesmentApi/DamageAssesment.Api.Answers/appsettings.Development.json delete mode 100644 DamageAssesmentApi/DamageAssesment.Api.Attachments/appsettings.Development.json delete mode 100644 DamageAssesmentApi/DamageAssesment.Api.DocuLinks/appsettings.Development.json delete mode 100644 DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.Development.json delete mode 100644 DamageAssesmentApi/DamageAssesment.Api.Locations/appsettings.Development.json delete mode 100644 DamageAssesmentApi/DamageAssesment.Api.Questions/appsettings.Development.json delete mode 100644 DamageAssesmentApi/DamageAssesment.Api.Surveys/appsettings.Development.json diff --git a/DamageAssesmentApi/DamageAssesment.Api.Answers/appsettings.Development.json b/DamageAssesmentApi/DamageAssesment.Api.Answers/appsettings.Development.json deleted file mode 100644 index 0c208ae..0000000 --- a/DamageAssesmentApi/DamageAssesment.Api.Answers/appsettings.Development.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - } -} diff --git a/DamageAssesmentApi/DamageAssesment.Api.Attachments/appsettings.Development.json b/DamageAssesmentApi/DamageAssesment.Api.Attachments/appsettings.Development.json deleted file mode 100644 index 0c208ae..0000000 --- a/DamageAssesmentApi/DamageAssesment.Api.Attachments/appsettings.Development.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - } -} diff --git a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/appsettings.Development.json b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/appsettings.Development.json deleted file mode 100644 index 0c208ae..0000000 --- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/appsettings.Development.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - } -} diff --git a/DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.Development.json b/DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.Development.json deleted file mode 100644 index 0c208ae..0000000 --- a/DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.Development.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - } -} diff --git a/DamageAssesmentApi/DamageAssesment.Api.Locations/appsettings.Development.json b/DamageAssesmentApi/DamageAssesment.Api.Locations/appsettings.Development.json deleted file mode 100644 index 0c208ae..0000000 --- a/DamageAssesmentApi/DamageAssesment.Api.Locations/appsettings.Development.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - } -} diff --git a/DamageAssesmentApi/DamageAssesment.Api.Questions/Models/SurveyQuestion.cs b/DamageAssesmentApi/DamageAssesment.Api.Questions/Models/SurveyQuestion.cs index 8f4fd7b..b7ce8d1 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Models/SurveyQuestion.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Models/SurveyQuestion.cs @@ -5,6 +5,7 @@ public int CategoryId { get; set; } public string IconName { get; set; } public string IconLibrary { get; set; } + public object CategoryNames { get; set; } public List QuestionsText { get; set; } } } diff --git a/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs b/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs index 5a010fa..45f6ecf 100644 --- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs +++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs @@ -314,6 +314,7 @@ namespace DamageAssesment.Api.Questions.Providers CategoryId = item.Id, IconLibrary = item.IconLibrary, IconName = item.IconName, + CategoryNames= CreateCategoryMultiLanguageObject(GetCategoryTranslations(item.Id, language)), QuestionsText = GetSurveyQuestion(mapper.Map, List>(questions.Where(a => a.CategoryId == item.Id).ToList()), language) }); } diff --git a/DamageAssesmentApi/DamageAssesment.Api.Questions/appsettings.Development.json b/DamageAssesmentApi/DamageAssesment.Api.Questions/appsettings.Development.json deleted file mode 100644 index 0c208ae..0000000 --- a/DamageAssesmentApi/DamageAssesment.Api.Questions/appsettings.Development.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - } -} diff --git a/DamageAssesmentApi/DamageAssesment.Api.Surveys/appsettings.Development.json b/DamageAssesmentApi/DamageAssesment.Api.Surveys/appsettings.Development.json deleted file mode 100644 index 0c208ae..0000000 --- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/appsettings.Development.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - } -}