Skip to content

Commit 330da0d

Browse files
feat(formats): rename 'CartridgeOfLife' by 'SafetyCartridge'
1 parent 4baa3d5 commit 330da0d

11 files changed

+1675
-30
lines changed

src/Armory.Api/Controllers/Formats/AssignedWeaponMagazineFormats/Requests/AddAssignedWeaponMagazineFormatItemRequest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ public class AddAssignedWeaponMagazineFormatItemRequest
55
public int FormatId { get; set; }
66
public string TroopId { get; set; }
77
public string WeaponCode { get; set; }
8-
public bool CartridgeOfLife { get; set; }
8+
public bool SafetyCartridge { get; set; }
99
public bool VerifiedInPhysical { get; set; }
1010
public bool Novelty { get; set; }
1111
public int AmmunitionQuantity { get; set; }

src/Armory/Formats/AssignedWeaponMagazineFormats/Application/AddItem/AddAssignedWeaponMagazineFormatItemCommand.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ namespace Armory.Formats.AssignedWeaponMagazineFormats.Application.AddItem
55
public class AddAssignedWeaponMagazineFormatItemCommand : Command<AssignedWeaponMagazineFormatItemResponse>
66
{
77
public AddAssignedWeaponMagazineFormatItemCommand(int formatId, string troopId, string weaponCode,
8-
bool cartridgeOfLife, bool verifiedInPhysical, bool novelty, int ammunitionQuantity, string ammunitionLot,
8+
bool safetyCartridge, bool verifiedInPhysical, bool novelty, int ammunitionQuantity, string ammunitionLot,
99
string observations)
1010
{
1111
FormatId = formatId;
1212
TroopId = troopId;
1313
WeaponCode = weaponCode;
14-
CartridgeOfLife = cartridgeOfLife;
14+
SafetyCartridge = safetyCartridge;
1515
VerifiedInPhysical = verifiedInPhysical;
1616
Novelty = novelty;
1717
AmmunitionQuantity = ammunitionQuantity;
@@ -22,7 +22,7 @@ public AddAssignedWeaponMagazineFormatItemCommand(int formatId, string troopId,
2222
public int FormatId { get; }
2323
public string TroopId { get; }
2424
public string WeaponCode { get; }
25-
public bool CartridgeOfLife { get; }
25+
public bool SafetyCartridge { get; }
2626
public bool VerifiedInPhysical { get; }
2727
public bool Novelty { get; }
2828
public int AmmunitionQuantity { get; }

src/Armory/Formats/AssignedWeaponMagazineFormats/Application/AddItem/AddAssignedWeaponMagazineFormatItemCommandHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public async Task<AssignedWeaponMagazineFormatItemResponse> Handle(
2727
request.FormatId,
2828
request.TroopId,
2929
request.WeaponCode,
30-
request.CartridgeOfLife,
30+
request.SafetyCartridge,
3131
request.VerifiedInPhysical,
3232
request.Novelty,
3333
request.AmmunitionQuantity,

src/Armory/Formats/AssignedWeaponMagazineFormats/Application/AddItem/AssignedWeaponMagazineFormatItemAdder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public AssignedWeaponMagazineFormatItemAdder(IAssignedWeaponMagazineFormatsRepos
1818
}
1919

2020
public async Task<AssignedWeaponMagazineFormatItem> AddItem(int formatId, string troopId, string weaponCode,
21-
bool cartridgeOfLife,
21+
bool safetyCartridge,
2222
bool verifiedInPhysical, bool novelty, int ammunitionQuantity, string ammunitionLot, string observations)
2323
{
2424
var format = await _repository.Find(formatId, false);
@@ -27,7 +27,7 @@ public async Task<AssignedWeaponMagazineFormatItem> AddItem(int formatId, string
2727
throw new AssignedWeaponMagazineFormatNotFound();
2828
}
2929

30-
format.Records.Add(AssignedWeaponMagazineFormatItem.Create(troopId, weaponCode, cartridgeOfLife,
30+
format.Records.Add(AssignedWeaponMagazineFormatItem.Create(troopId, weaponCode, safetyCartridge,
3131
verifiedInPhysical, novelty, ammunitionQuantity, ammunitionLot, observations, format));
3232

3333
await _unitWork.SaveChanges();
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
namespace Armory.Formats.AssignedWeaponMagazineFormats.Application
2+
{
3+
public class AssignedWeaponMagazineFormatItemResponse
4+
{
5+
public int Id { get; init; }
6+
public string TroopId { get; init; }
7+
public string WeaponCode { get; init; }
8+
public bool SafetyCartridge { get; init; }
9+
public bool VerifiedInPhysical { get; init; }
10+
public bool Novelty { get; init; }
11+
public int AmmunitionQuantity { get; init; }
12+
public string AmmunitionLot { get; init; }
13+
public string Observations { get; init; }
14+
}
15+
}

src/Armory/Formats/AssignedWeaponMagazineFormats/Application/AssignedWeaponMagazineFormatResponse.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,6 @@
44

55
namespace Armory.Formats.AssignedWeaponMagazineFormats.Application
66
{
7-
public class AssignedWeaponMagazineFormatItemResponse
8-
{
9-
public int Id { get; init; }
10-
public string TroopId { get; init; }
11-
public string WeaponCode { get; init; }
12-
public bool CartridgeOfLife { get; init; }
13-
public bool VerifiedInPhysical { get; init; }
14-
public bool Novelty { get; init; }
15-
public int AmmunitionQuantity { get; init; }
16-
public string AmmunitionLot { get; init; }
17-
public string Observations { get; init; }
18-
}
19-
207
public class AssignedWeaponMagazineFormatResponse
218
{
229
public int Id { get; init; }

src/Armory/Formats/AssignedWeaponMagazineFormats/Application/Generate/AssignedWeaponMagazineFormatGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ private int MakeAssignedWeaponMagazineFormatItemsInfo(IXLWorksheet worksheet,
113113
record.Weapon.NumberOfProviders.ToString(),
114114
record.AmmunitionQuantity.ToString(),
115115
record.AmmunitionLot,
116-
record.CartridgeOfLife ? "SI" : "NO",
116+
record.SafetyCartridge ? "SI" : "NO",
117117
record.VerifiedInPhysical ? "SI" : "NO",
118118
record.Novelty ? "SI" : "NO"
119119
});

src/Armory/Formats/AssignedWeaponMagazineFormats/Domain/AssignedWeaponMagazineFormatItem.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ namespace Armory.Formats.AssignedWeaponMagazineFormats.Domain
77
{
88
public class AssignedWeaponMagazineFormatItem
99
{
10-
public AssignedWeaponMagazineFormatItem(string troopId, string weaponCode, bool cartridgeOfLife,
10+
public AssignedWeaponMagazineFormatItem(string troopId, string weaponCode, bool safetyCartridge,
1111
bool verifiedInPhysical, bool novelty, int ammunitionQuantity, string ammunitionLot, string observations,
1212
AssignedWeaponMagazineFormat format)
1313
{
1414
TroopId = troopId;
1515
WeaponCode = weaponCode;
16-
CartridgeOfLife = cartridgeOfLife;
16+
SafetyCartridge = safetyCartridge;
1717
VerifiedInPhysical = verifiedInPhysical;
1818
Novelty = novelty;
1919
AmmunitionQuantity = ammunitionQuantity;
@@ -34,7 +34,7 @@ internal AssignedWeaponMagazineFormatItem()
3434
[Required] public string WeaponCode { get; set; }
3535
[ForeignKey("WeaponCode")] public Weapon Weapon { get; set; }
3636

37-
public bool CartridgeOfLife { get; set; }
37+
public bool SafetyCartridge { get; set; }
3838
public bool VerifiedInPhysical { get; set; }
3939
public bool Novelty { get; set; }
4040
[Required] public int AmmunitionQuantity { get; set; }
@@ -46,11 +46,11 @@ internal AssignedWeaponMagazineFormatItem()
4646
[ForeignKey("AssignedWeaponMagazineFormatId")]
4747
public AssignedWeaponMagazineFormat Format { get; set; }
4848

49-
public static AssignedWeaponMagazineFormatItem Create(string troopId, string weaponCode, bool cartridgeOfLife,
49+
public static AssignedWeaponMagazineFormatItem Create(string troopId, string weaponCode, bool safetyCartridge,
5050
bool verifiedInPhysical, bool novelty, int ammunitionQuantity, string ammunitionLot, string observations,
5151
AssignedWeaponMagazineFormat format)
5252
{
53-
return new AssignedWeaponMagazineFormatItem(troopId, weaponCode, cartridgeOfLife, verifiedInPhysical,
53+
return new AssignedWeaponMagazineFormatItem(troopId, weaponCode, safetyCartridge, verifiedInPhysical,
5454
novelty, ammunitionQuantity, ammunitionLot, observations, format);
5555
}
5656
}

0 commit comments

Comments
 (0)