diff --git a/src/main/java/com/warhammer/domain/UnitArmy.java b/src/main/java/com/warhammer/domain/UnitArmy.java
index 11c9ac70..b70f1f53 100644
--- a/src/main/java/com/warhammer/domain/UnitArmy.java
+++ b/src/main/java/com/warhammer/domain/UnitArmy.java
@@ -29,15 +29,6 @@ public class UnitArmy implements Serializable {
@Column(name = "enemy_units_destroyed")
private Long enemyUnitsDestroyed;
- @Column(name = "enemy_ranged_destroyed")
- private Long enemyRangedDestroyed;
-
- @Column(name = "enemy_melee_destroyed")
- private Long enemyMeleeDestroyed;
-
- @Column(name = "enemy_psychic_destroyed")
- private Integer enemyPsychicDestroyed;
-
@Column(name = "equipment")
private String equipment;
@@ -140,32 +131,6 @@ public class UnitArmy implements Serializable {
this.enemyUnitsDestroyed = enemyUnitsDestroyed;
}
- public Long getEnemyRangedDestroyed() {
- return enemyRangedDestroyed;
- }
-
- public UnitArmy enemyRangedDestroyed(Long enemyRangedDestroyed) {
- this.enemyRangedDestroyed = enemyRangedDestroyed;
- return this;
- }
-
- public void setEnemyRangedDestroyed(Long enemyRangedDestroyed) {
- this.enemyRangedDestroyed = enemyRangedDestroyed;
- }
-
- public Long getEnemyMeleeDestroyed() {
- return enemyMeleeDestroyed;
- }
-
- public UnitArmy enemyMeleeDestroyed(Long enemyMeleeDestroyed) {
- this.enemyMeleeDestroyed = enemyMeleeDestroyed;
- return this;
- }
-
- public void setEnemyMeleeDestroyed(Long enemyMeleeDestroyed) {
- this.enemyMeleeDestroyed = enemyMeleeDestroyed;
- }
-
public String getEquipment() {
return equipment;
}
@@ -322,19 +287,6 @@ public class UnitArmy implements Serializable {
this.battleScars = battleScars;
}
- public Integer getEnemyPsychicDestroyed() {
- return enemyPsychicDestroyed;
- }
-
- public void setEnemyPsychicDestroyed(Integer enemyPsychicDestroyed) {
- this.enemyPsychicDestroyed = enemyPsychicDestroyed;
- }
-
- public UnitArmy enemyPsychicDestroyed(Integer enemyPsychicDestroyed) {
- this.enemyPsychicDestroyed = enemyPsychicDestroyed;
- return this;
- }
-
public Integer updateExperience(int experienceIncrease) {
return this.experiencePoints += experienceIncrease;
}
@@ -429,9 +381,6 @@ public class UnitArmy implements Serializable {
", unitPowerLevel=" + getUnitPowerLevel() +
", unitPoints=" + getUnitPoints() +
", enemyUnitsDestroyed=" + getEnemyUnitsDestroyed() +
- ", enemyPsychicDestroyed=" + getEnemyPsychicDestroyed() +
- ", enemyRangedDestroyed=" + getEnemyRangedDestroyed() +
- ", enemyMeleeDestroyed=" + getEnemyMeleeDestroyed() +
", equipment='" + getEquipment() + "'" +
", psychicPowersTaken='" + getPsychicPowersTaken() + "'" +
", warlordTraits='" + getWarlordTraits() + "'" +
diff --git a/src/main/resources/config/liquibase/changelog/20220313104800_remove_unused_kill_tally.xml b/src/main/resources/config/liquibase/changelog/20220313104800_remove_unused_kill_tally.xml
new file mode 100644
index 00000000..c889f1f4
--- /dev/null
+++ b/src/main/resources/config/liquibase/changelog/20220313104800_remove_unused_kill_tally.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/app/entities/unit-army/unit-army-detail.component.ts b/src/main/webapp/app/entities/unit-army/unit-army-detail.component.ts
index fca830d4..cc7886a3 100644
--- a/src/main/webapp/app/entities/unit-army/unit-army-detail.component.ts
+++ b/src/main/webapp/app/entities/unit-army/unit-army-detail.component.ts
@@ -32,9 +32,6 @@ export class UnitArmyDetailComponent implements OnInit {
unitPowerLevel: [],
unitPoints: [],
enemyUnitsDestroyed: [],
- enemyPsychicDestroyed: [],
- enemyRangedDestroyed: [],
- enemyMeleeDestroyed: [],
agendaOneTally: [],
agendaTwoTally: [],
agendaThreeTally: [],
@@ -90,9 +87,6 @@ export class UnitArmyDetailComponent implements OnInit {
unitPowerLevel: unitArmy.unitPowerLevel,
unitPoints: unitArmy.unitPoints,
enemyUnitsDestroyed: unitArmy.enemyUnitsDestroyed,
- enemyPsychicDestroyed: unitArmy.enemyPsychicDestroyed,
- enemyRangedDestroyed: unitArmy.enemyRangedDestroyed,
- enemyMeleeDestroyed: unitArmy.enemyMeleeDestroyed,
equipment: unitArmy.equipment,
psychicPowersTaken: unitArmy.psychicPowersTaken,
warlordTraits: unitArmy.warlordTraits,
@@ -135,9 +129,6 @@ export class UnitArmyDetailComponent implements OnInit {
unitName: this.editForm.get(['unitName'])!.value,
unitDescription: this.editForm.get(['unitDescription'])!.value,
enemyUnitsDestroyed: this.editForm.get(['enemyUnitsDestroyed'])!.value,
- enemyPsychicDestroyed: this.editForm.get(['enemyPsychicDestroyed'])!.value,
- enemyRangedDestroyed: this.editForm.get(['enemyRangedDestroyed'])!.value,
- enemyMeleeDestroyed: this.editForm.get(['enemyMeleeDestroyed'])!.value,
equipment: this.editForm.get(['equipment'])!.value,
psychicPowersTaken: this.editForm.get(['psychicPowersTaken'])!.value,
warlordTraits: this.editForm.get(['warlordTraits'])!.value,
diff --git a/src/main/webapp/app/entities/unit-army/unit-army-update.component.html b/src/main/webapp/app/entities/unit-army/unit-army-update.component.html
index 6f6f13f1..1a7c9db7 100644
--- a/src/main/webapp/app/entities/unit-army/unit-army-update.component.html
+++ b/src/main/webapp/app/entities/unit-army/unit-army-update.component.html
@@ -25,7 +25,7 @@
-
+
@@ -55,24 +55,6 @@
formControlName="enemyUnitsDestroyed"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Unit Power Level
Unit Points |
Enemy Units Destroyed |
- Enemy Psychic Destroyed |
- Enemy Ranged Destroyed |
- Enemy Melee Destroyed |
Agenda One Tally |
Agenda Two Tally |
Agenda Three Tally |
@@ -61,9 +58,6 @@
{{ unitArmy.unitPowerLevel }} |
{{ unitArmy.unitPoints }} |
{{ unitArmy.enemyUnitsDestroyed }} |
- {{ unitArmy.enemyPsychicDestroyed }} |
- {{ unitArmy.enemyRangedDestroyed }} |
- {{ unitArmy.enemyMeleeDestroyed }} |
{{ unitArmy.equipment }} |
{{ unitArmy.psychicPowersTaken }} |
{{ unitArmy.warlordTraits }} |
diff --git a/src/test/java/com/warhammer/web/rest/UnitArmyResourceIT.java b/src/test/java/com/warhammer/web/rest/UnitArmyResourceIT.java
index a2a7d4e4..4c0432c4 100644
--- a/src/test/java/com/warhammer/web/rest/UnitArmyResourceIT.java
+++ b/src/test/java/com/warhammer/web/rest/UnitArmyResourceIT.java
@@ -48,12 +48,6 @@ public class UnitArmyResourceIT {
private static final Long DEFAULT_ENEMY_UNITS_DESTROYED = 1L;
private static final Long UPDATED_ENEMY_UNITS_DESTROYED = 2L;
- private static final Long DEFAULT_ENEMY_RANGED_DESTROYED = 1L;
- private static final Long UPDATED_ENEMY_RANGED_DESTROYED = 2L;
-
- private static final Long DEFAULT_ENEMY_MELEE_DESTROYED = 1L;
- private static final Long UPDATED_ENEMY_MELEE_DESTROYED = 2L;
-
private static final Long DEFAULT_AGENDA_ONE_TALLY = 1L;
private static final Long UPDATED_AGENDA_ONE_TALLY = 2L;
@@ -129,8 +123,6 @@ public class UnitArmyResourceIT {
.unitPowerLevel(DEFAULT_UNIT_POWER_LEVEL)
.unitPoints(DEFAULT_UNIT_POINTS)
.enemyUnitsDestroyed(DEFAULT_ENEMY_UNITS_DESTROYED)
- .enemyRangedDestroyed(DEFAULT_ENEMY_RANGED_DESTROYED)
- .enemyMeleeDestroyed(DEFAULT_ENEMY_MELEE_DESTROYED)
.equipment(DEFAULT_EQUIPMENT)
.psychicPowersTaken(DEFAULT_PSYCHIC_POWERS_TAKEN)
.warlordTraits(DEFAULT_WARLORD_TRAITS)
@@ -169,8 +161,6 @@ public class UnitArmyResourceIT {
.unitPowerLevel(UPDATED_UNIT_POWER_LEVEL)
.unitPoints(UPDATED_UNIT_POINTS)
.enemyUnitsDestroyed(UPDATED_ENEMY_UNITS_DESTROYED)
- .enemyRangedDestroyed(UPDATED_ENEMY_RANGED_DESTROYED)
- .enemyMeleeDestroyed(UPDATED_ENEMY_MELEE_DESTROYED)
.equipment(UPDATED_EQUIPMENT)
.psychicPowersTaken(UPDATED_PSYCHIC_POWERS_TAKEN)
.warlordTraits(UPDATED_WARLORD_TRAITS)
@@ -222,8 +212,6 @@ public class UnitArmyResourceIT {
assertThat(testUnitArmy.getUnitPowerLevel()).isEqualTo(DEFAULT_UNIT_POWER_LEVEL);
assertThat(testUnitArmy.getUnitPoints()).isEqualTo(DEFAULT_UNIT_POINTS);
assertThat(testUnitArmy.getEnemyUnitsDestroyed()).isEqualTo(DEFAULT_ENEMY_UNITS_DESTROYED);
- assertThat(testUnitArmy.getEnemyRangedDestroyed()).isEqualTo(DEFAULT_ENEMY_RANGED_DESTROYED);
- assertThat(testUnitArmy.getEnemyMeleeDestroyed()).isEqualTo(DEFAULT_ENEMY_MELEE_DESTROYED);
assertThat(testUnitArmy.getEquipment()).isEqualTo(DEFAULT_EQUIPMENT);
assertThat(testUnitArmy.getPsychicPowersTaken()).isEqualTo(DEFAULT_PSYCHIC_POWERS_TAKEN);
assertThat(testUnitArmy.getWarlordTraits()).isEqualTo(DEFAULT_WARLORD_TRAITS);
@@ -275,8 +263,6 @@ public class UnitArmyResourceIT {
.andExpect(jsonPath("$.[*].unitPowerLevel").value(hasItem(DEFAULT_UNIT_POWER_LEVEL.intValue())))
.andExpect(jsonPath("$.[*].unitPoints").value(hasItem(DEFAULT_UNIT_POINTS.intValue())))
.andExpect(jsonPath("$.[*].enemyUnitsDestroyed").value(hasItem(DEFAULT_ENEMY_UNITS_DESTROYED.intValue())))
- .andExpect(jsonPath("$.[*].enemyRangedDestroyed").value(hasItem(DEFAULT_ENEMY_RANGED_DESTROYED.intValue())))
- .andExpect(jsonPath("$.[*].enemyMeleeDestroyed").value(hasItem(DEFAULT_ENEMY_MELEE_DESTROYED.intValue())))
.andExpect(jsonPath("$.[*].agendaOneTally").value(hasItem(DEFAULT_AGENDA_ONE_TALLY.intValue())))
.andExpect(jsonPath("$.[*].agendaTwoTally").value(hasItem(DEFAULT_AGENDA_TWO_TALLY.intValue())))
.andExpect(jsonPath("$.[*].agendaThreeTally").value(hasItem(DEFAULT_AGENDA_THREE_TALLY.intValue())))
@@ -311,8 +297,6 @@ public class UnitArmyResourceIT {
.andExpect(jsonPath("$.unitPowerLevel").value(DEFAULT_UNIT_POWER_LEVEL.toString()))
.andExpect(jsonPath("$.unitPoints").value(DEFAULT_UNIT_POINTS.toString()))
.andExpect(jsonPath("$.enemyUnitsDestroyed").value(DEFAULT_ENEMY_UNITS_DESTROYED.intValue()))
- .andExpect(jsonPath("$.enemyRangedDestroyed").value(DEFAULT_ENEMY_RANGED_DESTROYED.intValue()))
- .andExpect(jsonPath("$.enemyMeleeDestroyed").value(DEFAULT_ENEMY_MELEE_DESTROYED.intValue()))
.andExpect(jsonPath("$.agendaOneTally").value(DEFAULT_AGENDA_ONE_TALLY.intValue()))
.andExpect(jsonPath("$.agendaTwoTally").value(DEFAULT_AGENDA_TWO_TALLY.intValue()))
.andExpect(jsonPath("$.agendaThreeTally").value(DEFAULT_AGENDA_THREE_TALLY.intValue()))
@@ -358,8 +342,6 @@ public class UnitArmyResourceIT {
.unitPowerLevel(UPDATED_UNIT_POWER_LEVEL)
.unitPoints(UPDATED_UNIT_POINTS)
.enemyUnitsDestroyed(UPDATED_ENEMY_UNITS_DESTROYED)
- .enemyRangedDestroyed(UPDATED_ENEMY_RANGED_DESTROYED)
- .enemyMeleeDestroyed(UPDATED_ENEMY_MELEE_DESTROYED)
.equipment(UPDATED_EQUIPMENT)
.psychicPowersTaken(UPDATED_PSYCHIC_POWERS_TAKEN)
.warlordTraits(UPDATED_WARLORD_TRAITS)
@@ -388,8 +370,6 @@ public class UnitArmyResourceIT {
assertThat(testUnitArmy.getUnitPowerLevel()).isEqualTo(UPDATED_UNIT_POWER_LEVEL);
assertThat(testUnitArmy.getUnitPoints()).isEqualTo(UPDATED_UNIT_POINTS);
assertThat(testUnitArmy.getEnemyUnitsDestroyed()).isEqualTo(UPDATED_ENEMY_UNITS_DESTROYED);
- assertThat(testUnitArmy.getEnemyRangedDestroyed()).isEqualTo(UPDATED_ENEMY_RANGED_DESTROYED);
- assertThat(testUnitArmy.getEnemyMeleeDestroyed()).isEqualTo(UPDATED_ENEMY_MELEE_DESTROYED);
assertThat(testUnitArmy.getEquipment()).isEqualTo(UPDATED_EQUIPMENT);
assertThat(testUnitArmy.getPsychicPowersTaken()).isEqualTo(UPDATED_PSYCHIC_POWERS_TAKEN);
assertThat(testUnitArmy.getWarlordTraits()).isEqualTo(UPDATED_WARLORD_TRAITS);