nerdfortress/crusade-tracker
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed ranged, melee, and psychic destroyed

Browse Source
This commit is contained in:
mitch 2022-03-13 11:09:18 -04:00
parent a154b220eb
commit aa721c5a55
7 changed files with 27 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/main/java/com/warhammer/domain/UnitArmy.java
View File

@ -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() + "'" +

26
src/main/resources/config/liquibase/changelog/20220313104800_remove_unused_kill_tally.xml Normal file
View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<databaseChangeLog
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.9.xsd
http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
<property name="autoIncrement" value="true"/>
<!--
Update the entity UnitArmy.
to remove entity agenda tally
-->
<changeSet id="20220313104800_remove_unused_kill_tally-1" author="mitch" runOnChange="true">
<dropColumn tableName="unit_army">
<column name="enemy_ranged_destroyed"/>
</dropColumn>
<dropColumn tableName="unit_army">
<column name="enemy_melee_destroyed"/>
</dropColumn>
<dropColumn tableName="unit_army">
<column name="enemy_psychic_destroyed"/>
</dropColumn>
</changeSet>
</databaseChangeLog>

9
src/main/webapp/app/entities/unit-army/unit-army-detail.component.ts
View File

@ -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,

18
src/main/webapp/app/entities/unit-army/unit-army-update.component.html
View File

@ -55,24 +55,6 @@
formControlName="enemyUnitsDestroyed"/>
</div>
<div class="form-group">
<label class="form-control-label" for="field_enemyPsychicDestroyed">Enemy Psychic Destroyed</label>
<input type="number" class="form-control" name="enemyPsychicDestroyed" id="field_enemyPsychicDestroyed"
formControlName="enemyPsychicDestroyed">
</div>
<div class="form-group">
<label class="form-control-label" for="field_enemyRangedDestroyed">Enemy Ranged Destroyed</label>
<input type="number" class="form-control" name="enemyRangedDestroyed" id="field_enemyRangedDestroyed"
formControlName="enemyRangedDestroyed"/>
</div>
<div class="form-group">
<label class="form-control-label" for="field_enemyMeleeDestroyed">Enemy Melee Destroyed</label>
<input type="number" class="form-control" name="enemyMeleeDestroyed" id="field_enemyMeleeDestroyed"
formControlName="enemyMeleeDestroyed"/>
</div>
<div class="form-group">
<label class="form-control-label" for="field_equipment">Equipment</label>
<input type="text" class="form-control" name="equipment" id="field_equipment"

8
src/main/webapp/app/entities/unit-army/unit-army-update.component.ts
View File

@ -30,9 +30,6 @@ export class UnitArmyUpdateComponent implements OnInit {
unitPowerLevel: [],
unitPoints: [],
enemyUnitsDestroyed: [],
enemyPsychicDestroyed: [],
enemyRangedDestroyed: [],
enemyMeleeDestroyed: [],
equipment: [],
psychicPowersTaken: [],
warlordTraits: [],
@ -75,8 +72,6 @@ export class UnitArmyUpdateComponent implements OnInit {
unitPowerLevel: unitArmy.unitPowerLevel,
unitPoints: unitArmy.unitPoints,
enemyUnitsDestroyed: unitArmy.enemyUnitsDestroyed,
enemyRangedDestroyed: unitArmy.enemyRangedDestroyed,
enemyMeleeDestroyed: unitArmy.enemyMeleeDestroyed,
equipment: unitArmy.equipment,
psychicPowersTaken: unitArmy.psychicPowersTaken,
warlordTraits: unitArmy.warlordTraits,
@ -134,9 +129,6 @@ export class UnitArmyUpdateComponent implements OnInit {
unitPowerLevel: this.editForm.get(['unitPowerLevel'])!.value,
unitPoints: this.editForm.get(['unitPoints'])!.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,

6
src/main/webapp/app/entities/unit-army/unit-army.component.html
View File

@ -29,9 +29,6 @@
<th scope="col" ><span>Unit Power Level</span></th>
<th scope="col" ><span>Unit Points</span></th>
<th scope="col" ><span>Enemy Units Destroyed</span></th>
<th scope="col" ><span>Enemy Psychic Destroyed</span></th>
<th scope="col" ><span>Enemy Ranged Destroyed</span></th>
<th scope="col" ><span>Enemy Melee Destroyed</span></th>
<th scope="col" ><span>Agenda One Tally</span></th>
<th scope="col" ><span>Agenda Two Tally</span></th>
<th scope="col" ><span>Agenda Three Tally</span></th>
@ -61,9 +58,6 @@
<td>{{ unitArmy.unitPowerLevel }}</td>
<td>{{ unitArmy.unitPoints }}</td>
<td>{{ unitArmy.enemyUnitsDestroyed }}</td>
<td>{{ unitArmy.enemyPsychicDestroyed }}</td>
<td>{{ unitArmy.enemyRangedDestroyed }}</td>
<td>{{ unitArmy.enemyMeleeDestroyed }}</td>
<td>{{ unitArmy.equipment }}</td>
<td>{{ unitArmy.psychicPowersTaken }}</td>
<td>{{ unitArmy.warlordTraits }}</td>

20
src/test/java/com/warhammer/web/rest/UnitArmyResourceIT.java
View File

@ -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);