Compare commits

..

2 Commits

Author SHA1 Message Date
Adam 2f4bdd95f8 merge 2023-12-15 12:19:58 +01:00
Adam f44f4d794d json serialize check 2023-12-15 12:18:51 +01:00
2 changed files with 11 additions and 2 deletions

View File

@ -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; }

View File

@ -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);
return await _userDal.GetUserByIdAsync(id);
var a = JsonSerializer.Serialize(result);
Console.WriteLine($"GetUserById result: {a}");
return result;
}
private bool VerifyPassword(string password, string hashedPassword)