#21 - updated space model. added properties

algotecture · May 23, 2023 · 280dc87 · 280dc87
1 parent 8b35d5e
commit 280dc87
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 71 deletions.
diff --git a/AlgoTecture.Domain/Models/SpaceDetails.cs b/AlgoTecture.Domain/Models/SpaceDetails.cs
diff --git a/AlgoTecture.Domain/Models/SpaceProperty.cs b/AlgoTecture.Domain/Models/SpaceProperty.cs
@@ -8,7 +8,7 @@ public class SpaceProperty
 
         public string Description { get; set; }
 
-        public SpaceDetails SpaceDetails { get; set; }
+        public Dictionary<string, string> Properties { get; set; }
 
         public long OwnerId { get; set; }
 

diff --git a/AlgoTecture.Domain/Models/SubSpace.cs b/AlgoTecture.Domain/Models/SubSpace.cs
@@ -13,7 +13,7 @@ public SubSpace()
 
         private List<SubSpace> _subSpaces;
 
-        public SubSpaceDetails SubSpaceDetails { get; set; }
+        public List<Dictionary<string, string>> Properties { get; set; }
 
         public double Area { get; set; }
 

diff --git a/AlgoTecture.Domain/Models/SubSpaceDetails.cs b/AlgoTecture.Domain/Models/SubSpaceDetails.cs
diff --git a/AlgoTecture.Libraries.Reservations.Tests/Serialization/ClassToJsonSerializationTests.cs b/AlgoTecture.Libraries.Reservations.Tests/Serialization/ClassToJsonSerializationTests.cs
@@ -20,45 +20,21 @@ public void ConversationClassToJsonSimpleTest()
             {
                 Name = string.Empty,
                 Description = string.Empty,
-                SpaceDetails = new SpaceDetails
-                {
-                   BuildingYear = "2023",
-                   BuildingName = string.Empty,
-                   Levels = "3",
-                   Area = "456.4",
-                   Flats = "1",
-                   FloorArea = "674",
-                   BuildingClass = "Gebäude mit 1 Wohnung",
-                   BuildingCategory = "Andere Wohngebäude",
-                   PlaceName = "Werthenstein",
-                   MunicipalityId = "1009",
-                   MunicipalityName = "Werthenstein"
-                },
+                Properties = new Dictionary<string, string>(){{"BuildingName", "Name"}, {"Area", "100"}},
+
                 SubSpaces = new List<AddSubSpaceModel>()
                 {
                     new AddSubSpaceModel
                     {
                         UtilizationTypeId = 1,
                         Description = string.Empty,
-                        SubSpaceDetails = new SubSpaceDetails
-                        {
-                            Levels = "1",
-                            Area = "300",
-                            Flats = "1",
-                            FloorArea = "477",
-                        }
+                        Properties = new Dictionary<string, string>(){{"Levels", "2"}, {"Area", "45"}}
                     },
                     new AddSubSpaceModel
                     {
                         UtilizationTypeId = 1,
                         Description = string.Empty,
-                        SubSpaceDetails = new SubSpaceDetails
-                        {
-                            Levels = "2",
-                            Area = "200",
-                            Flats = "1",
-                            FloorArea = "287",
-                        }
+                        Properties = new Dictionary<string, string>(){{"Levels", "2"}, {"Area", "44"}}
                     }
                 }
             }

diff --git a/AlgoTecture.Libraries.Spaces/Models/Dto/AddSpacePropertyModel.cs b/AlgoTecture.Libraries.Spaces/Models/Dto/AddSpacePropertyModel.cs
@@ -7,8 +7,8 @@ public class AddSpacePropertyModel
     public string Name { get; set; }
 
     public string Description { get; set; }
-
-    public SpaceDetails SpaceDetails { get; set; }
+    
+    public Dictionary<string, string> Properties { get; set; }
 
     public List<AddSubSpaceModel> SubSpaces { get; set; }
 }
diff --git a/AlgoTecture.Libraries.Spaces/Models/Dto/AddSubSpaceModel.cs b/AlgoTecture.Libraries.Spaces/Models/Dto/AddSubSpaceModel.cs
@@ -11,7 +11,7 @@ public AddSubSpaceModel()
 
     private List<AddSubSpaceModel> _subSpaces;
 
-    public SubSpaceDetails SubSpaceDetails { get; set; }
+    public Dictionary<string, string> Properties { get; set; }
 
     public int UtilizationTypeId { get; set; }