From f44f4d794de10683786a2ebcfd45da8309f62251 Mon Sep 17 00:00:00 2001
From: Adam <adam.g@virtualplanet.eu>
Date: Fri, 15 Dec 2023 12:18:51 +0100
Subject: [PATCH] json serialize check

---
 TIAM.Entities/Users/User.cs                        |  5 +++++
 TIAM.Entities/Users/UserProductMapping.cs          |  3 +++
 TIAMWebApp/Server/Controllers/UserAPIController.cs | 10 ++++++++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/TIAM.Entities/Users/User.cs b/TIAM.Entities/Users/User.cs
index bb22b638..65436192 100644
--- a/TIAM.Entities/Users/User.cs
+++ b/TIAM.Entities/Users/User.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using AyCode.Entities.Users;
 using TIAM.Entities.Products;
@@ -13,8 +15,11 @@ namespace TIAM.Entities.Users
         //public virtual List<Product> Products { get; } = new();
 
         //public virtual ServiceProvider ServiceProvider { get; set; } = new();
+       
+        //[NotMapped]
         public virtual List<UserProductMapping> UserProductMappings { get; } = new();
 
+        
         public User() { }
         public User(string email, string password) : this(Guid.NewGuid(), email, password) { }
         public User(Guid id, string email, string password) : base(id, email, password)
diff --git a/TIAM.Entities/Users/UserProductMapping.cs b/TIAM.Entities/Users/UserProductMapping.cs
index 8bc9a2fe..02792d8e 100644
--- a/TIAM.Entities/Users/UserProductMapping.cs
+++ b/TIAM.Entities/Users/UserProductMapping.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Text.Json.Serialization;
 using AyCode.Interfaces.Entities;
 using AyCode.Interfaces.TimeStampInfo;
 using TIAM.Entities.Products;
@@ -14,7 +15,9 @@ public class UserProductMapping : IEntityGuid, ITimeStampInfo
     public Guid UserId { get; set; }
     public Guid ProductId { get; set; }
 
+    [JsonIgnore]
     public virtual User User { get; set; }
+    [JsonIgnore]
     public virtual Product Product { get; set; }
     
     public DateTime Created { get; set; }
diff --git a/TIAMWebApp/Server/Controllers/UserAPIController.cs b/TIAMWebApp/Server/Controllers/UserAPIController.cs
index 6e0083af..4bf168a0 100644
--- a/TIAMWebApp/Server/Controllers/UserAPIController.cs
+++ b/TIAMWebApp/Server/Controllers/UserAPIController.cs
@@ -340,11 +340,17 @@ namespace TIAMWebApp.Server.Controllers
         [AllowAnonymous]
         [HttpPost]
         [Route("GetUserById")]
-        public async Task<User?> GetUserById([FromBody] Guid id)
+        public User? GetUserById([FromBody] Guid id)
         {
             Logger.Info($"GetUserById called with id: {id}");
+            var result = _userDal.GetUserById(id);
+            var b = result.UserProductMappings.FirstOrDefault(x => x.Id != null);
+            
+            var a = JsonSerializer.Serialize(result);
 
-            return await _userDal.GetUserByIdAsync(id);
+
+            Console.WriteLine($"GetUserById result: {a}");
+            return result;
         }
 
         private bool VerifyPassword(string password, string hashedPassword)