Added one layer of optimization on jobs by removing unneccessary back…

apps/dashboard/src/main/java/com/akto/action/AccountAction.java

@@ -327,7 +327,7 @@ public void run() {
                     backwardCompatibility = new BackwardCompatibility();
                     BackwardCompatibilityDao.instance.insertOne(backwardCompatibility);
                 }
-                InitializerListener.setBackwardCompatibilities(backwardCompatibility);
+                InitializerListener.setBackwardCompatibilities(backwardCompatibility, true);
                 loggerMaker.debugAndAddToDb("start create indices", LogDb.DASHBOARD);
                 DaoInit.createIndices();
 
@@ -385,7 +385,7 @@ public void run() {
     public String goToAccount() {
         if (getSUser().getAccounts().containsKey(newAccountId+"")) {
             getSession().put("accountId", newAccountId);
-
+            AccountsDao.instance.updateLastActiveAccount(newAccountId);
             Context.accountId.set(newAccountId);
             return SUCCESS.toUpperCase();
         }

apps/dashboard/src/main/java/com/akto/action/ProfileAction.java

@@ -78,6 +78,7 @@ public static void executeMeta1(Utility utility, User user, HttpServletRequest r
         } else {
             logger.debug("setting session: " + sessionAccId);
             request.getSession().setAttribute("accountId", sessionAccId);
+            AccountsDao.instance.updateLastActiveAccount(sessionAccId);
             Context.accountId.set(sessionAccId);
         }
 

apps/dashboard/src/main/java/com/akto/action/SignupAction.java

@@ -941,6 +941,8 @@ private void createUserAndRedirect(String userEmail, String username, SignupInfo
 
             servletRequest.getSession().setAttribute("user", user);
             servletRequest.getSession().setAttribute("accountId", accountId);
+            // set active account here
+            AccountsDao.instance.updateLastActiveAccount(accountId);
             LoginAction.loginUser(user, servletResponse, true, servletRequest);
             servletRequest.setAttribute("username", userEmail);
             servletResponse.sendRedirect("/dashboard/onboarding");

libs/dao/src/main/java/com/akto/dao/AccountsDao.java

@@ -1,7 +1,11 @@
 package com.akto.dao;
 
+import com.akto.dao.context.Context;
 import com.akto.dto.Account;
+import com.akto.util.Constants;
 import com.mongodb.BasicDBObject;
+import com.mongodb.client.model.Filters;
+import com.mongodb.client.model.Updates;
 
 import java.util.List;
 
@@ -16,6 +20,13 @@ public void createIndexIfAbsent() {
 
     }
 
+    public void updateLastActiveAccount(int accountId){
+        instance.updateOneNoUpsert(
+            Filters.eq(Constants.ID, accountId),
+            Updates.set(Account.LAST_ACTIVE_TS, Context.now())
+        );
+    }
+
     @Override
     public String getCollName() {
         return "accounts";

libs/dao/src/main/java/com/akto/dto/Account.java

@@ -19,6 +19,9 @@ public class Account {
     public static final String HYBRID_TESTING_ENABLED = "hybridTestingEnabled";
     private boolean hybridTestingEnabled;
 
+    public static final String LAST_ACTIVE_TS = "lastActiveTimestamp";
+    private int lastActiveTimestamp;
+
     public Account() {}
 
     public Account(int id, String name) {
@@ -105,4 +108,12 @@ public boolean getHybridTestingEnabled() {
     public void setHybridTestingEnabled(boolean hybridTestingEnabled) {
         this.hybridTestingEnabled = hybridTestingEnabled;
     }
+
+    public int getLastActiveTimestamp() {
+        return lastActiveTimestamp;
+    }
+
+    public void setLastActiveTimestamp(int lastActiveTimestamp) {
+        this.lastActiveTimestamp = lastActiveTimestamp;
+    }
 }

libs/dao/src/main/java/com/akto/util/AccountTask.java

@@ -7,9 +7,12 @@
 import java.util.function.Consumer;
 
 import com.akto.dao.AccountsDao;
+import com.akto.dao.UsersDao;
 import com.akto.dao.context.Context;
 import com.akto.dto.Account;
+import com.akto.dto.User;
 import com.mongodb.client.model.Filters;
+import com.mongodb.client.model.Projections;
 
 import org.bson.conversions.Bson;
 import org.slf4j.Logger;
@@ -263,7 +266,7 @@ public void executeTaskForNonHybridAccounts(Consumer<Account> consumeAccount, St
 
         List<Account> activeAccounts = AccountsDao.instance.findAll(Filters.and(activeFilter, nonHybridAccountsFilter));
         for(Account account: activeAccounts) {
-            if (inactiveAccountsSet.contains(account.getId())) {
+            if (inactiveAccountsSet.contains(account.getId()) || !shouldRunJobsOnAccount(account)) {
                 continue;
             }
             try {
@@ -275,4 +278,29 @@ public void executeTaskForNonHybridAccounts(Consumer<Account> consumeAccount, St
             }
         }
     }
+
+    private boolean shouldRunJobsOnAccount(Account account){
+        if(account == null){
+            return false;
+        }
+
+        if(Context.now() - account.getLastActiveTimestamp() > Constants.ONE_MONTH_TIMESTAMP){
+            // get all users and check their lastLoginTs just to verify if that account is active
+            int accountId = account.getId();
+            List<User> users = UsersDao.instance.findAll(Filters.eq(Filters.exists("accounts."+accountId)), Projections.include(User.LAST_LOGIN_TS));
+            if(users == null || users.isEmpty()){
+                return false;
+            }
+            int maxLoginTs = 0;
+            for(User user: users){
+                if(user.getLastLoginTs() > maxLoginTs){
+                    maxLoginTs = user.getLastLoginTs();
+                }
+            }
+            if(Context.now() - maxLoginTs > Constants.ONE_MONTH_TIMESTAMP){
+                return false;
+            }
+        }
+        return true;
+    }
 }