Merge pull request 'SES-119 Added items tables' (#42) from SES-119 into dev

Reviewed-on: #42

SessionCompanion/SessionCompanion.Database/ApplicationDbContext.cs

@@ -24,6 +24,12 @@ namespace SessionCompanion.Database
         public virtual DbSet<Strength> Strengths { get; set; }
         public virtual DbSet<User> Users { get; set; }
         public virtual DbSet<Wisdom> Wisdoms { get; set; }
+        public virtual DbSet<Armor> Armors { get; set; }
+        public virtual DbSet<CharacterArmor> CharacterArmors { get; set; }
+        public virtual DbSet<Weapon> Weapons { get; set; }
+        public virtual DbSet<CharacterWeapon> CharacterWeapons { get; set; }
+        public virtual DbSet<OtherEquipment> OtherEquipment { get; set; }
+        public virtual DbSet<CharacterOtherEquipment> CharacterOtherEquipment { get; set; }
 
         public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : base(options) { }
 

SessionCompanion/SessionCompanion.Database/Repositories/ArmorRepository.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SessionCompanion.Database.Repositories
+{
+    using SessionCompanion.Database.Repositories.Base;
+    using SessionCompanion.Database.Tables;
+
+    public class ArmorRepository : Repository<Armor>, IRepository<Armor>
+    {
+        public ArmorRepository(ApplicationDbContext _dbContext) : base(_dbContext)
+        { }
+    }
+}

SessionCompanion/SessionCompanion.Database/Repositories/CharacterArmorRepository.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SessionCompanion.Database.Repositories
+{
+    using SessionCompanion.Database.Repositories.Base;
+    using SessionCompanion.Database.Tables;
+
+    public class CharacterArmorRepository : Repository<CharacterArmor>, IRepository<CharacterArmor>
+    {
+        public CharacterArmorRepository(ApplicationDbContext _dbContext) : base(_dbContext)
+        { }
+    }
+}

SessionCompanion/SessionCompanion.Database/Repositories/CharacterOtherEquipmentRepository.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SessionCompanion.Database.Repositories
+{
+    using SessionCompanion.Database.Repositories.Base;
+    using SessionCompanion.Database.Tables;
+
+    public class CharacterOtherEquipmentRepository : Repository<CharacterOtherEquipment>, IRepository<CharacterOtherEquipment>
+    {
+        public CharacterOtherEquipmentRepository(ApplicationDbContext _dbContext) : base(_dbContext)
+        { }
+    }
+}

SessionCompanion/SessionCompanion.Database/Repositories/CharacterWeaponRepository.cs

@@ -0,0 +1,14 @@
+using SessionCompanion.Database.Repositories.Base;
+using SessionCompanion.Database.Tables;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SessionCompanion.Database.Repositories
+{
+    public class CharacterWeaponRepository: Repository<CharacterWeapon>, IRepository<CharacterWeapon>
+    {
+        public CharacterWeaponRepository(ApplicationDbContext _dbContext) : base(_dbContext)
+        { }
+    }
+}

SessionCompanion/SessionCompanion.Database/Repositories/OtherEquipmentRepository.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SessionCompanion.Database.Repositories
+{
+    using SessionCompanion.Database.Repositories.Base;
+    using SessionCompanion.Database.Tables;
+
+    public class OtherEquipmentRepository : Repository<OtherEquipment>, IRepository<OtherEquipment>
+    {
+        public OtherEquipmentRepository(ApplicationDbContext _dbContext) : base(_dbContext)
+        { }
+    }
+}

SessionCompanion/SessionCompanion.Database/Repositories/WeaponRepository.cs

@@ -0,0 +1,14 @@
+using SessionCompanion.Database.Repositories.Base;
+using SessionCompanion.Database.Tables;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SessionCompanion.Database.Repositories
+{
+    public class WeaponRepository : Repository<Weapon>, IRepository<Weapon>
+    {
+        public WeaponRepository(ApplicationDbContext _dbContext) : base(_dbContext)
+        { }
+    }
+}

SessionCompanion/SessionCompanion.Database/SessionCompanion.Database.csproj

@@ -17,4 +17,8 @@
     </PackageReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\SessionCompanion.ViewModels\SessionCompanion.ViewModels.csproj" />
+  </ItemGroup>
+
 </Project>

SessionCompanion/SessionCompanion.Database/Tables/Armor.cs

@@ -0,0 +1,21 @@
+using SessionCompanion.ViewModels.Enums;
+using System.Collections.Generic;
+
+namespace SessionCompanion.Database.Tables
+{
+
+    public class Armor : BaseEntity
+    {
+        public string Name { get; set; }
+        public string Category { get; set; }
+        public string ArmorClassBase {get; set; }
+        public bool HaveDexterityBonus { get; set; }
+        public int? MinimumStrength { get; set; }
+        public bool HaveStealthDisadvantage { get; set; }
+        public int Weight { get; set; }
+        public int Cost { get; set; }
+        public CurrencyType CurrencyType { get; set; }
+
+        public virtual ICollection<CharacterArmor> CharacterArmors { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.Database/Tables/CharacterArmor.cs

@@ -0,0 +1,18 @@
+namespace SessionCompanion.Database.Tables
+{
+    using System.ComponentModel.DataAnnotations.Schema;
+
+    public class CharacterArmor : BaseEntity
+    {
+        [ForeignKey(nameof(Character))]
+        public int CharacterId { get; set; }
+        public virtual Character Character { get; set; }
+
+        [ForeignKey(nameof(Armor))]
+        public int ArmorId { get; set; }
+        public virtual Armor Armor { get; set; }
+
+        public bool InUse { get; set; }
+
+    }
+}

SessionCompanion/SessionCompanion.Database/Tables/CharacterOtherEquipment.cs

@@ -0,0 +1,15 @@
+namespace SessionCompanion.Database.Tables
+{
+    using System.ComponentModel.DataAnnotations.Schema;
+
+    public class CharacterOtherEquipment : BaseEntity
+    {
+        [ForeignKey(nameof(Character))]
+        public int CharacterId { get; set; }
+        public virtual Character Character { get; set; }
+
+        [ForeignKey(nameof(OtherEquipment))]
+        public int OtherEquipmentId { get; set; }
+        public virtual OtherEquipment OtherEquipment { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.Database/Tables/CharacterWeapon.cs

@@ -0,0 +1,20 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace SessionCompanion.Database.Tables
+{
+    public class CharacterWeapon : BaseEntity
+    {
+        [ForeignKey(nameof(Character))]
+        public int CharacterId { get; set; }
+        public virtual Character Character { get; set; }
+
+        [ForeignKey(nameof(Weapon))]
+        public int WeaponId { get; set; }
+        public virtual Weapon Weapon { get; set; }
+
+        public bool InUse { get; set; }
+
+        public bool HoldInRightHand { get; set; }
+        public bool HoldInLeftHand { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.Database/Tables/OtherEquipment.cs

@@ -0,0 +1,16 @@
+using SessionCompanion.ViewModels.Enums;
+using System.Collections.Generic;
+
+namespace SessionCompanion.Database.Tables
+{
+
+    public class OtherEquipment : BaseEntity
+    {
+        public string Name { get; set; }
+        public string Description { get; set; }
+        public int Cost { get; set; }
+        public CurrencyType CurrencyType { get; set; }
+
+        public virtual ICollection<CharacterOtherEquipment> CharacterOtherEquipments { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.Database/Tables/Weapon.cs

@@ -0,0 +1,29 @@
+using SessionCompanion.ViewModels.Enums;
+using System.Collections.Generic;
+
+namespace SessionCompanion.Database.Tables
+{
+    public class Weapon : BaseEntity
+    {
+        public string Name { get; set; }
+        public int Cost { get; set; }
+        public int Weight { get; set; }
+
+        public CurrencyType CurrencyType { get; set; }
+        public int DiceCount { get; set; }
+        public int DiceValue { get; set; }
+        public int? TwoHandDiceCount { get; set; }
+        public int? TwoHandDiceValue { get; set; }
+        public string TwoHandDamageType { get; set; }
+        
+        public string Description { get; set; }
+
+        public string WeaponType { get; set; }
+        public int RangeMeele { get; set; }
+        public int? RangeThrowNormal { get; set; }
+        public int? RangeThrowLong { get; set; }
+        public int? RangeLong { get; set; }
+
+        public virtual ICollection<CharacterWeapon> CharacterWeapons { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.Services/Intefraces/IArmorService.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SessionCompanion.Services.Interfaces
+{
+    using SessionCompanion.Database.Tables;
+    using SessionCompanion.Services.Base;
+    using SessionCompanion.ViewModels.ArmorViewModels;
+
+    public interface IArmorService : IServiceBase<ArmorViewModel, Armor>
+    {
+    }
+}

SessionCompanion/SessionCompanion.Services/Intefraces/ICharacterArmorService.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SessionCompanion.Services.Interfaces
+{
+    using System.Threading.Tasks;
+
+    using SessionCompanion.Database.Tables;
+    using SessionCompanion.Services.Base;
+    using SessionCompanion.ViewModels.CharacterArmorViewModels;
+
+    public interface ICharacterArmorService : IServiceBase<CharacterArmorViewModel, CharacterArmor>
+    {
+    }
+}

SessionCompanion/SessionCompanion.Services/Intefraces/ICharacterOtherEquipmentService.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SessionCompanion.Services.Interfaces
+{
+    using System.Threading.Tasks;
+
+    using SessionCompanion.Database.Tables;
+    using SessionCompanion.Services.Base;
+    using SessionCompanion.ViewModels.CharacterOtherEquipmentViewModels;
+
+    public interface ICharacterOtherEquipmentService : IServiceBase<CharacterOtherEquipmentViewModel, CharacterOtherEquipment>
+    {
+    }
+}

SessionCompanion/SessionCompanion.Services/Intefraces/ICharacterWeaponService.cs

@@ -0,0 +1,10 @@
+using SessionCompanion.Database.Tables;
+using SessionCompanion.Services.Base;
+using SessionCompanion.ViewModels.CharacterWeaponViewModels;
+
+namespace SessionCompanion.Services.Interfaces
+{
+    public interface ICharacterWeaponService : IServiceBase<CharacterWeaponViewModel, CharacterWeapon>
+    {
+    }
+}

SessionCompanion/SessionCompanion.Services/Intefraces/IOtherEquipmentService.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SessionCompanion.Services.Interfaces
+{
+    using SessionCompanion.Database.Tables;
+    using SessionCompanion.Services.Base;
+    using SessionCompanion.ViewModels.OtherEquipmentViewModels;
+
+    public interface IOtherEquipmentService : IServiceBase<OtherEquipmentViewModel, OtherEquipment>
+    {
+    }
+}

SessionCompanion/SessionCompanion.Services/Intefraces/IWeaponService.cs

@@ -0,0 +1,13 @@
+using SessionCompanion.Database.Tables;
+using SessionCompanion.Services.Base;
+using SessionCompanion.ViewModels.WeaponViewModels;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SessionCompanion.Services.Interfaces
+{
+    public interface IWeaponService : IServiceBase<WeaponViewModel, Weapon>
+    {
+    }
+}

SessionCompanion/SessionCompanion.Services/Profiles/ArmorProfile.cs

@@ -0,0 +1,14 @@
+using AutoMapper;
+using SessionCompanion.Database.Tables;
+using SessionCompanion.ViewModels.ArmorViewModels;
+
+namespace SessionCompanion.Services.Profiles
+{
+    public class ArmorProfile : Profile
+    {
+        public ArmorProfile()
+        {
+            CreateMap<Armor, ArmorViewModel>().ReverseMap();
+        }
+    }
+}

SessionCompanion/SessionCompanion.Services/Profiles/CharacterArmorsProfile.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SessionCompanion.Services.Profiles
+{
+    using AutoMapper;
+
+    using SessionCompanion.Database.Tables;
+    using SessionCompanion.ViewModels.CharacterArmorViewModels;
+
+    public class CharacterArmorsProfile : Profile
+    {
+        public CharacterArmorsProfile()
+        {
+            CreateMap<CharacterArmorViewModel, CharacterArmor>().ReverseMap();
+
+            CreateMap<CharacterArmor, CharacterArmorViewModelDetails>()
+                .ForMember(vm => vm.Name, conf => conf.MapFrom(armor => armor.Armor.Name.ToString()))
+                .ForMember(vm => vm.Category, conf => conf.MapFrom(armor => armor.Armor.Category.ToString()))
+                .ForMember(
+                    vm => vm.ArmorClassBase,
+                    conf => conf.MapFrom(armor => armor.Armor.ArmorClassBase.ToString()))
+                .ForMember(vm => vm.HaveDexterityBonus, conf => conf.MapFrom(armor => armor.Armor.HaveDexterityBonus))
+                .ForMember(vm => vm.MinimumStrength, conf => conf.MapFrom(armor => armor.Armor.MinimumStrength))
+                .ForMember(
+                    vm => vm.HaveStealthDisadvantage,
+                    conf => conf.MapFrom(armor => armor.Armor.HaveStealthDisadvantage))
+                .ForMember(vm => vm.Weight, conf => conf.MapFrom(armor => armor.Armor.Weight))
+                .ForMember(vm => vm.Cost, conf => conf.MapFrom(armor => armor.Armor.Cost))
+                .ForMember(vm => vm.CurrencyType, conf => conf.MapFrom(armor => armor.Armor.CurrencyType)).ReverseMap();
+        }
+    }
+}

SessionCompanion/SessionCompanion.Services/Profiles/CharacterOtherEquipmentsProfile.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SessionCompanion.Services.Profiles
+{
+    using AutoMapper;
+
+    using SessionCompanion.Database.Tables;
+    using SessionCompanion.ViewModels.CharacterOtherEquipmentViewModels;
+
+    public class CharacterOtherEquipmentsProfile : Profile
+    {
+        public CharacterOtherEquipmentsProfile()
+        {
+            CreateMap<CharacterOtherEquipmentViewModel, CharacterOtherEquipment>().ReverseMap();
+
+            CreateMap<CharacterOtherEquipment, CharacterOtherEquipmentWithDetailsViewModel>()
+                .ForMember(vm => vm.Name, conf => conf.MapFrom(otherEquipment => otherEquipment.OtherEquipment.Name.ToString()))
+                .ForMember(
+                    vm => vm.Description,
+                    conf => conf.MapFrom(otherEquipment => otherEquipment.OtherEquipment.Description.ToString()))
+                .ForMember(
+                    vm => vm.Cost,
+                    conf => conf.MapFrom(otherEquipment => otherEquipment.OtherEquipment.Cost))
+                .ForMember(
+                    vm => vm.CurrencyType,
+                    conf => conf.MapFrom(otherEquipment => otherEquipment.OtherEquipment.CurrencyType)).ReverseMap();
+        }
+    }
+}

SessionCompanion/SessionCompanion.Services/Profiles/CharacterWeaponsProfile.cs

@@ -0,0 +1,32 @@
+using AutoMapper;
+using SessionCompanion.Database.Tables;
+using SessionCompanion.ViewModels.CharacterWeaponViewModels;
+
+namespace SessionCompanion.Services.Profiles
+{
+    public class CharacterWeaponsProfile : Profile
+    {
+        public CharacterWeaponsProfile()
+        {
+            CreateMap<CharacterWeaponViewModel, CharacterWeapon>().ReverseMap();
+
+            CreateMap<CharacterWeapon, CharacterWeaponWithWeaponDetailsViewModel>()
+                .ForMember(vm => vm.Name, conf => conf.MapFrom(weapon => weapon.Weapon.Name.ToString()))
+                .ForMember(vm => vm.Weight, conf => conf.MapFrom(weapon => weapon.Weapon.Weight.ToString()))
+                .ForMember(vm => vm.HoldInRightHand, conf => conf.MapFrom(weapon => weapon.HoldInRightHand))
+                .ForMember(vm => vm.HoldInLeftHand, conf => conf.MapFrom(weapon => weapon.HoldInLeftHand))
+                .ForMember(vm => vm.Cost, conf => conf.MapFrom(weapon => weapon.Weapon.Cost.ToString()))
+                .ForMember(vm => vm.RangeMeele, conf => conf.MapFrom(weapon => weapon.Weapon.RangeMeele))
+                .ForMember(vm => vm.RangeLong, conf => conf.MapFrom(weapon => weapon.Weapon.RangeLong))
+                .ForMember(vm => vm.RangeThrowNormal, conf => conf.MapFrom(weapon => weapon.Weapon.RangeThrowNormal))
+                .ForMember(vm => vm.RangeThrowLong, conf => conf.MapFrom(weapon => weapon.Weapon.RangeThrowLong))
+                .ForMember(vm => vm.CurrencyType, conf => conf.MapFrom(weapon => weapon.Weapon.CurrencyType.ToString()))
+                .ForMember(vm => vm.WeaponType, conf => conf.MapFrom(weapon => weapon.Weapon.WeaponType.ToString()))
+                .ForMember(vm => vm.Description, conf => conf.MapFrom(weapon => weapon.Weapon.Description))
+                .ForMember(vm => vm.DiceValue, conf => conf.MapFrom(weapon => weapon.Weapon.DiceValue))
+                .ForMember(vm => vm.DiceCount, conf => conf.MapFrom(weapon => weapon.Weapon.DiceCount))
+                .ForMember(vm => vm.TwoHandDiceValue, conf => conf.MapFrom(weapon => weapon.Weapon.TwoHandDiceValue))
+                .ForMember(vm => vm.TwoHandDamageType, conf => conf.MapFrom(weapon => weapon.Weapon.TwoHandDamageType.ToString())).ReverseMap();
+        }
+    }
+}

SessionCompanion/SessionCompanion.Services/Profiles/OtherEquipmentProfile.cs

@@ -0,0 +1,14 @@
+using AutoMapper;
+using SessionCompanion.Database.Tables;
+using SessionCompanion.ViewModels.OtherEquipmentViewModels;
+
+namespace SessionCompanion.Services.Profiles
+{
+    public class OtherEquipmentProfile : Profile
+    {
+        public OtherEquipmentProfile()
+        {
+            CreateMap<OtherEquipmentViewModel, OtherEquipment>().ReverseMap();
+        }
+    }
+}

SessionCompanion/SessionCompanion.Services/Profiles/WeaponProfile.cs

@@ -0,0 +1,14 @@
+using AutoMapper;
+using SessionCompanion.Database.Tables;
+using SessionCompanion.ViewModels.WeaponViewModels;
+
+namespace SessionCompanion.Services.Profiles
+{
+    public class WeaponProfile : Profile
+    {
+        public WeaponProfile()
+        {
+            CreateMap<WeaponViewModel, Weapon>().ReverseMap();
+        }
+    }
+}

SessionCompanion/SessionCompanion.Services/Services/ArmorService.cs

@@ -0,0 +1,16 @@
+namespace SessionCompanion.Services.Services
+{
+    using AutoMapper;
+
+    using SessionCompanion.Database.Repositories.Base;
+    using SessionCompanion.Database.Tables;
+    using SessionCompanion.Services.Base;
+    using SessionCompanion.Services.Interfaces;
+    using SessionCompanion.ViewModels.ArmorViewModels;
+
+    public class ArmorService : ServiceBase<ArmorViewModel, Armor>, IArmorService
+    {
+        public ArmorService(IMapper mapper, IRepository<Armor> repository) : base(mapper, repository)
+        { }
+    }
+}

SessionCompanion/SessionCompanion.Services/Services/CharacterArmorService.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SessionCompanion.Services.Services
+{
+    using System.Linq;
+    using System.Threading.Tasks;
+
+    using AutoMapper;
+
+    using Microsoft.EntityFrameworkCore;
+
+    using SessionCompanion.Database.Repositories.Base;
+    using SessionCompanion.Database.Tables;
+    using SessionCompanion.Services.Base;
+    using SessionCompanion.Services.Interfaces;
+    using SessionCompanion.ViewModels.CharacterArmorViewModels;
+
+    public class CharacterArmorService : ServiceBase<CharacterArmorViewModel, CharacterArmor>, ICharacterArmorService
+    {
+        public CharacterArmorService(IMapper mapper, IRepository<CharacterArmor> repository) : base(mapper, repository)
+        { }
+    }
+}

SessionCompanion/SessionCompanion.Services/Services/CharacterOtherEquipmentService.cs

@@ -0,0 +1,17 @@
+namespace SessionCompanion.Services.Services
+{
+
+    using AutoMapper;
+    using SessionCompanion.Database.Repositories.Base;
+    using SessionCompanion.Database.Tables;
+    using SessionCompanion.Services.Base;
+    using SessionCompanion.Services.Interfaces;
+    using SessionCompanion.ViewModels.CharacterOtherEquipmentViewModels;
+
+    public class CharacterOtherEquipmentService : ServiceBase<CharacterOtherEquipmentViewModel, CharacterOtherEquipment>, ICharacterOtherEquipmentService
+    {
+        public CharacterOtherEquipmentService(IMapper mapper, IRepository<CharacterOtherEquipment> repository) : base(mapper, repository)
+        { }
+
+    }
+}

SessionCompanion/SessionCompanion.Services/Services/CharacterWeaponService.cs

@@ -0,0 +1,15 @@
+using AutoMapper;
+using SessionCompanion.Database.Repositories.Base;
+using SessionCompanion.Database.Tables;
+using SessionCompanion.Services.Base;
+using SessionCompanion.Services.Interfaces;
+using SessionCompanion.ViewModels.CharacterWeaponViewModels;
+
+namespace SessionCompanion.Services.Services
+{
+    public class CharacterWeaponService : ServiceBase<CharacterWeaponViewModel, CharacterWeapon>, ICharacterWeaponService
+    {
+        public CharacterWeaponService(IMapper mapper, IRepository<CharacterWeapon> repository) : base(mapper, repository)
+        { }
+    }
+}

SessionCompanion/SessionCompanion.Services/Services/OtherEquipmentService.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SessionCompanion.Services.Services
+{
+    using AutoMapper;
+
+    using SessionCompanion.Database.Repositories.Base;
+    using SessionCompanion.Database.Tables;
+    using SessionCompanion.Services.Base;
+    using SessionCompanion.Services.Interfaces;
+    using SessionCompanion.ViewModels.OtherEquipmentViewModels;
+
+    public class OtherEquipmentService : ServiceBase<OtherEquipmentViewModel, OtherEquipment>, IOtherEquipmentService
+    {
+        public OtherEquipmentService(IMapper mapper, IRepository<OtherEquipment> repository) : base(mapper, repository)
+        { }
+    }
+}

SessionCompanion/SessionCompanion.Services/Services/WeaponService.cs

@@ -0,0 +1,18 @@
+using AutoMapper;
+using SessionCompanion.Database.Repositories.Base;
+using SessionCompanion.Database.Tables;
+using SessionCompanion.Services.Base;
+using SessionCompanion.Services.Interfaces;
+using SessionCompanion.ViewModels.WeaponViewModels;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SessionCompanion.Services.Services
+{
+    public class WeaponService : ServiceBase<WeaponViewModel, Weapon>, IWeaponService
+    {
+        public WeaponService(IMapper mapper, IRepository<Weapon> repository) : base(mapper, repository)
+        { }
+    }
+}

SessionCompanion/SessionCompanion.ViewModels/ArmorViewModel/ArmorViewModel.cs

@@ -0,0 +1,18 @@
+namespace SessionCompanion.ViewModels.ArmorViewModels
+{
+    using SessionCompanion.ViewModels.Enums;
+
+    public class ArmorViewModel
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+        public string Category { get; set; }
+        public string ArmorClassBase { get; set; }
+        public bool HaveDexterityBonus { get; set; }
+        public int? MinimumStrength { get; set; }
+        public bool HaveStealthDisadvantage { get; set; }
+        public int Weight { get; set; }
+        public int Cost { get; set; }
+        public CurrencyType CurrencyType { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.ViewModels/CharacterArmorViewModels/CharacterArmorViewModel.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SessionCompanion.ViewModels.CharacterArmorViewModels
+{
+    public class CharacterArmorViewModel
+    {
+        public int Id { get; set; }
+        public int CharacterId { get; set; }
+        public int ArmorId { get; set; }
+        public bool InUse { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.ViewModels/CharacterArmorViewModels/CharacterArmorViewModelDetails.cs

@@ -0,0 +1,21 @@
+using SessionCompanion.ViewModels.Enums;
+
+namespace SessionCompanion.ViewModels.CharacterArmorViewModels
+{
+    public class CharacterArmorViewModelDetails
+    {
+        public int Id { get; set; }
+        public int CharacterId { get; set; }
+        public int ArmorId { get; set; }
+        public string Name { get; set; }
+        public string Category { get; set; }
+        public string ArmorClassBase { get; set; }
+        public bool HaveDexterityBonus { get; set; }
+        public int? MinimumStrength { get; set; }
+        public bool HaveStealthDisadvantage { get; set; }
+        public int Weight { get; set; }
+        public int Cost { get; set; }
+        public CurrencyType CurrencyType { get; set; }
+        public bool InUse { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.ViewModels/CharacterOtherEquipmentViewModels/CharacterOtherEquipmentViewModel.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SessionCompanion.ViewModels.CharacterOtherEquipmentViewModels
+{
+    public class CharacterOtherEquipmentViewModel
+    {
+        public int Id { get; set; }
+        public int CharacterId { get; set; }
+        public int OtherEquipmentId { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.ViewModels/CharacterOtherEquipmentViewModels/CharacterOtherEquipmentWithDetailsViewModel.cs

@@ -0,0 +1,15 @@
+using SessionCompanion.ViewModels.Enums;
+
+namespace SessionCompanion.ViewModels.CharacterOtherEquipmentViewModels
+{
+    public class CharacterOtherEquipmentWithDetailsViewModel
+    {
+        public int Id { get; set; }
+        public int CharacterId { get; set; }
+        public int OtherEquipmentId { get; set; }
+        public string Name { get; set; }
+        public string Description { get; set; }
+        public int Cost { get; set; }
+        public CurrencyType CurrencyType { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.ViewModels/CharacterWeaponsViewModels/CharacterWeaponViewModel.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace SessionCompanion.ViewModels.CharacterWeaponViewModels
+{
+    public class CharacterWeaponViewModel
+    {
+        public int Id { get; set; }
+        public int CharacterId { get; set; }
+        public int WeaponId { get; set; }
+        public bool InUse { get; set; }
+        public bool HoldInRightHand { get; set; }
+        public bool HoldInLeftHand { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.ViewModels/CharacterWeaponsViewModels/CharacterWeaponWithWeaponsDetailsViewModel.cs

@@ -0,0 +1,28 @@
+using SessionCompanion.ViewModels.Enums;
+using System.Collections.Generic;
+
+namespace SessionCompanion.ViewModels.CharacterWeaponViewModels
+{
+    public class CharacterWeaponWithWeaponDetailsViewModel
+    {
+        public int WeaponId { get; set; }
+        public bool InUse { get; set; }
+        public string Name { get; set; }
+        public int Cost { get; set; }
+        public CurrencyType CurrencyType { get; set; }
+        public int Weight { get; set; }
+        public bool HoldInRightHand { get; set; }
+        public bool HoldInLeftHand { get; set; }
+        public int DiceCount { get; set; }
+        public int DiceValue { get; set; }
+        public int? TwoHandDiceCount { get; set; }
+        public int? TwoHandDiceValue { get; set; }
+        public string TwoHandDamageType { get; set; }
+        public string Description { get; set; }
+        public string WeaponType { get; set; }
+        public int RangeMeele { get; set; }
+        public int? RangeThrowNormal { get; set; }
+        public int? RangeThrowLong { get; set; }
+        public int? RangeLong { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.ViewModels/Enums/CurrencyType.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SessionCompanion.ViewModels.Enums
+{
+
+    /// <summary>
+    /// Rodzaje waluty
+    /// </summary>
+    public enum CurrencyType
+    {
+        /// <summary>
+        /// Bronz
+        /// </summary>
+        cp,
+
+        /// <summary>
+        /// Srebro
+        /// </summary>
+        sp,
+
+        /// <summary>
+        /// Elektrum
+        /// </summary>
+        ep,
+
+        /// <summary>
+        /// Złotot
+        /// </summary>
+        gp,
+
+        /// <summary>
+        /// Platyna
+        /// </summary>
+        pp
+    }
+}

SessionCompanion/SessionCompanion.ViewModels/OtherEquipmentViewModels/OtherEquipmentViewModel.cs

@@ -0,0 +1,13 @@
+namespace SessionCompanion.ViewModels.OtherEquipmentViewModels
+{
+    using SessionCompanion.ViewModels.Enums;
+
+    public class OtherEquipmentViewModel
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+        public string Description { get; set; }
+        public int Cost { get; set; }
+        public CurrencyType CurrencyType { get; set; }
+    }
+}

SessionCompanion/SessionCompanion.ViewModels/SessionCompanion.ViewModels.xml

@@ -310,6 +310,36 @@
             Czy postać posiada biegłość w skradaniu się
             </summary>
         </member>
+        <member name="T:SessionCompanion.ViewModels.Enums.CurrencyType">
+            <summary>
+            Rodzaje waluty
+            </summary>
+        </member>
+        <member name="F:SessionCompanion.ViewModels.Enums.CurrencyType.cp">
+            <summary>
+            Bronz
+            </summary>
+        </member>
+        <member name="F:SessionCompanion.ViewModels.Enums.CurrencyType.sp">
+            <summary>
+            Srebro
+            </summary>
+        </member>
+        <member name="F:SessionCompanion.ViewModels.Enums.CurrencyType.ep">
+            <summary>
+            Elektrum
+            </summary>
+        </member>
+        <member name="F:SessionCompanion.ViewModels.Enums.CurrencyType.gp">
+            <summary>
+            Złotot
+            </summary>
+        </member>
+        <member name="F:SessionCompanion.ViewModels.Enums.CurrencyType.pp">
+            <summary>
+            Platyna
+            </summary>
+        </member>
         <member name="P:SessionCompanion.ViewModels.IntelligenceViewModels.IntelligenceViewModel.Id">
             <summary>
             Identyfikator inteligencji postaci

SessionCompanion/SessionCompanion.ViewModels/WeaponViewModels/WeaponViewModel.cs

@@ -0,0 +1,29 @@
+using SessionCompanion.ViewModels.Enums;
+using System.Collections.Generic;
+
+namespace SessionCompanion.ViewModels.WeaponViewModels
+{
+    public class WeaponViewModel
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+        public int Cost { get; set; }
+        public int Weight { get; set; }
+
+        public CurrencyType CurrencyType { get; set; }
+        public int DiceCount { get; set; }
+        public int DiceValue { get; set; }
+
+        public int? TwoHandDiceCount { get; set; }
+        public int? TwoHandDiceValue { get; set; }
+        public string TwoHandDamageType { get; set; }
+
+        public string Description { get; set; }
+
+        public string WeaponType { get; set; }
+        public int RangeMeele { get; set; }
+        public int? RangeThrowNormal { get; set; }
+        public int? RangeThrowLong { get; set; }
+        public int? RangeLong { get; set; }
+    }
+}

SessionCompanion/SessionCompanion/Configurations/RepositoryConfiguration.cs

@@ -27,6 +27,12 @@ namespace SessionCompanion.Configurations
             services.AddScoped<IRepository<Strength>, StrengthRepository>();
             services.AddScoped<IRepository<User>, UserRepository>();
             services.AddScoped<IRepository<Wisdom>, WisdomRepository>();
+            services.AddScoped<IRepository<Armor>, ArmorRepository>();
+            services.AddScoped<IRepository<CharacterArmor>, CharacterArmorRepository>();
+            services.AddScoped<IRepository<OtherEquipment>, OtherEquipmentRepository>();
+            services.AddScoped<IRepository<CharacterOtherEquipment>, CharacterOtherEquipmentRepository>();
+            services.AddScoped<IRepository<Weapon>, WeaponRepository>();
+            services.AddScoped<IRepository<CharacterWeapon>, CharacterWeaponRepository>();
 
             return services;
         }

SessionCompanion/SessionCompanion/Configurations/ServiceConfiguration.cs

@@ -26,6 +26,13 @@ namespace SessionCompanion.Configurations
             services.AddScoped<IStrengthService, StrengthService>();
             services.AddScoped<IUserService, UserService>();
             services.AddScoped<IWisdomService, WisdomService>();
+            services.AddScoped<IArmorService, ArmorService>();
+            services.AddScoped<ICharacterArmorService, CharacterArmorService>();
+            services.AddScoped<IOtherEquipmentService, OtherEquipmentService>();
+            services.AddScoped<ICharacterOtherEquipmentService, CharacterOtherEquipmentService>();
+            services.AddScoped<IWeaponService, WeaponService>();
+            services.AddScoped<ICharacterWeaponService, CharacterWeaponService>();
+
             return services;
         }
     }