Merge pull request #16 from BME-MIT-IET/Performance-testing

Performance testing
BME-MIT-IET · May 16, 2024 · 30f722d · 30f722d
2 parents fa470a3 + f53459d
commit 30f722d
Show file tree

Hide file tree

Showing 66 changed files with 297 additions and 1,882 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,5 @@
+
+Gombahaz/.vs/
+Gombahaz/obj/
+Gombahaz/.vs/Gombahaz/FileContentIndex/
+Gombahaz/.vs/Gombahaz/v17/
diff --git a/Doc/Teljesítmény-teszt.md b/Doc/Teljesítmény-teszt.md
@@ -0,0 +1,6 @@
+
+## Teljesítmény-teszt
+
+**Szendrey Máté, Kovács Zoltán**
+
+A választott alkalmazás, vizsgálata, a REST APIn keresztül teljesítmény szempontból. Változatos tesztek elvégzése, és ezek dokumentálása egy jegyzőkönyvben. Minden további leírás a munkáról a /Teljesítmény-teszt/Performance-test.md fájlban található.
diff --git a/Gombahaz/.vs/Gombahaz/DesignTimeBuild/.dtbcache.v2 b/Gombahaz/.vs/Gombahaz/DesignTimeBuild/.dtbcache.v2
diff --git a/Gombahaz/.vs/Gombahaz/FileContentIndex/41c777b6-17ba-4d19-b1ad-e292654ac13f.vsidx b/Gombahaz/.vs/Gombahaz/FileContentIndex/41c777b6-17ba-4d19-b1ad-e292654ac13f.vsidx
diff --git a/Gombahaz/.vs/Gombahaz/config/applicationhost.config b/Gombahaz/.vs/Gombahaz/config/applicationhost.config
diff --git a/Gombahaz/.vs/Gombahaz/v17/.futdcache.v2 b/Gombahaz/.vs/Gombahaz/v17/.futdcache.v2
diff --git a/Gombahaz/.vs/Gombahaz/v17/.suo b/Gombahaz/.vs/Gombahaz/v17/.suo
diff --git a/Gombahaz/.vs/Gombahaz/v17/DocumentLayout.json b/Gombahaz/.vs/Gombahaz/v17/DocumentLayout.json
diff --git a/Gombahaz/.vs/ProjectEvaluation/gombahaz.metadata.v7.bin b/Gombahaz/.vs/ProjectEvaluation/gombahaz.metadata.v7.bin
diff --git a/Gombahaz/.vs/ProjectEvaluation/gombahaz.projects.v7.bin b/Gombahaz/.vs/ProjectEvaluation/gombahaz.projects.v7.bin
diff --git a/Gombahaz/.vs/sd/372273ee-8457-4611-a178-a71ce5146765/.run/postgresql1.docker-compose.yml b/Gombahaz/.vs/sd/372273ee-8457-4611-a178-a71ce5146765/.run/postgresql1.docker-compose.yml
diff --git a/Gombahaz/Gombahaz/Controllers/ResourceController.cs b/Gombahaz/Gombahaz/Controllers/ResourceController.cs
@@ -107,7 +107,7 @@ public async Task<ActionResult<ResourceDTO>> updateResourceById(int resourceId,
                     return NotFound();
 
                 ResourceDTO returnInDTO = ResourceMapper.entityToDTO(updatedResource);
-                return Ok(resourceToUpdate);
+                return Ok(returnInDTO);
             }
             catch(Exception ex)
             {

diff --git a/Gombahaz/Gombahaz/Mappers/DataSetMapper.cs b/Gombahaz/Gombahaz/Mappers/DataSetMapper.cs
@@ -17,7 +17,7 @@ public static DataSetDTO entityToDTO(DataSetItem dataSetItem)
                 COLevel= dataSetItem.COLevel,
                 SoilMoisture = dataSetItem.SoilMoisture,
                 SoilTemperature = dataSetItem.SoilTemperature,
-                ResourceId = dataSetItem.Id
+                ResourceId = dataSetItem.ResourceId
             };
         }
 

