From 94f38220cb279640af37fe6a62418e9f3416bfdf Mon Sep 17 00:00:00 2001
From: Bogdan Constantinescu <bogdan@bogdanconstantinescu.com>
Date: Wed, 24 Jul 2019 09:03:15 +0200
Subject: [PATCH] Small fixes

---
 src/app/assets/assets-routing.module.ts                       | 2 +-
 src/app/core/models/asset/asset-properties/address.model.ts   | 2 +-
 .../core/models/asset/asset-properties/storage-space.model.ts | 4 ++--
 src/app/core/store/effects/storage-spaces.effect.ts           | 2 +-
 src/app/core/store/reducers/asset-properties.reducer.ts       | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/assets/assets-routing.module.ts b/src/app/assets/assets-routing.module.ts
index 9b0cc90..d29f3b5 100644
--- a/src/app/assets/assets-routing.module.ts
+++ b/src/app/assets/assets-routing.module.ts
@@ -19,9 +19,9 @@ const routes: Routes = [
   {
     path: 'detail/:assetId',
     canActivate: [
+      fromGuards.LoadCountiesGuard,
       fromGuards.AssetsGuard,
       fromGuards.AssetDetailGuard,
-      fromGuards.LoadCountiesGuard,
       fromGuards.LoadDefendantsGuard,
       fromGuards.LoadAddressesGuard,
     ],
diff --git a/src/app/core/models/asset/asset-properties/address.model.ts b/src/app/core/models/asset/asset-properties/address.model.ts
index f6891ec..672944a 100644
--- a/src/app/core/models/asset/asset-properties/address.model.ts
+++ b/src/app/core/models/asset/asset-properties/address.model.ts
@@ -100,7 +100,7 @@ export class Address extends AssetProperty {
       floor: this.floor,
       flatNo: this.flatNo,
       description: this.description,
-      asset: this.asset.toJson(),
+      asset: this.asset ? this.asset.toJson() : undefined,
       assetId: this.assetId,
     };
   }
diff --git a/src/app/core/models/asset/asset-properties/storage-space.model.ts b/src/app/core/models/asset/asset-properties/storage-space.model.ts
index 6aa60db..92e7638 100644
--- a/src/app/core/models/asset/asset-properties/storage-space.model.ts
+++ b/src/app/core/models/asset/asset-properties/storage-space.model.ts
@@ -34,9 +34,9 @@ export class StorageSpace extends AssetProperty {
   toJson(): IStorageSpace {
     return {
       id: this.id,
-      address: this.address.toJson(),
+      address: this.address ? this.address.toJson() : undefined,
       name: this.name,
-      asset: this.asset.toJson(),
+      asset: this.asset ? this.asset.toJson() : undefined,
       assetId: this.assetId,
     };
   }
diff --git a/src/app/core/store/effects/storage-spaces.effect.ts b/src/app/core/store/effects/storage-spaces.effect.ts
index 8404b00..3c436bc 100644
--- a/src/app/core/store/effects/storage-spaces.effect.ts
+++ b/src/app/core/store/effects/storage-spaces.effect.ts
@@ -44,7 +44,7 @@ export class StorageSpacesEffects {
     .pipe(
       ofType(storageSpaceActions.StorageSpaceActionTypes.CreateStorageSpaceSuccess),
       map((action: storageSpaceActions.CreateStorageSpaceSuccess) => action.payload),
-      map((aStorageSpace: StorageSpace) => new assetPropertiesActions.DeleteProperty(aStorageSpace.getAsset().id))
+      map((aStorageSpace: StorageSpace) => new assetPropertiesActions.DeleteProperty(aStorageSpace.getAssetId()))
     );
 
   @Effect()
diff --git a/src/app/core/store/reducers/asset-properties.reducer.ts b/src/app/core/store/reducers/asset-properties.reducer.ts
index 82e1d18..bfbe891 100644
--- a/src/app/core/store/reducers/asset-properties.reducer.ts
+++ b/src/app/core/store/reducers/asset-properties.reducer.ts
@@ -15,7 +15,7 @@ export function reducer(state = initialState, action: fromAssetProperties.AssetP
       const theProperty: AssetProperty = action.payload as AssetProperty;
       const entities = {
         ...state.entities,
-        [theProperty.getAsset().id]: theProperty,
+        [theProperty.getAssetId()]: theProperty,
       };
 
       return {
@@ -28,7 +28,7 @@ export function reducer(state = initialState, action: fromAssetProperties.AssetP
       const theProperty: AssetProperty = action.payload as AssetProperty;
       const entities = {
         ...state.entities,
-        [theProperty.getAsset().id]: theProperty,
+        [theProperty.getAssetId()]: theProperty,
       };
 
       return {