Change Error Code. 204 => 404 (#18)

* Change Error Code. 204 => 404 * Create GetByGameID (Activity_Type, Asset_Type, Wallet_Category, Game_Server, Level, Character_Type) * Add: GetUserByEmail * Add 's' to the end of entity * Update GetByEmail Section & MockData Running * Update User.List()
FPTU-GHub-Capstone · Nov 11, 2023 · cef7fef · cef7fef
1 parent 39fbca9
commit cef7fef
Show file tree

Hide file tree

Showing 25 changed files with 121 additions and 48 deletions.
diff --git a/Api/Configurations/DatabaseInitializer.cs b/Api/Configurations/DatabaseInitializer.cs
@@ -61,9 +61,9 @@ public static async Task MockUser(this ApplicationDbContext dbContext)
 
         dynamic user = SeedingServices.LoadJson("USER_MOCK_DATA.json");
         int userLength = user.Count;
-        for (int i = 0; i < 20; i++)
+        for (int i = 0; i < user.Count; i++)
         {
-            var mockUser = user[_rand.Next(userLength)];
+            var mockUser = user[i];
             await dbContext.Users.AddAsync(
                 new UserEntity()
                 {

diff --git a/Api/Controllers/GamesController.cs b/Api/Controllers/GamesController.cs
@@ -11,11 +11,27 @@ namespace WebApiLayer.Controllers;
 public class GamesController : BaseController
 {
     private readonly IGameServices _gameServices;
+    private readonly IActivityTypeServices _activityTypeServices;
+    private readonly IAssetTypeServices _assetTypeServices;
+    private readonly ICharacterTypeServices _characterTypeServices;
+    private readonly IGameServerServices _gameServerServices;
+    private readonly ILevelServices _levelServices;
+    private readonly IWalletCategoryServices _walletCategoryServices;
     private readonly IGenericRepository<GameEntity> _gameRepo;
     private readonly IGenericRepository<UserEntity> _userRepo;
-    public GamesController(IGameServices gameServices, IGenericRepository<GameEntity> gameRepo, IGenericRepository<UserEntity> userRepo)
+    public GamesController(IGameServices gameServices, IActivityTypeServices activityTypeServices
+        , IAssetTypeServices assetTypeServices
+        , ICharacterTypeServices characterTypeServices , IGameServerServices gameServerServices
+        , ILevelServices levelServices, IWalletCategoryServices walletCategoryServices
+        , IGenericRepository<GameEntity> gameRepo, IGenericRepository<UserEntity> userRepo)
     {
         _gameServices = gameServices;
+        _activityTypeServices = activityTypeServices;
+        _assetTypeServices = assetTypeServices;
+        _characterTypeServices = characterTypeServices;
+        _gameServerServices = gameServerServices;
+        _levelServices = levelServices;
+        _walletCategoryServices = walletCategoryServices;
         _gameRepo = gameRepo;
         _userRepo = userRepo;
     }
@@ -36,6 +52,42 @@ public async Task<IActionResult> GetGame(Guid id)
         return Ok(await _gameServices.GetById(id));
     }
 
+    [HttpGet("{id}/activity-types")]
+    public async Task<IActionResult> GetActTypeByGameID(Guid id)
+    {
+        return Ok(await _activityTypeServices.GetByGameId(id));
+    }
+
+    [HttpGet("{id}/asset-types")]
+    public async Task<IActionResult> GetAssTypeByGameID(Guid id)
+    {
+        return Ok(await _assetTypeServices.GetByGameId(id));
+    }
+
+    [HttpGet("{id}/character-types")]
+    public async Task<IActionResult> GetCharTypeByGameID(Guid id)
+    {
+        return Ok(await _characterTypeServices.GetByGameId(id));
+    }
+
+    [HttpGet("{id}/game-servers")]
+    public async Task<IActionResult> GetGameServerByGameID(Guid id)
+    {
+        return Ok(await _gameServerServices.GetByGameId(id));
+    }
+
+    [HttpGet("{id}/levels")]
+    public async Task<IActionResult> GetLevelByGameID(Guid id)
+    {
+        return Ok(await _levelServices.GetByGameId(id));
+    }
+
+    [HttpGet("{id}/wallet-category")]
+    public async Task<IActionResult> GetWalCatByGameID(Guid id)
+    {
+        return Ok(await _walletCategoryServices.GetByGameId(id));
+    }
+
     [HttpPost]
     public async Task<IActionResult> CreateGame([FromBody] CreateGameRequest newGame)
     {

diff --git a/Api/Controllers/UsersController.cs b/Api/Controllers/UsersController.cs
@@ -18,9 +18,9 @@ public UsersController(IUserServices userServices, IGenericRepository<UserEntity
         _userRepo = userRepo;
     }
     [HttpGet]
-    public async Task<IActionResult> GetUsers()
+    public async Task<IActionResult> GetUsers([FromQuery] string? email)
     {
-        var users = await _userServices.List();
+        var users = await _userServices.List(email);
         return Ok(users);
     }
 

diff --git a/Application/Business/Activity/ActivityServices.cs b/Application/Business/Activity/ActivityServices.cs
@@ -1,4 +1,5 @@
-using DomainLayer.Entities;
+using DomainLayer.Constants;
+using DomainLayer.Entities;
 using RepositoryLayer.Repositories;
 
 namespace ServiceLayer.Business;
@@ -16,7 +17,7 @@ public ActivityServices(IGenericRepository<ActivityEntity> activityRepo)
     }
     public async Task<ActivityEntity> Search(Guid activityId)
     {
-        return await _activityRepo.FindByIdAsync(activityId);
+        return await _activityRepo.FoundOrThrowAsync(activityId, Constants.ENTITY.ACTIVITY + Constants.ERROR.NOT_EXIST_ERROR);
     }
     public async Task<ActivityEntity> Search(string Name) {
         return await _activityRepo.FirstOrDefaultAsync( a => a.Name.Equals(Name));

diff --git a/Application/Business/ActivityType/ActivityTypeServices.cs b/Application/Business/ActivityType/ActivityTypeServices.cs
@@ -1,4 +1,5 @@
-using DomainLayer.Entities;
+using DomainLayer.Constants;
+using DomainLayer.Entities;
 using RepositoryLayer.Repositories;
 
 namespace ServiceLayer.Business;
@@ -17,7 +18,7 @@ public async Task<ICollection<ActivityTypeEntity>> List()
     }
     public async Task<ActivityTypeEntity> GetById(Guid activityTypeId)
     {
-        return await _activityTypeRepo.FindByIdAsync(activityTypeId);
+        return await _activityTypeRepo.FoundOrThrowAsync(activityTypeId, Constants.ENTITY.ACTIVITY_TYPE + Constants.ERROR.NOT_EXIST_ERROR);
     }
     public async Task<ICollection<ActivityTypeEntity>> GetByGameId(Guid gameid)
     {

diff --git a/Application/Business/Asset/AssetServices.cs b/Application/Business/Asset/AssetServices.cs
@@ -1,4 +1,5 @@
-using DomainLayer.Entities;
+using DomainLayer.Constants;
+using DomainLayer.Entities;
 using RepositoryLayer.Repositories;
 
 namespace ServiceLayer.Business;
@@ -17,7 +18,7 @@ public async Task<ICollection<AssetEntity>> List()
     }
     public async Task<AssetEntity> GetById(Guid assetId)
     {
-        return await _assetRepo.FindByIdAsync(assetId);
+        return await _assetRepo.FoundOrThrowAsync(assetId, Constants.ENTITY.ASSET + Constants.ERROR.NOT_EXIST_ERROR);
     }
     public async Task<ICollection<AssetEntity>> GetByAssetTypeId(Guid assetTypeid)
     {

diff --git a/Application/Business/AssetAttribute/AssetAttributeServices.cs b/Application/Business/AssetAttribute/AssetAttributeServices.cs
@@ -20,7 +20,7 @@ public async Task<ICollection<AssetAttributeEntity>> List()
     }
     public async Task<AssetAttributeEntity> GetById(Guid assetAttributeId)
     {
-        return await _assetAttributeRepo.FindByIdAsync(assetAttributeId);
+        return await _assetAttributeRepo.FoundOrThrowAsync(assetAttributeId, Constants.ENTITY.ASSET_ATTRIBUTE + Constants.ERROR.NOT_EXIST_ERROR);
     }
     public async Task<ICollection<AssetAttributeEntity>> GetByAssetId(Guid assetId)
     {

diff --git a/Application/Business/AssetType/AssetTypeServices.cs b/Application/Business/AssetType/AssetTypeServices.cs
@@ -19,7 +19,7 @@ public async Task<ICollection<AssetTypeEntity>> List()
     }
     public async Task<AssetTypeEntity> GetById(Guid assetTypeId)
     {
-        return await _assetTypeRepo.FindByIdAsync(assetTypeId);
+        return await _assetTypeRepo.FoundOrThrowAsync(assetTypeId, Constants.ENTITY.ASSET_ATTRIBUTE + Constants.ERROR.NOT_EXIST_ERROR);
     }
     public async Task<ICollection<AssetTypeEntity>> GetByGameId(Guid gameId)
     {

diff --git a/Application/Business/AttributeGroup/AttributeGroupServices.cs b/Application/Business/AttributeGroup/AttributeGroupServices.cs
@@ -1,10 +1,6 @@
-using DomainLayer.Entities;
-using DomainLayer.Exceptions;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore.ValueGeneration;
+using DomainLayer.Constants;
+using DomainLayer.Entities;
 using RepositoryLayer.Repositories;
-using System.Reflection;
-using System.Security.Cryptography.X509Certificates;
 
 namespace ServiceLayer.Business;
 
@@ -21,7 +17,7 @@ public async Task<ICollection<AttributeGroupEntity>> List()
     }
     public async Task<AttributeGroupEntity> GetById(Guid attributeGroupid)
     {
-        return await _attributeRepo.FindByIdAsync(attributeGroupid);
+        return await _attributeRepo.FoundOrThrowAsync(attributeGroupid, Constants.ENTITY.ATTRIBUTE_GROUP + Constants.ERROR.NOT_EXIST_ERROR);
     }
     public async Task<int> Count()
     {

diff --git a/Application/Business/Character/CharacterServices.cs b/Application/Business/Character/CharacterServices.cs
@@ -19,7 +19,8 @@ public async Task<ICollection<CharacterEntity>> List()
     }
     public async Task<CharacterEntity> GetById(Guid characterId)
     {
-        return await _characterRepo.FindByIdAsync(characterId);
+        return await _characterRepo.FoundOrThrowAsync(characterId, Constants.ENTITY.CHARACTER + Constants.ERROR.NOT_EXIST_ERROR);
+
     }
     public async Task<ICollection<CharacterEntity>> GetByUserId(Guid id)
     {

diff --git a/Application/Business/CharacterAsset/CharacterAssetServices.cs b/Application/Business/CharacterAsset/CharacterAssetServices.cs
@@ -19,7 +19,8 @@ public async Task<ICollection<CharacterAssetEntity>> List()
     }
     public async Task<CharacterAssetEntity> GetById(Guid characterAssetId)
     {
-        return await _characterAssetRepo.FindByIdAsync(characterAssetId);
+        return await _characterAssetRepo.FoundOrThrowAsync(characterAssetId, Constants.ENTITY.CHARACTER_ASSET + Constants.ERROR.NOT_EXIST_ERROR);
+
     }
     public async Task<ICollection<CharacterAssetEntity>> GetByAssetId(Guid id)
     {

diff --git a/Application/Business/CharacterAttribute/CharacterAttributeServices.cs b/Application/Business/CharacterAttribute/CharacterAttributeServices.cs
@@ -1,4 +1,5 @@
-using DomainLayer.Entities;
+using DomainLayer.Constants;
+using DomainLayer.Entities;
 using DomainLayer.Exceptions;
 using RepositoryLayer.Repositories;
 
@@ -18,7 +19,9 @@ public async Task<ICollection<CharacterAttributeEntity>> List()
     }
     public async Task<CharacterAttributeEntity> GetById(Guid characterAttributeid)
     {
-        return await _characterAttributeRepo.FindByIdAsync(characterAttributeid);
+        return await _characterAttributeRepo.FoundOrThrowAsync(characterAttributeid, 
+            Constants.ENTITY.CHARACTER_ATTRIBUTE + Constants.ERROR.NOT_EXIST_ERROR);
+
     }
     public async Task<ICollection<CharacterAttributeEntity>> GetByCharacterId(Guid id)
     {

diff --git a/Application/Business/CharacterType/CharacterTypeServices.cs b/Application/Business/CharacterType/CharacterTypeServices.cs
@@ -1,4 +1,5 @@
-using DomainLayer.Entities;
+using DomainLayer.Constants;
+using DomainLayer.Entities;
 using DomainLayer.Exceptions;
 using RepositoryLayer.Repositories;
 
@@ -20,7 +21,8 @@ public async Task<ICollection<CharacterTypeEntity>> List()
     }
     public async Task<CharacterTypeEntity> GetById(Guid characterTypeId)
     {
-        return await _characterTypeRepo.FindByIdAsync(characterTypeId);
+        return await _characterTypeRepo.FoundOrThrowAsync(characterTypeId,
+            Constants.ENTITY.CHARACTER_TYPE + Constants.ERROR.NOT_EXIST_ERROR);
     }
     public async Task<ICollection<CharacterTypeEntity>> GetByGameId(Guid gameId)
     {

diff --git a/Application/Business/GameServer/GameServerServices.cs b/Application/Business/GameServer/GameServerServices.cs
@@ -1,4 +1,5 @@
-using DomainLayer.Entities;
+using DomainLayer.Constants;
+using DomainLayer.Entities;
 using DomainLayer.Exceptions;
 using RepositoryLayer.Repositories;
 
@@ -19,7 +20,8 @@ public async Task<ICollection<GameServerEntity>> List()
     }
     public async Task<GameServerEntity> GetById(Guid gameServerId)
     {
-        return await _gameServerRepo.FindByIdAsync(gameServerId);
+        return await _gameServerRepo.FoundOrThrowAsync(gameServerId,
+            Constants.ENTITY.GAME_SERVER + Constants.ERROR.NOT_EXIST_ERROR);
     }
     public async Task<ICollection<GameServerEntity>> GetByGameId(Guid gameId)
     {

diff --git a/Application/Business/GameServices/GameServices.cs b/Application/Business/GameServices/GameServices.cs
@@ -20,7 +20,8 @@ public async Task<ICollection<GameEntity>> List()
     }
     public async Task<GameEntity> GetById(Guid gameId)
     {
-        return await _gameRepo.FindByIdAsync(gameId);
+        return await _gameRepo.FoundOrThrowAsync(gameId,
+            Constants.ENTITY.GAME + Constants.ERROR.NOT_EXIST_ERROR);
     }
     public async Task<ICollection<GameEntity>> List(Guid[] gameIds)
     {

diff --git a/Application/Business/LevelProgress/LevelProgressServices.cs b/Application/Business/LevelProgress/LevelProgressServices.cs
@@ -20,7 +20,8 @@ public async Task<ICollection<LevelProgressEntity>> List()
     }
     public async Task<LevelProgressEntity> GetById(Guid levelProgressId)
     {
-        return await _levelProgressRepo.FindByIdAsync(levelProgressId);
+        return await _levelProgressRepo.FoundOrThrowAsync(levelProgressId,
+            Constants.ENTITY.LEVEL_PROGRESS + Constants.ERROR.NOT_EXIST_ERROR);
     }
     public async Task<ICollection<LevelProgressEntity>> GetByCharacterId(Guid id)
     {

diff --git a/Application/Business/LevelServices/LevelServices.cs b/Application/Business/LevelServices/LevelServices.cs
@@ -18,7 +18,8 @@ public async Task<ICollection<LevelEntity>> List()
     }
     public async Task<LevelEntity> GetById(Guid levelId)
     {
-        return await _levelRepo.FindByIdAsync(levelId);
+        return await _levelRepo.FoundOrThrowAsync(levelId,
+            Constants.ENTITY.LEVEL + Constants.ERROR.NOT_EXIST_ERROR);
     }
     public async Task<ICollection<LevelEntity>> GetByGameId(Guid gameId)
     {

diff --git a/Application/Business/PaymentServices/PaymentServices.cs b/Application/Business/PaymentServices/PaymentServices.cs
@@ -1,4 +1,5 @@
-using DomainLayer.Entities;
+using DomainLayer.Constants;
+using DomainLayer.Entities;
 using DomainLayer.Exceptions;
 using RepositoryLayer.Repositories;
 
@@ -18,7 +19,8 @@ public async Task<ICollection<PaymentEntity>> List()
     }
     public async Task<PaymentEntity> GetById(Guid paymentId)
     {
-        return await _paymentRepo.FindByIdAsync(paymentId);
+        return await _paymentRepo.FoundOrThrowAsync(paymentId,
+            Constants.ENTITY.PAYMENT + Constants.ERROR.NOT_EXIST_ERROR);
     }
     public async Task<ICollection<PaymentEntity>> GetByCharacterId(Guid id)
     {

diff --git a/Application/Business/TransactionServices/TransactionServices.cs b/Application/Business/TransactionServices/TransactionServices.cs
@@ -1,4 +1,5 @@
-using DomainLayer.Entities;
+using DomainLayer.Constants;
+using DomainLayer.Entities;
 using RepositoryLayer.Repositories;
 
 namespace ServiceLayer.Business;
@@ -16,7 +17,8 @@ public async Task<ICollection<TransactionEntity>> List()
     }
     public async Task<TransactionEntity> GetById(Guid transactionId)
     {
-        return await _transactionRepo.FindByIdAsync(transactionId);
+        return await _transactionRepo.FoundOrThrowAsync(transactionId,
+           Constants.ENTITY.TRANSACTION + Constants.ERROR.NOT_EXIST_ERROR);
     }
     public async Task<ICollection<TransactionEntity>> GetByWalletId(Guid walletId)
     {

diff --git a/Application/Business/UserServices/IUserServices.cs b/Application/Business/UserServices/IUserServices.cs
@@ -3,7 +3,7 @@
 namespace ServiceLayer.Business;
 public interface IUserServices
 {
-    Task<ICollection<UserEntity>> List();
+    Task<ICollection<UserEntity>> List(string? email);
     Task<UserEntity> GetById(Guid UserId);
     Task<int> Count();
     Task Create(UserEntity user);

diff --git a/Application/Business/UserServices/UserServices.cs b/Application/Business/UserServices/UserServices.cs
@@ -1,10 +1,8 @@
-using AutoMapper;
+using DomainLayer.Constants;
 using DomainLayer.Entities;
 using DomainLayer.Exceptions;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc;
 using RepositoryLayer.Repositories;
-using ServiceLayer.Extensions;
-using System.Data;
 
 namespace ServiceLayer.Business;
 
@@ -15,13 +13,19 @@ public UserServices(IGenericRepository<UserEntity> userRepo)
     {
         _userRepo = userRepo;
     }
-    public async Task<ICollection<UserEntity>> List()
+    public async Task<ICollection<UserEntity>> List(string? email)
     {
+        if (!string.IsNullOrEmpty(email))
+        {
+            var user = await _userRepo.WhereAsync(u => u.Email.Equals(email));
+            return user;
+        }
         return await _userRepo.ListAsync();
     }
     public async Task<UserEntity> GetById(Guid UserId)
     {
-        return await _userRepo.FindByIdAsync(UserId);
+        return await _userRepo.FoundOrThrowAsync(UserId,
+           Constants.ENTITY.USER + Constants.ERROR.NOT_EXIST_ERROR);
     }
     public async Task<int> Count()
     {

diff --git a/Application/Business/WalletCategory/WalletCategoryServices.cs b/Application/Business/WalletCategory/WalletCategoryServices.cs
@@ -18,7 +18,8 @@ public async Task<ICollection<WalletCategoryEntity>> List()
     }
     public async Task<WalletCategoryEntity> GetById(Guid categoryId)
     {
-        return await _walletCategoryRepo.FindByIdAsync(categoryId);
+        return await _walletCategoryRepo.FoundOrThrowAsync(categoryId,
+           Constants.ENTITY.WALLET_CATEGORY + Constants.ERROR.NOT_EXIST_ERROR);
     }
     public async Task<ICollection<WalletCategoryEntity>> GetByGameId(Guid gameId)
     {

diff --git a/Application/Business/WalletServices/WalletServices.cs b/Application/Business/WalletServices/WalletServices.cs
@@ -18,7 +18,8 @@ public async Task<ICollection<WalletEntity>> List()
     }
     public async Task<WalletEntity> GetById(Guid walletId)
     {
-        return await _walletRepo.FindByIdAsync(walletId);
+        return await _walletRepo.FoundOrThrowAsync(walletId,
+           Constants.ENTITY.WALLET + Constants.ERROR.NOT_EXIST_ERROR);
     }
     public async Task<ICollection<WalletEntity>> GetByWalletCategoryId(Guid id)
     {

diff --git a/Domain/Entities/GameEntity.cs b/Domain/Entities/GameEntity.cs
@@ -8,10 +8,10 @@ public class GameEntity : BaseEntity
     public string Name { get; set; }
     public string Logo { get; set; }
     public string Link { get; set; }
-    // M Game - M User
+    // M Users - M Games
     public virtual ICollection<UserEntity>? Users { get; set; }
     // 1 Game - M Activity Type
     public virtual ICollection<ActivityTypeEntity>? ActivityTypes { get; set; }
     // M Game - M Attribute Group
     public virtual ICollection<AttributeGroupEntity>? AttributeGroups { get; set; }
-}
+}