Skip to content
This repository has been archived by the owner on Mar 8, 2022. It is now read-only.

Commit

Permalink
fix whereEq type mismatch
Browse files Browse the repository at this point in the history
  • Loading branch information
@RecursiveG
RecursiveG committed Dec 2, 2017
1 parent f4ab398 commit 722acad
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions src/main/java/cat/nyaa/nyaabank/BankManagementCommands.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public void changeInterestInfo(CommandSender sender, Arguments args) {
}
bank.savingInterestNext = newSaving;
plugin.dbm.query(BankRegistration.class)
.whereEq(BankRegistration.N_BANK_ID, bank.bankId.toString())
.whereEq(BankRegistration.N_BANK_ID, bank.getBankId())
.update(bank, BankRegistration.N_INTEREST_RATE_SAVING_NEXT);
break;
}
Expand All @@ -171,15 +171,15 @@ public void changeInterestInfo(CommandSender sender, Arguments args) {
}
bank.debitInterestNext = newLoan;
plugin.dbm.query(BankRegistration.class)
.whereEq(BankRegistration.N_BANK_ID, bank.bankId.toString())
.whereEq(BankRegistration.N_BANK_ID, bank.getBankId())
.update(bank, BankRegistration.N_INTEREST_RATE_DEBIT_NEXT);
break;
}
case "TYPE": {
InterestType newType = args.nextEnum(InterestType.class);
bank.interestTypeNext = newType;
plugin.dbm.query(BankRegistration.class)
.whereEq(BankRegistration.N_BANK_ID, bank.bankId.toString())
.whereEq(BankRegistration.N_BANK_ID, bank.getBankId())
.update(bank, BankRegistration.N_INTEREST_TYPE_NEXT);
break;
}
Expand All @@ -196,15 +196,15 @@ public void listCustomers(CommandSender sender, Arguments args) {
Map<UUID, BankAccount> accounts = new HashMap<>();
Multimap<UUID, PartialRecord> partials = HashMultimap.create();
for (BankAccount a : plugin.dbm.query(BankAccount.class)
.whereEq(BankAccount.N_BANK_ID, bank.bankId).select()) {
.whereEq(BankAccount.N_BANK_ID, bank.getBankId()).select()) {
if (accounts.containsKey(a.playerId)) {
plugin.getLogger().severe(String.format("Multiple accounts bank-id=%s, player-id=%s",
bank.bankId.toString(), a.playerId));
}
accounts.put(a.playerId, a);
}
for (PartialRecord p : plugin.dbm.query(PartialRecord.class)
.whereEq(PartialRecord.N_BANK_ID, bank.bankId).select()) {
.whereEq(PartialRecord.N_BANK_ID, bank.getBankId()).select()) {
partials.put(p.playerId, p);
}

Expand Down
20 changes: 10 additions & 10 deletions src/main/java/cat/nyaa/nyaabank/CommonAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ public static void withdraw(NyaaBank plugin, Player player, BankRegistration ban
account.deposit = 0D;
account.deposit_interest = 0D;
plugin.dbm.query(BankAccount.class)
.whereEq(BankAccount.N_ACCOUNT_ID, account.accountId)
.whereEq(BankAccount.N_ACCOUNT_ID, account.getAccountId())
.update(account, BankAccount.N_DEPOSIT, BankAccount.N_DEPOSIT_INTEREST);
}
plugin.dbm.query(PartialRecord.class)
.whereEq(PartialRecord.N_BANK_ID, bank.bankId.toString())
.whereEq(PartialRecord.N_PLAYER_ID, player.getUniqueId())
.whereEq(PartialRecord.N_BANK_ID, bank.getBankId())
.whereEq(PartialRecord.N_PLAYER_ID, player.getUniqueId().toString())
.whereEq(PartialRecord.N_TRANSACTION_TYPE, TransactionType.DEPOSIT.name())
.delete();
plugin.eco.withdrawPlayer(banker, totalDeposit);
Expand All @@ -88,13 +88,13 @@ public static void withdraw(NyaaBank plugin, Player player, BankRegistration ban
if (amount > r.capital) {
amount -= r.capital;
realAmount += r.capital;
plugin.dbm.query(PartialRecord.class).whereEq(PartialRecord.N_TRANSACTION_ID, r.transactionId.toString()).delete();
plugin.dbm.query(PartialRecord.class).whereEq(PartialRecord.N_TRANSACTION_ID, r.getTransactionId()).delete();
idx++;
} else {
realAmount += amount;
r.capital -= amount;
amount = -1;
plugin.dbm.query(PartialRecord.class).whereEq(PartialRecord.N_TRANSACTION_ID, r.transactionId.toString())
plugin.dbm.query(PartialRecord.class).whereEq(PartialRecord.N_TRANSACTION_ID, r.getTransactionId())
.update(r, PartialRecord.N_CAPITAL);
}
}
Expand Down Expand Up @@ -174,12 +174,12 @@ public static void repay(NyaaBank plugin, Player player, BankRegistration bank,
account.loan = 0D;
account.loan_interest = 0D;
plugin.dbm.query(BankAccount.class)
.whereEq(BankAccount.N_ACCOUNT_ID, account.accountId)
.whereEq(BankAccount.N_ACCOUNT_ID, account.getAccountId())
.update(account, BankAccount.N_LOAN, BankAccount.N_LOAN_INTEREST);
}
plugin.dbm.query(PartialRecord.class)
.whereEq(PartialRecord.N_BANK_ID, bank.bankId.toString())
.whereEq(PartialRecord.N_PLAYER_ID, player.getUniqueId())
.whereEq(PartialRecord.N_BANK_ID, bank.getBankId())
.whereEq(PartialRecord.N_PLAYER_ID, player.getUniqueId().toString())
.whereEq(PartialRecord.N_TRANSACTION_TYPE, TransactionType.LOAN.name())
.delete();
plugin.eco.depositPlayer(banker, totalLoan);
Expand All @@ -199,13 +199,13 @@ public static void repay(NyaaBank plugin, Player player, BankRegistration bank,
if (amount > r.capital) {
amount -= r.capital;
realAmount += r.capital;
plugin.dbm.query(PartialRecord.class).whereEq(PartialRecord.N_TRANSACTION_ID, r.transactionId.toString()).delete();
plugin.dbm.query(PartialRecord.class).whereEq(PartialRecord.N_TRANSACTION_ID, r.getTransactionId()).delete();
idx++;
} else {
realAmount += amount;
r.capital -= amount;
amount = -1;
plugin.dbm.query(PartialRecord.class).whereEq(PartialRecord.N_TRANSACTION_ID, r.transactionId.toString())
plugin.dbm.query(PartialRecord.class).whereEq(PartialRecord.N_TRANSACTION_ID, r.getTransactionId())
.update(r, PartialRecord.N_CAPITAL);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/cat/nyaa/nyaabank/database/CycleManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,12 +276,12 @@ public void updateDatabaseInterests(long designatedTimestamp, long cycleLength)
// write to database
DatabaseManager.Query<BankRegistration> query1 = plugin.dbm.query(BankRegistration.class);
for (BankRegistration bank : bankMap.values()) {
query1.clear().whereEq(BankRegistration.N_BANK_ID, bank.bankId.toString()).update(bank);
query1.clear().whereEq(BankRegistration.N_BANK_ID, bank.getBankId()).update(bank);
}
DatabaseManager.Query<BankAccount> query2 = plugin.dbm.query(BankAccount.class);
for (Map<UUID, BankAccount> m : accountMap.values()) {
for (BankAccount account : m.values()) {
query2.clear().whereEq(BankAccount.N_ACCOUNT_ID, account.accountId.toString()).update(account);
query2.clear().whereEq(BankAccount.N_ACCOUNT_ID, account.getAccountId()).update(account);
}
}
plugin.dbm.query(PartialRecord.class).delete();
Expand Down

0 comments on commit 722acad

Please sign in to comment.