diff --git a/Gombahaz/Gombahaz/Repositories/DataSetRepository.cs b/Gombahaz/Gombahaz/Repositories/DataSetRepository.cs
@@ -60,7 +60,8 @@ public async Task<IEnumerable<DataSetItem>> getDataSetsForDateInterval(ResourceI
             else
             {
                 dataSetItemsForDateInterval = await dataContext.DataSets
-                    .Where(ds => ds.DataObserved > dateStart && ds.DataObserved < dateEnd).OrderBy(ds => ds.DataObserved)
+                    .Where(ds => ds.Resource == resourceWithSpecifiedId && ds.DataObserved > dateStart && ds.DataObserved < dateEnd)
+                    .OrderBy(ds => ds.DataObserved)
                     .ToListAsync();
             }
 

diff --git a/Gombahaz/Gombahaz/bin/Debug/net8.0/Gombahaz.dll b/Gombahaz/Gombahaz/bin/Debug/net8.0/Gombahaz.dll
diff --git a/Gombahaz/Gombahaz/bin/Debug/net8.0/Gombahaz.exe b/Gombahaz/Gombahaz/bin/Debug/net8.0/Gombahaz.exe
diff --git a/Gombahaz/Gombahaz/bin/Debug/net8.0/Gombahaz.pdb b/Gombahaz/Gombahaz/bin/Debug/net8.0/Gombahaz.pdb
diff --git a/Gombahaz/Gombahaz/obj/Debug/net8.0/Gombahaz.AssemblyInfo.cs b/Gombahaz/Gombahaz/obj/Debug/net8.0/Gombahaz.AssemblyInfo.cs
@@ -15,7 +15,7 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("Gombahaz")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1abffd7e183305226098c45eb8c3e858ecac6e7b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+556ec319fcdc58d3880b589631f979c338e490be")]
 [assembly: System.Reflection.AssemblyProductAttribute("Gombahaz")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Gombahaz")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

diff --git a/Gombahaz/Gombahaz/obj/Debug/net8.0/Gombahaz.AssemblyInfoInputs.cache b/Gombahaz/Gombahaz/obj/Debug/net8.0/Gombahaz.AssemblyInfoInputs.cache
@@ -1 +1 @@
-77e57dfbc82b3da8e7d0cc3e04bbf1241053ea768d2e316b260d24389525807e
+a6d3067c61eda91ff00ac0f9fb8b3bc275dbd4682521c2deccba65a6e44fb9ae
diff --git a/Gombahaz/Gombahaz/obj/Debug/net8.0/Gombahaz.dll b/Gombahaz/Gombahaz/obj/Debug/net8.0/Gombahaz.dll
diff --git a/Gombahaz/Gombahaz/obj/Debug/net8.0/Gombahaz.pdb b/Gombahaz/Gombahaz/obj/Debug/net8.0/Gombahaz.pdb
diff --git a/Gombahaz/Gombahaz/obj/Debug/net8.0/Gombahaz.sourcelink.json b/Gombahaz/Gombahaz/obj/Debug/net8.0/Gombahaz.sourcelink.json
@@ -1 +1 @@
-{"documents":{"C:\\Users\\Tse\\Desktop\\IET\\iet_hf\\*":"https://raw.githubusercontent.com/BME-MIT-IET/iet-hf-2024-lg_iet_lab/1abffd7e183305226098c45eb8c3e858ecac6e7b/*"}}
+{"documents":{"C:\\Users\\Tse\\Desktop\\IET\\iet_hf\\*":"https://raw.githubusercontent.com/BME-MIT-IET/iet-hf-2024-lg_iet_lab/556ec319fcdc58d3880b589631f979c338e490be/*"}}
diff --git a/Gombahaz/Gombahaz/obj/Debug/net8.0/apphost.exe b/Gombahaz/Gombahaz/obj/Debug/net8.0/apphost.exe
diff --git a/Gombahaz/Gombahaz/obj/Debug/net8.0/ref/Gombahaz.dll b/Gombahaz/Gombahaz/obj/Debug/net8.0/ref/Gombahaz.dll
diff --git a/Gombahaz/Gombahaz/obj/Debug/net8.0/refint/Gombahaz.dll b/Gombahaz/Gombahaz/obj/Debug/net8.0/refint/Gombahaz.dll
diff --git a/Gombahaz/obj/Docker/CachedComposeConfigFilePaths.cache b/Gombahaz/obj/Docker/CachedComposeConfigFilePaths.cache
diff --git a/Gombahaz/obj/Docker/DOCKER_REGISTRY.cache b/Gombahaz/obj/Docker/DOCKER_REGISTRY.cache
diff --git a/Gombahaz/obj/Docker/DockerDevelopmentMode.cache b/Gombahaz/obj/Docker/DockerDevelopmentMode.cache
diff --git a/Gombahaz/obj/Docker/HashOfDockerArtifacts.cache b/Gombahaz/obj/Docker/HashOfDockerArtifacts.cache
diff --git a/Gombahaz/obj/Docker/LaunchContext.cache b/Gombahaz/obj/Docker/LaunchContext.cache
diff --git a/Gombahaz/obj/Docker/MergedDockerCompose.cache b/Gombahaz/obj/Docker/MergedDockerCompose.cache
diff --git a/Gombahaz/obj/Docker/MergedDockerCompose1.cache b/Gombahaz/obj/Docker/MergedDockerCompose1.cache
diff --git a/Gombahaz/obj/Docker/MergedDockerCompose2.cache b/Gombahaz/obj/Docker/MergedDockerCompose2.cache
diff --git a/Gombahaz/obj/Docker/TargetOS.cache b/Gombahaz/obj/Docker/TargetOS.cache
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		77e57dfbc82b3da8e7d0cc3e04bbf1241053ea768d2e316b260d24389525807e
		a6d3067c61eda91ff00ac0f9fb8b3bc275dbd4682521c2deccba65a6e44fb9ae
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"documents":{"C:\\Users\\Tse\\Desktop\\IET\\iet_hf\\":"https://raw.githubusercontent.com/BME-MIT-IET/iet-hf-2024-lg_iet_lab/1abffd7e183305226098c45eb8c3e858ecac6e7b/"}}
		{"documents":{"C:\\Users\\Tse\\Desktop\\IET\\iet_hf\\":"https://raw.githubusercontent.com/BME-MIT-IET/iet-hf-2024-lg_iet_lab/556ec319fcdc58d3880b589631f979c338e490be/"}}