From ee05b0d381dbe51e6aa75c8a6a25c81f92b37c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20G=C3=B3rzy=C5=84ski?= Date: Wed, 20 Jan 2021 21:06:28 +0100 Subject: [PATCH 1/4] SES-164 Add new constructors and change succesResponse --- .../Services/CharacterWeaponService.cs | 8 ++--- .../ApiResponses/ErrorResponse.cs | 34 +++++++++++++++++++ .../ApiResponses/SuccessResponse.cs | 34 ++++++++++++++++--- 3 files changed, 68 insertions(+), 8 deletions(-) diff --git a/SessionCompanion/SessionCompanion.Services/Services/CharacterWeaponService.cs b/SessionCompanion/SessionCompanion.Services/Services/CharacterWeaponService.cs index e003791..00129f4 100644 --- a/SessionCompanion/SessionCompanion.Services/Services/CharacterWeaponService.cs +++ b/SessionCompanion/SessionCompanion.Services/Services/CharacterWeaponService.cs @@ -48,7 +48,7 @@ namespace SessionCompanion.Services.Services // just use new one await Repository.Update(weapon); await Repository.Save(); - return new SuccessResponse("Weapon changed") { SuccessCode = 200 }; + return new SuccessResponse("Weapon changed") { StatusCode = 200 }; } var weaponInBothHands = weaponsInUse.Where(w => w.HoldInLeftHand.Equals(true) && w.HoldInRightHand.Equals(true)); @@ -67,7 +67,7 @@ namespace SessionCompanion.Services.Services await Repository.Update(weapon); await Repository.Save(); - return new SuccessResponse("Weapon changed") { SuccessCode = 200 }; + return new SuccessResponse("Weapon changed") { StatusCode = 200 }; } var weaponsToChange = weaponsInUse.Where(w => w.HoldInLeftHand.Equals(model.HoldInLeftHand) && w.HoldInRightHand.Equals(model.HoldInRightHand)); @@ -82,13 +82,13 @@ namespace SessionCompanion.Services.Services await Repository.Update(weaponToChange); await Repository.Update(weapon); await Repository.Save(); - return new SuccessResponse("Weapon changed") { SuccessCode = 200 }; + return new SuccessResponse("Weapon changed") { StatusCode = 200 }; } // weapon is armed in empty hand await Repository.Update(weapon); await Repository.Save(); - return new SuccessResponse("Weapon changed") { SuccessCode = 200 }; + return new SuccessResponse("Weapon changed") { StatusCode = 200 }; } } } diff --git a/SessionCompanion/SessionCompanion.ViewModels/ApiResponses/ErrorResponse.cs b/SessionCompanion/SessionCompanion.ViewModels/ApiResponses/ErrorResponse.cs index 262dd62..7ac5adc 100644 --- a/SessionCompanion/SessionCompanion.ViewModels/ApiResponses/ErrorResponse.cs +++ b/SessionCompanion/SessionCompanion.ViewModels/ApiResponses/ErrorResponse.cs @@ -4,6 +4,40 @@ namespace SessionCompanion.ViewModels.ApiResponses { public class ErrorResponse { + /// + /// Pusty konstruktor + /// + public ErrorResponse() + { } + + /// + /// Konstruktor obiektu + /// + /// + public ErrorResponse(int code) + { + this.StatusCode = code; + } + + /// + /// Konstruktor obiektu + /// + /// + public ErrorResponse(string message) + { + this.Message = message; + } + + /// + /// Konstruktor obiektu + /// + /// + /// + public ErrorResponse(int code, string message) + { + this.StatusCode = code; + this.Message = message; + } /// /// Kod błędu /// diff --git a/SessionCompanion/SessionCompanion.ViewModels/ApiResponses/SuccessResponse.cs b/SessionCompanion/SessionCompanion.ViewModels/ApiResponses/SuccessResponse.cs index 4cefb98..882b204 100644 --- a/SessionCompanion/SessionCompanion.ViewModels/ApiResponses/SuccessResponse.cs +++ b/SessionCompanion/SessionCompanion.ViewModels/ApiResponses/SuccessResponse.cs @@ -5,24 +5,50 @@ /// public class SuccessResponse { + /// + /// Pusty konstruktor obiektu + /// + public SuccessResponse() + { } + /// /// Konstruktor obiektu /// /// Wiadomość dotycząca operacji public SuccessResponse(string message) { - this.SuccessCode = 200; - this.SuccessMessage = message; + this.StatusCode = 200; + this.Message = message; + } + + /// + /// Konstruktor obiektu + /// + /// + public SuccessResponse(int code) + { + this.StatusCode = code; + } + + /// + /// Konstruktor obiektu + /// + /// + /// + public SuccessResponse(int code, string message) + { + this.StatusCode = code; + this.Message = message; } /// /// Kod odpowiedzi, domyślnie nadawany jest 200 /// - public int SuccessCode { get; set; } + public int StatusCode { get; set; } /// /// Wiadomość dotycząca wykoanania operacji /// - public string SuccessMessage { get; set; } + public string Message { get; set; } } } From 3a8090dab7ae329f0f158647f2bcc1657ead059a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20G=C3=B3rzy=C5=84ski?= Date: Wed, 20 Jan 2021 21:08:18 +0100 Subject: [PATCH 2/4] SES-164 Change bad references --- .../Services/CharacterArmorService.cs | 4 ++-- .../SessionCompanion/Controllers/CharacterController.cs | 2 +- .../SessionCompanion/Controllers/EquipmentController.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SessionCompanion/SessionCompanion.Services/Services/CharacterArmorService.cs b/SessionCompanion/SessionCompanion.Services/Services/CharacterArmorService.cs index 9413e2f..d2d0c2d 100644 --- a/SessionCompanion/SessionCompanion.Services/Services/CharacterArmorService.cs +++ b/SessionCompanion/SessionCompanion.Services/Services/CharacterArmorService.cs @@ -50,7 +50,7 @@ namespace SessionCompanion.Services.Services { await Repository.Update(armorToUse); await Repository.Save(); - return new SuccessResponse("Character armor updated") { SuccessCode = 200 }; + return new SuccessResponse("Character armor updated") { StatusCode = 200 }; } catch (Exception e) { @@ -65,7 +65,7 @@ namespace SessionCompanion.Services.Services await Repository.Update(armorInUse); await Repository.Update(armorToUse); await Repository.Save(); - return new SuccessResponse("Character armor updated") { SuccessCode = 204 }; + return new SuccessResponse("Character armor updated") { StatusCode = 204 }; } catch (Exception e) { diff --git a/SessionCompanion/SessionCompanion/Controllers/CharacterController.cs b/SessionCompanion/SessionCompanion/Controllers/CharacterController.cs index d15c584..1b03b8b 100644 --- a/SessionCompanion/SessionCompanion/Controllers/CharacterController.cs +++ b/SessionCompanion/SessionCompanion/Controllers/CharacterController.cs @@ -147,7 +147,7 @@ namespace SessionCompanion.Controllers try { await _service.CreateCharactersFromTemplate(characterId, userId, newName); - return new SuccessResponse("Character created") { SuccessCode = 200 }; + return new SuccessResponse("Character created") { StatusCode = 200 }; } catch (Exception e) { diff --git a/SessionCompanion/SessionCompanion/Controllers/EquipmentController.cs b/SessionCompanion/SessionCompanion/Controllers/EquipmentController.cs index 3314eb5..44f2eae 100644 --- a/SessionCompanion/SessionCompanion/Controllers/EquipmentController.cs +++ b/SessionCompanion/SessionCompanion/Controllers/EquipmentController.cs @@ -92,7 +92,7 @@ namespace SessionCompanion.Controllers { await _characterArmorService.Create(characterArmorViewModel); await _characterArmorService.SaveAsync(); - return new SuccessResponse("Armor added to character") { SuccessCode = 200 }; + return new SuccessResponse("Armor added to character") { StatusCode = 200 }; } catch (Exception e) { @@ -114,7 +114,7 @@ namespace SessionCompanion.Controllers { await _characterWeaponService.Create(characterWeaponViewModel); await _characterWeaponService.SaveAsync(); - return new SuccessResponse("Weapon added to character") { SuccessCode = 200 }; + return new SuccessResponse("Weapon added to character") { StatusCode = 200 }; } catch (Exception e) { From 92b8366cefebc5b6b76a932e2ac65a59c60cd1a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20G=C3=B3reczny?= Date: Fri, 22 Jan 2021 08:39:55 +0100 Subject: [PATCH 3/4] frontend fix --- .../SessionCompanion/ClientApp/src/types/SuccessResponse.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/types/SuccessResponse.ts b/SessionCompanion/SessionCompanion/ClientApp/src/types/SuccessResponse.ts index 2ac62c3..3e0f2cf 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/types/SuccessResponse.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/types/SuccessResponse.ts @@ -1,4 +1,4 @@ export interface SuccessResponse { - code: number; + statusCode: number; message: string; } From 844137b551d7a7a8f2384c4c96aa53fa4a946b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20G=C3=B3reczny?= Date: Fri, 22 Jan 2021 08:42:52 +0100 Subject: [PATCH 4/4] fix typo --- .../SessionCompanion.Services/Services/ShopkeeperService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SessionCompanion/SessionCompanion.Services/Services/ShopkeeperService.cs b/SessionCompanion/SessionCompanion.Services/Services/ShopkeeperService.cs index 9fe75c5..3752988 100644 --- a/SessionCompanion/SessionCompanion.Services/Services/ShopkeeperService.cs +++ b/SessionCompanion/SessionCompanion.Services/Services/ShopkeeperService.cs @@ -41,14 +41,14 @@ namespace SessionCompanion.Services.Services await Repository.Update(shopkeeper); } await Repository.Save(); - return new SuccessResponse("Shopkeepers updated") { SuccessCode = 200 }; + return new SuccessResponse("Shopkeepers updated") { StatusCode = 200 }; } var newActiveShopkeeper = shopkeepers.Where(c => c.Id.Equals(shopkeeperId)).Single(); newActiveShopkeeper.IsAvailable = false; await Repository.Update(newActiveShopkeeper); await Repository.Save(); - return new SuccessResponse("Shopkeepers updated") { SuccessCode = 200 }; + return new SuccessResponse("Shopkeepers updated") { StatusCode = 200 }; } catch (Exception e) {