Merge branch 'dev' into SES-160

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)
             {

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

SessionCompanion/SessionCompanion.Services/Services/ShopkeeperService.cs

@@ -42,14 +42,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)
             {

SessionCompanion/SessionCompanion.ViewModels/ApiResponses/ErrorResponse.cs

@@ -4,6 +4,40 @@ namespace SessionCompanion.ViewModels.ApiResponses
 {
     public class ErrorResponse
     {
+        /// <summary>
+        /// Pusty konstruktor
+        /// </summary>
+        public ErrorResponse()
+        { }
+
+        /// <summary>
+        /// Konstruktor obiektu
+        /// </summary>
+        /// <param name="code"></param>
+        public ErrorResponse(int code)
+        {
+            this.StatusCode = code;
+        }
+
+        /// <summary>
+        /// Konstruktor obiektu
+        /// </summary>
+        /// <param name="message"></param>
+        public ErrorResponse(string message)
+        {
+            this.Message = message;
+        }
+
+        /// <summary>
+        /// Konstruktor obiektu
+        /// </summary>
+        /// <param name="code"></param>
+        /// <param name="message"></param>
+        public ErrorResponse(int code, string message)
+        {
+            this.StatusCode = code;
+            this.Message = message;
+        }
         /// <summary>
         /// Kod błędu
         /// </summary>

SessionCompanion/SessionCompanion.ViewModels/ApiResponses/SuccessResponse.cs

@@ -5,24 +5,50 @@
     /// </summary>
     public class SuccessResponse
     {
+        /// <summary>
+        /// Pusty konstruktor obiektu
+        /// </summary>
+        public SuccessResponse()
+        { }
+
         /// <summary>
         /// Konstruktor obiektu
         /// </summary>
         /// <param name="message"> Wiadomość dotycząca operacji </param>
         public SuccessResponse(string message)
         {
-            this.SuccessCode = 200;
+            this.StatusCode = 200;
-            this.SuccessMessage = message;
+            this.Message = message;
+        }
+
+        /// <summary>
+        /// Konstruktor obiektu
+        /// </summary>
+        /// <param name="code"></param>
+        public SuccessResponse(int code)
+        {
+            this.StatusCode = code;
+        }
+
+        /// <summary>
+        /// Konstruktor obiektu
+        /// </summary>
+        /// <param name="code"></param>
+        /// <param name="message"></param>
+        public SuccessResponse(int code, string message)
+        {
+            this.StatusCode = code;
+            this.Message = message;
         }
 
         /// <summary>
         /// Kod odpowiedzi, domyślnie nadawany jest 200
         /// </summary>
-        public int SuccessCode { get; set; }
+        public int StatusCode { get; set; }
 
         /// <summary>
         /// Wiadomość dotycząca wykoanania operacji
         /// </summary>
-        public string SuccessMessage { get; set; }
+        public string Message { get; set; }
     }
 }

SessionCompanion/SessionCompanion/ClientApp/src/types/SuccessResponse.ts

@@ -1,4 +1,4 @@
 export interface SuccessResponse {
-  code: number;
+  statusCode: number;
   message: string;
 }

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)
             {

SessionCompanion/SessionCompanion/Controllers/EquipmentController.cs

@@ -93,7 +93,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)
             {
@@ -115,7 +115,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)
             {