add history vc list retrieve when user login/update

Author: Rui Gao

src/rest-server/src/controllers/v2/job.js

@@ -26,13 +26,6 @@ const { Op } = require('sequelize');
 const { userProperty } = require('@pai/config/token');
 const userController = require('@pai/controllers/v2/user');
 
-const getUserHistoryVCs = async (username) => {
-  const jobs = await job.list(['virtualCluster'], { userName: username });
-  const vcs = Array.from(new Set(jobs.map((j) => j.virtualCluster)));
-  logger.info(`User ${username} has accessed historical virtual clusters: ${vcs}`);
-  return vcs;
-};
-
 const list = asyncHandler(async (req, res) => {
   // ?keyword=<keyword filter>&username=<username1>,<username2>&vc=<vc1>,<vc2>
   //    &state=<state1>,<state2>&offset=<offset>&limit=<limit>&withTotalCount=true
@@ -392,7 +385,6 @@ const getLogs = asyncHandler(async (req, res) => {
 
 // module exports
 module.exports = {
-  getUserHistoryVCs,
   list,
   get,
   update,

src/rest-server/src/models/v2/job/k8s.js

@@ -1556,6 +1556,38 @@ const getEvents = async (frameworkName, attributes, filters) => {
   }
 };
 
+const listVCsFromJob = async (username) => {
+  try {
+    logger.info(`Start to list jobs for user ${username}`);
+    // Remove limit: 0 so it fetches all records, and optionally add a sensible order
+    const frameworks = await databaseModel.Framework.findAll({
+      attributes: [
+      'name',
+      'jobName',
+      'userName',
+      'virtualCluster',
+      ],
+      where: { userName: username },
+    });
+
+    logger.info(`Frameworks raw result for user ${username}: ${JSON.stringify(frameworks, null, 2)}`);
+
+    const vcsSet = new Set();
+    frameworks.forEach((framework) => {
+      if (framework.virtualCluster) {
+        vcsSet.add(framework.virtualCluster);
+      }
+    });
+    const vcs = Array.from(vcsSet);
+
+    logger.info(`User ${username} has accessed historical virtual clusters: ${vcs}`);
+    return vcs;
+  } catch (error) {
+    logger.error(`Failed to get historical virtual clusters for user ${username}: ${error}`);
+    return [];
+  }
+};
+
 // module exports
 module.exports = {
   list,
@@ -1567,4 +1599,5 @@ module.exports = {
   addTag,
   deleteTag,
   getEvents,
+  listVCsFromJob,
 };

src/rest-server/src/utils/manager/user/crudK8sSecret.js

@@ -20,7 +20,7 @@ const logger = require('@pai/config/logger');
 const groupModel = require('@pai/models/v2/group');
 const k8sModel = require('@pai/models/kubernetes/kubernetes');
 const { Mutex } = require('async-mutex');
-const jobController = require('@pai/controllers/v2/job');
+const { job } = require('@pai/models/v2/job');
 
 const USER_NAMESPACE = process.env.PAI_USER_NAMESPACE || 'pai-user-v2';
 
@@ -207,7 +207,8 @@ async function create(key, value) {
     await User.encryptUserPassword(userInstance);
 
     // retrieve VC list from the history job list belonging to the user if exists
-    userInstance.history_vclist = await jobController.getUserHistoryVCs(userInstance.username);
+    const vcsFromJob = await job.listVCsFromJob(userInstance.username);
+    userInstance.history_vclist = vcsFromJob;
 
     // retrieve VC from group list
     const vcSet = new Set();
@@ -286,7 +287,8 @@ async function update(key, value, updatePassword = false) {
       grouplist: value.grouplist,
       email: value.email,
       extension: value.extension,
-      history_vclist: value.history_vclist || [],
+      //history_vclist: value.history_vclist || [],
+      history_vclist: [],
     });
     if (updatePassword) {
       await User.encryptUserPassword(userInstance);
@@ -295,7 +297,8 @@ async function update(key, value, updatePassword = false) {
     // if userInstance.history_vclist is empty, set it to the retrieved VC list
     // retrieve VC list from the job list belonging to the user
     if (!userInstance.history_vclist || userInstance.history_vclist.length === 0) {
-      userInstance.history_vclist = await jobController.getUserHistoryVCs(userInstance.username);
+      const vcsFromJob = await job.listVCsFromJob(userInstance.username);
+      userInstance.history_vclist = vcsFromJob;
     }
 
     // retrieve VC from group list