add active account (#61)

src/main/java/dev/vality/scrooge/dao/AccountDao.java

@@ -8,6 +8,6 @@ public interface AccountDao {
 
     Account save(Account account);
 
-    List<Account> getAll();
+    List<Account> getAllActive();
 
 }

src/main/java/dev/vality/scrooge/dao/AccountDaoImpl.java

@@ -4,7 +4,7 @@ import dev.vality.mapper.RecordRowMapper;
 import dev.vality.scrooge.dao.domain.tables.pojos.Account;
 import dev.vality.scrooge.dao.domain.tables.records.AccountRecord;
 import org.jooq.Query;
-import org.jooq.SelectWhereStep;
+import org.jooq.SelectConditionStep;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.stereotype.Component;
@@ -39,9 +39,10 @@ public class AccountDaoImpl extends AbstractDao implements AccountDao {
     }
 
     @Override
-    public List<Account> getAll() {
-        SelectWhereStep<AccountRecord> where = getDslContext()
-                .selectFrom(ACCOUNT);
+    public List<Account> getAllActive() {
+        SelectConditionStep<AccountRecord> where = getDslContext()
+                .selectFrom(ACCOUNT)
+                .where(ACCOUNT.ACTIVE.eq(Boolean.TRUE));
         return fetch(where, listRecordRowMapper);
     }
 }

src/main/java/dev/vality/scrooge/service/converter/BalanceInfoToAccountConverter.java

@@ -12,6 +12,7 @@ public class BalanceInfoToAccountConverter {
         account.setCurrency(source.getCurrency());
         account.setNumber(source.getAccountId());
         account.setProviderId(providerId);
+        account.setActive(Boolean.TRUE);
         return account;
     }
 }

src/main/java/dev/vality/scrooge/service/impl/AccountSurveyServiceImpl.java

@@ -35,7 +35,7 @@ public class AccountSurveyServiceImpl implements AccountSurveyService {
             log.info("Success response from adapter {} , balanceInfo: {}", url, balanceInfo);
             return balanceInfo;
         } catch (TException | WRuntimeException e) {
-            log.error("Error call adapter with url={}", url, e);
+            log.warn("Error call adapter with url={}, error: {}", url, e.getMessage());
             return null;
         }
     }

src/main/java/dev/vality/scrooge/service/impl/BalanceRenewalService.java

@@ -28,7 +28,7 @@ public class BalanceRenewalService {
     @SchedulerLock(name = "balance_renewal_process")
     public void renew() {
         log.info("Start update balances");
-        List<Account> accounts = accountDao.getAll();
+        List<Account> accounts = accountDao.getAllActive();
         for (Account account : accounts) {
             log.info("Try update balance for account with number: {}, terminal: {}",
                     account.getNumber(), account.getTerminalRef());

src/main/resources/db/migration/V7__add_active_account.sql

@@ -0,0 +1,2 @@
+ALTER TABLE scrooge.account
+    ADD COLUMN IF NOT EXISTS active BOOLEAN NOT NULL DEFAULT true;

src/test/java/dev/vality/scrooge/dao/AccountDaoImplTest.java

@@ -84,7 +84,7 @@ class AccountDaoImplTest {
                 .set(dslContext.newRecord(ACCOUNT, account))
                 .execute();
 
-        List<Account> all = accountDao.getAll();
+        List<Account> all = accountDao.getAllActive();
 
         assertEquals(1, all.size());
         assertEquals(account.getNumber(), all.get(0).getNumber());