made some bigger changes with bank accounts and permissions

MineValley · Mar 26, 2024 · aad3471 · aad3471
1 parent 0c192d1
commit aad3471
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/src/main/java/minevalley/core/api/economy/AccountUser.java b/src/main/java/minevalley/core/api/economy/AccountUser.java
@@ -15,7 +15,7 @@ public interface AccountUser {
 
     int getMaxPayoutPerDayInCents();
 
-    void setMaxPayOutPerDayInCents(int maxPayout);
+    void setMaxPayoutPerDayInCents(int maxPayoutInCents);
 
     int getRemainingDailyPayoutInCents();
 
@@ -35,18 +35,14 @@ default boolean hasPermission(BankAccountUserPermission permission) {
 
     void revokePermission(BankAccountUserPermission permission);
 
-    void updateFromDatabase();
-
     void remove();
 
     @Getter
     @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
     enum BankAccountUserPermission {
-        PAYOUT("allow_payout"),
-        TRANSFER_MONEY("allow_transfers"),
-        CREATE_NEW_CARDS("allow_create_new_bank_cars"),
-        ADD_NEW_USERS("allow_adding_new_users"),
-        REMOVE_USERS("allow_removing_other_users");
+        CREATE_NEW_CARDS("allowed_to_create_new_bank_cards"),
+        ADD_NEW_USERS("allowed_to_add_new_users"),
+        REMOVE_USERS("allowed_to_remove_other_users");
 
         private final String code;
     }

diff --git a/src/main/java/minevalley/core/api/economy/BankAccount.java b/src/main/java/minevalley/core/api/economy/BankAccount.java
@@ -86,9 +86,9 @@ default AccountUser getAccountUser(Registrant registrant) {
     @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
     enum AccountType {
         USER("DE00-"),
-        COMPANY("DE01-"),
-        ASSOCIATION("DE02-"),
-        SECOND_ACCOUNT("DE03-");
+        SECOND_ACCOUNT("DE01-"),
+        COMPANY("DE02-"),
+        ASSOCIATION("DE03-");
 
         private final String prefix;
 
@@ -97,11 +97,11 @@ public static AccountType getAccountType(String iban) {
                 case "DE00":
                     return USER;
                 case "DE01":
-                    return COMPANY;
+                    return SECOND_ACCOUNT;
                 case "DE02":
-                    return ASSOCIATION;
+                    return COMPANY;
                 case "DE03":
-                    return SECOND_ACCOUNT;
+                    return ASSOCIATION;
                 default:
                     return null;
             }

diff --git a/src/main/java/minevalley/core/api/users/OnlineUser.java b/src/main/java/minevalley/core/api/users/OnlineUser.java
@@ -5,6 +5,7 @@
 import lombok.NonNull;
 import lombok.Setter;
 import minevalley.core.api.ChatMenu;
+import minevalley.core.api.economy.AccountUser;
 import minevalley.core.api.economy.BankAccount;
 import minevalley.core.api.enums.FractionService;
 import minevalley.core.api.enums.McVersion;
@@ -319,9 +320,10 @@ default void leaveInterface() {
      * If he chooses nothing, the callback isn't called.
      * If he's only permissioned to transfer money from one account, he will not be asked (The callback will be called immediately with the account).
      *
-     * @param callback callback with the chosen bank account
+     * @param callback            callback with the chosen bank account
+     * @param requiredPermissions permissions that need to be granted to this user to let him choose the specific bank account
      */
-    void askForBankAccount(Consumer<BankAccount> callback);
+    void askForBankAccount(Consumer<BankAccount> callback, AccountUser.BankAccountUserPermission... requiredPermissions);
 
     // FractionService