nitor 1.0.0 → 1.2.0

package/services/autocomplete.js

@@ -0,0 +1,251 @@
+const omelette = require('omelette');
+const { ACTIONS } = require('./enums/actions.enum');
+
+const setupAutocomplete = () => {
+  const completion = omelette('nitor|nu');
+
+  // Define the completion tree
+  completion.tree({
+    [ACTIONS.BUILD]: {
+      '-project': [
+        'portal',
+        'gateway',
+        'phr',
+        'configService',
+        'healthRecords',
+        'centralAuth',
+        'mpi',
+        'phrAdminBackend',
+        'phrAdminClient',
+        'terminologyService',
+      ],
+      '-p': [
+        'portal',
+        'gateway',
+        'phr',
+        'configService',
+        'healthRecords',
+        'centralAuth',
+        'mpi',
+        'phrAdminBackend',
+        'phrAdminClient',
+        'terminologyService',
+      ],
+      '-components': ['client', 'administration', 'provider', 'rest-api'],
+      '-c': ['client', 'administration', 'provider', 'rest-api'],
+      '-instance': ['dev', 'qa', 'pilot'],
+      '-i': ['dev', 'qa', 'pilot'],
+      '-help': [],
+      '--h': [],
+    },
+    [ACTIONS.DEPLOY]: {
+      '-project': [
+        'portal',
+        'gateway',
+        'phr',
+        'configService',
+        'healthRecords',
+        'centralAuth',
+        'mpi',
+        'phrAdminBackend',
+        'phrAdminClient',
+        'terminologyService',
+      ],
+      '-p': [
+        'portal',
+        'gateway',
+        'phr',
+        'configService',
+        'healthRecords',
+        'centralAuth',
+        'mpi',
+        'phrAdminBackend',
+        'phrAdminClient',
+        'terminologyService',
+      ],
+      '-components': ['client', 'administration', 'provider', 'rest-api'],
+      '-c': ['client', 'administration', 'provider', 'rest-api'],
+      '-instance': ['dev', 'qa', 'pilot'],
+      '-i': ['dev', 'qa', 'pilot'],
+      '-help': [],
+      '--h': [],
+    },
+    [ACTIONS.BUILD_DEPLOY]: {
+      '-project': [
+        'portal',
+        'gateway',
+        'phr',
+        'configService',
+        'healthRecords',
+        'centralAuth',
+        'mpi',
+        'phrAdminBackend',
+        'phrAdminClient',
+        'terminologyService',
+      ],
+      '-p': [
+        'portal',
+        'gateway',
+        'phr',
+        'configService',
+        'healthRecords',
+        'centralAuth',
+        'mpi',
+        'phrAdminBackend',
+        'phrAdminClient',
+        'terminologyService',
+      ],
+      '-components': ['client', 'administration', 'provider', 'rest-api'],
+      '-c': ['client', 'administration', 'provider', 'rest-api'],
+      '-instance': ['dev', 'qa', 'pilot'],
+      '-i': ['dev', 'qa', 'pilot'],
+      '-help': [],
+      '--h': [],
+    },
+    [ACTIONS.CREATE_BRANCH]: {
+      '-task': [],
+      '-t': [],
+      '-type': ['feat', 'fix'],
+      '-ty': ['feat', 'fix'],
+      '-description': [],
+      '-d': [],
+      '-project': [
+        'portal',
+        'gateway',
+        'phr',
+        'configService',
+        'healthRecords',
+        'centralAuth',
+        'mpi',
+        'phrAdminBackend',
+        'phrAdminClient',
+        'terminologyService',
+      ],
+      '-p': [
+        'portal',
+        'gateway',
+        'phr',
+        'configService',
+        'healthRecords',
+        'centralAuth',
+        'mpi',
+        'phrAdminBackend',
+        'phrAdminClient',
+        'terminologyService',
+      ],
+      '-help': [],
+      '--h': [],
+    },
+    [ACTIONS.REVIEW]: {
+      '-project': [
+        'portal',
+        'gateway',
+        'phr',
+        'configService',
+        'healthRecords',
+        'centralAuth',
+        'mpi',
+        'phrAdminBackend',
+        'phrAdminClient',
+        'terminologyService',
+      ],
+      '-p': [
+        'portal',
+        'gateway',
+        'phr',
+        'configService',
+        'healthRecords',
+        'centralAuth',
+        'mpi',
+        'phrAdminBackend',
+        'phrAdminClient',
+        'terminologyService',
+      ],
+      '-mergeId': [],
+      '-mId': [],
+      '-repository': [
+        'portalClient',
+        'portalBackend',
+        'portalDeployment',
+        'portalAutomation',
+        'gatewayBackend',
+        'gatewayClient',
+        'gatewayDeployment',
+        'phrClient',
+        'phrBackend',
+        'phrDeployment',
+        'configService',
+        'healthRecords',
+        'centralAuth',
+        'mpi',
+        'phrAdminBackend',
+        'phrAdminClient',
+        'terminologyService',
+      ],
+      '-r': [
+        'portalClient',
+        'portalBackend',
+        'portalDeployment',
+        'portalAutomation',
+        'gatewayBackend',
+        'gatewayClient',
+        'gatewayDeployment',
+        'phrClient',
+        'phrBackend',
+        'phrDeployment',
+        'configService',
+        'healthRecords',
+        'centralAuth',
+        'mpi',
+        'phrAdminBackend',
+        'phrAdminClient',
+        'terminologyService',
+      ],
+      '-help': [],
+      '--h': [],
+    },
+    [ACTIONS.REFACTOR]: {
+      '-help': [],
+      '--h': [],
+    },
+    [ACTIONS.BACKUP]: {
+      '-project': ['configService', 'medicaCentralAuth', 'medicaPortal', 'phr'],
+      '-p': ['configService', 'medicaCentralAuth', 'medicaPortal', 'phr'],
+      '-components': [],
+      '-c': [],
+      '-help': [],
+      '--h': [],
+    },
+    [ACTIONS.MERGE]: {
+      '-source': [],
+      '-s': [],
+      '-target': [],
+      '-ta': [],
+      '-help': [],
+      '--h': [],
+    },
+    [ACTIONS.CLEANUP]: {
+      '-help': [],
+      '--h': [],
+    },
+    [ACTIONS.TIME_INIT]: [],
+    [ACTIONS.TIME_SWITCH]: [],
+    [ACTIONS.TIME_ADD]: [],
+    [ACTIONS.TIME_UPDATE]: [],
+    [ACTIONS.TIME_DELETE]: [],
+    [ACTIONS.TIME_STATUS]: [],
+    [ACTIONS.TIME_ENTRIES]: [],
+    [ACTIONS.TIME_ZOHO]: [],
+    [ACTIONS.TIME_GITLAB]: [],
+    [ACTIONS.TIME_MERGE]: [],
+    [ACTIONS.VERSION]: [],
+    [ACTIONS.HELP]: [],
+  });
+
+  // Initialize the completion
+  completion.init();
+
+  return completion;
+};
+
+module.exports = { setupAutocomplete };

package/services/cleanup.js

@@ -0,0 +1,63 @@
+const { execSync } = require('child_process');
+
+const cleanup = async () => {
+  try {
+    console.log('Starting cleanup process...\n');
+
+    // Get current branch
+    const currentBranch = execSync('git branch --show-current', { encoding: 'utf-8' }).trim();
+    console.log(`Current branch: ${currentBranch}`);
+
+    // Checkout to master
+    console.log('\nChecking out to master branch...');
+    try {
+      execSync('git checkout master', { encoding: 'utf-8', stdio: 'inherit' });
+    } catch (error) {
+      // Try main if master doesn't exist
+      console.log('Master branch not found, trying main...');
+      execSync('git checkout main', { encoding: 'utf-8', stdio: 'inherit' });
+    }
+
+    // Get all local branches except master/main
+    console.log('\nFetching list of local branches...');
+    const branches = execSync('git branch', { encoding: 'utf-8' })
+      .split('\n')
+      .map((branch) => branch.trim().replace('* ', ''))
+      .filter((branch) => branch && branch !== 'master' && branch !== 'main');
+
+    if (!branches.length) {
+      console.log('\nNo branches to delete. Cleanup complete!');
+      return;
+    }
+
+    console.log(`\nFound ${branches.length} branch(es) to delete:`);
+
+    // Delete each branch
+    console.log('\nDeleting branches...');
+    let deletedCount = 0;
+    let failedCount = 0;
+
+    for (const branch of branches) {
+      try {
+        execSync(`git branch -D ${branch}`, { encoding: 'utf-8' });
+        console.log(`  ✓ Deleted: ${branch}`);
+        deletedCount++;
+      } catch (error) {
+        console.log(`  ✗ Failed to delete: ${branch}`);
+        failedCount++;
+      }
+    }
+
+    console.log(`\nCleanup complete!`);
+    console.log(`  Deleted: ${deletedCount} branch(es)`);
+
+    if (failedCount > 0) {
+      console.log(`  Failed: ${failedCount} branch(es)`);
+    }
+  } catch (error) {
+    console.error('Error during cleanup:', error.message);
+    throw error;
+  }
+};
+
+module.exports = { cleanup };

package/services/enums/actions.enum.js

@@ -1,14 +1,27 @@
 module.exports = {
   ACTIONS: {
+    BACKUP: 'backup',
+    BUILD_DEPLOY: 'build-deploy',
     BUILD: 'build',
+    CLEANUP: 'cleanup',
+    CREATE_BRANCH: 'create-branch',
     DEPLOY: 'deploy',
-    BUILD_DEPLOY: 'build-deploy',
-    VERSION: 'version',
     HELP: 'help',
-    CREATE_BRANCH: 'create-branch',
-    REVIEW: 'review',
-    REFACTOR: 'refactor',
-    BACKUP: 'backup',
     MERGE: 'merge',
+    REFACTOR: 'refactor',
+    REVIEW: 'review',
+    VERSION: 'version',
+
+    // Time entry commands
+    TIME_INIT: 'time-init',
+    TIME_SWITCH: 'time-switch',
+    TIME_ADD: 'time-add',
+    TIME_UPDATE: 'time-update',
+    TIME_DELETE: 'time-delete',
+    TIME_STATUS: 'time-stats',
+    TIME_ENTRIES: 'time-entries',
+    TIME_ZOHO: 'time-zoho',
+    TIME_GITLAB: 'time-gitlab',
+    TIME_MERGE: 'time-merge',
   },
 };

package/services/process-commands.js

@@ -1,4 +1,4 @@
-// const { checkConfig } = require('./init-config');
+const axios = require('axios');
 const { build, buildStatus } = require('./build');
 const { deploy } = require('./deploy');
 const { ACTIONS } = require('./enums/actions.enum');
@@ -8,17 +8,37 @@ const { mrAIReview } = require('./review');
 const { refactor } = require('./refactor');
 const { backup } = require('./mongodb-backup');
 const { merge } = require('./merge');
+const { cleanup } = require('./cleanup');
+
+// Time entry imports
+const { removeEmpty } = require('./time-entry/utils');
+const { getStatus, getTasksByDate } = require('./time-entry/get-report');
+const { logTaskHoursAndSync } = require('./time-entry/log-task-hours-and-sync');
+const { addNewTask } = require('./time-entry/add-task');
+const { updateTask, deleteTask } = require('./time-entry/update-delete-task');
+const { getGitlabActivities } = require('./time-entry/get-gitlab-activities');
+const { getZohoTasks } = require('./time-entry/get-zoho-tasks');
 
 const processArgs = async (type, value) => {
   try {
     let values;
 
-    if (
-      type !== ACTIONS.HELP &&
-      type !== ACTIONS.VERSION &&
-      !value.includes('--h') &&
-      !value.includes('-help')
-    ) {
+    // Skip convertParamsToMap for time commands and other special commands
+    const skipConversion = [
+      ACTIONS.HELP,
+      ACTIONS.VERSION,
+      ACTIONS.CLEANUP,
+      ACTIONS.TIME_ADD,
+      ACTIONS.TIME_UPDATE,
+      ACTIONS.TIME_DELETE,
+      ACTIONS.TIME_STATUS,
+      ACTIONS.TIME_ENTRIES,
+      ACTIONS.TIME_ZOHO,
+      ACTIONS.TIME_GITLAB,
+      ACTIONS.TIME_MERGE,
+    ];
+
+    if (!skipConversion.includes(type) && !value?.includes('--h') && !value?.includes('-help')) {
       values = await convertParamsToMap(value, type);
     }
 
@@ -138,22 +158,22 @@ Options:
   -r, --repository <repository name>  repository name
   
 Repository list:
-  portalClient
-  portalBackend
-  portalDeployment
-  portalAutomation
+  centralAuth
+  configService
   gatewayBackend
   gatewayClient
   gatewayDeployment
-  phrClient
-  phrBackend
-  phrDeployment
-  configService
   healthRecords
-  centralAuth
   mpi
   phrAdminBackend
   phrAdminClient
+  phrBackend
+  phrClient
+  phrDeployment
+  portalAutomation
+  portalBackend
+  portalClient
+  portalDeployment
   terminologyService`);
 
           return;
@@ -224,12 +244,165 @@ This command will:
         break;
       }
 
+      case ACTIONS.CLEANUP: {
+        if (value === '-help' || value === '--h') {
+          console.log(`usage: \tnu cleanup
+
+Cleanup local git branches
+
+This command will:
+  1. Checkout to master (or main) branch
+  2. Delete all other local branches
+
+Note: This operation cannot be undone. Make sure you have pushed any important changes.`);
+
+          return;
+        }
+
+        await cleanup();
+
+        break;
+      }
+
       case ACTIONS.VERSION: {
         const path = require('path');
         const packageJson = require(path.resolve(__dirname, '../package.json'));
         const packageVersion = packageJson.version;
+        // ANSI color codes
+        const cyan = '\x1b[36m';
+        const green = '\x1b[32m';
+        const yellow = '\x1b[33m';
+        const reset = '\x1b[0m';
+        const bold = '\x1b[1m';
+
+        console.log(`
+${cyan}${bold}╔════════════════════════════════════════════════════╗
+║                                                    ║
+║     ${yellow}███╗   ██╗ ██╗ ████████╗  ██████╗  ██████╗${cyan}     ║
+║     ${yellow}████╗  ██║ ██║ ╚══██╔══╝ ██╔═══██╗ ██╔══██╗${cyan}    ║
+║     ${yellow}██╔██╗ ██║ ██║    ██║    ██║   ██║ ██████╔╝${cyan}    ║
+║     ${yellow}██║╚██╗██║ ██║    ██║    ██║   ██║ ██╔══██╗${cyan}    ║
+║     ${yellow}██║ ╚████║ ██║    ██║    ╚██████╔╝ ██║  ██║${cyan}    ║
+║     ${yellow}╚═╝  ╚═══╝ ╚═╝    ╚═╝     ╚═════╝  ╚═╝  ╚═╝${cyan}    ║
+║                                                    ║
+╚════════════════════════════════════════════════════╝${reset}
+
+  ${green}${bold}Version:${reset} ${bold}v${packageVersion}${reset}`);
+
+        break;
+      }
+
+      // Time entry commands
+      case ACTIONS.TIME_ADD: {
+        const timeValues = value ? removeEmpty(value?.split(' -')) : value;
+
+        await addNewTask(timeValues);
+
+        break;
+      }
+
+      case ACTIONS.TIME_UPDATE: {
+        const timeValues = value ? removeEmpty(value?.split(' -')) : value;
+
+        await updateTask(timeValues);
 
-        console.log('Package version:', packageVersion);
+        break;
+      }
+
+      case ACTIONS.TIME_DELETE: {
+        const timeValues = value ? removeEmpty(value?.split(' -')) : value;
+
+        console.log(await deleteTask(timeValues));
+
+        break;
+      }
+
+      case ACTIONS.TIME_STATUS: {
+        const timeValues = value ? removeEmpty(value?.split(' -')) : value;
+
+        await getStatus(timeValues);
+
+        break;
+      }
+
+      case ACTIONS.TIME_ENTRIES: {
+        const timeValues = value ? removeEmpty(value?.split(' -')) : value;
+
+        console.table(await getTasksByDate(timeValues));
+
+        break;
+      }
+
+      case ACTIONS.TIME_ZOHO: {
+        console.log('Final status: ', await logTaskHoursAndSync());
+
+        break;
+      }
+
+      case ACTIONS.TIME_GITLAB: {
+        const timeValues = value ? removeEmpty(value?.split(' -')) : value;
+
+        await getGitlabActivities(timeValues);
+
+        break;
+      }
+
+      case ACTIONS.TIME_MERGE: {
+        const tasks = await getZohoTasks({ params: { type: ['2'] } });
+        const taskIds = tasks.reduce((acc, task) => {
+          if (task.gitlab_iid) {
+            acc.push({ taskId: task.taskId, gitlabIid: task.gitlab_iid });
+          }
+
+          return acc;
+        }, []);
+
+        if (!taskIds.length) {
+          console.log('No active tasks with GitLab IIDs found');
+          break;
+        }
+
+        const mergeRequests = await Promise.all(
+          taskIds.map(async ({ taskId, gitlabIid }) => {
+            try {
+              const response = await axios.get(
+                `${process.env.GITLAB_API_URL}/projects/${process.env.GITLAB_PROJECT_ID}/merge_requests/${gitlabIid}`,
+                {
+                  headers: {
+                    'PRIVATE-TOKEN': process.env.GITLAB_TOKEN,
+                  },
+                },
+              );
+              return {
+                taskId,
+                gitlabIid,
+                status: response.data.state,
+                assignee: response.data.assignee?.name || 'Unassigned',
+                title: response.data.title,
+                webUrl: response.data.web_url,
+              };
+            } catch (error) {
+              return {
+                taskId,
+                gitlabIid,
+                status: 'error',
+                error: error.response?.status === 404 ? 'MR not found' : 'Failed to fetch MR',
+              };
+            }
+          }),
+        );
+
+        console.table(
+          mergeRequests.map((mr) => ({
+            'Task ID': mr.taskId,
+            'MR IID': mr.gitlabIid,
+            Status: mr.status,
+            Assignee: mr.assignee || '-',
+            Title: mr.title || '-',
+            URL: mr.webUrl || '-',
+            Error: mr.error || '-',
+          })),
+        );
 
         break;
       }
@@ -237,28 +410,49 @@ This command will:
       case ACTIONS.HELP: {
         console.log(`usage: nitor \t[${ACTIONS.VERSION}] [${ACTIONS.HELP}]
         \t[${ACTIONS.BUILD}] [${ACTIONS.DEPLOY}] [${ACTIONS.BUILD_DEPLOY}]
-        \t[${ACTIONS.CREATE_BRANCH}] [${ACTIONS.REVIEW}] [${ACTIONS.MERGE}]\n
+        \t[${ACTIONS.CREATE_BRANCH}] [${ACTIONS.REVIEW}] [${ACTIONS.MERGE}]
+        \t[${ACTIONS.CLEANUP}] [${ACTIONS.BACKUP}] [${ACTIONS.REFACTOR}]
+        \t[${ACTIONS.TIME_INIT}] [${ACTIONS.TIME_ADD}] [${ACTIONS.TIME_STATUS}]\n
 Available commands:\n
+  backup        : Backup MongoDB databases
   build         : Build specified components
-  deploy        : Deploy specified components
   build-deploy  : Build and then deploy
+  cleanup       : Cleanup local git branches (checkout to master and delete all other branches)
+  completion    : Setup shell autocomplete
   create-branch : Create git branch
-  review        : AI Review specified merge request
-  refactor      : REFACTOR the provided text for improved clarity, conciseness, and professional quality.
+  deploy        : Deploy specified components
   merge         : Merge source branch into target branch
+  refactor      : Refactor the provided text for improved clarity, conciseness, and professional quality
+  review        : AI Review specified merge request
   version       : Show version info
   help          : Show help
 
+Time Entry commands:
+  time-init     : Initialize time entry configuration
+  time-add      : Add time entry
+  time-delete   : Delete time entry
+  time-entries  : View time entries by date
+  time-gitlab   : Get GitLab activities
+  time-merge    : View merge request status for tasks
+  time-stats   : View daily status of time entries
+  time-switch   : Switch between default projects
+  time-update   : Update existing time entry
+  time-zoho     : Sync time entries to Zoho
+
 For details of each actions run 'nitor <action> -help'
 
 Example usage:\n
   nitor build -project <project> -components <components> -instance <instance>
-  nitor deploy -project <project> -components <components> -instance <instance>
   nitor build-deploy -project <project> -components <components> -instance <instance>
+  nitor cleanup
   nitor create-branch -task <task number> -type <feat|fix> -description <description> -project <project short name>
-  nitor review -project <project short name> -mergeId <merge id> -repository <repository name>
-  nitor refactor <text>
+  nitor deploy -project <project> -components <components> -instance <instance>
   nitor merge -source <source branch> -target <target branch>
+  nitor refactor <text>
+  nitor review -project <project short name> -mergeId <merge id> -repository <repository name>
+  nitor time-init
+  nitor time-add
+  nitor time-stats
 
 Running 'nitor help' will list available subcommands and provide some conceptual guides.`);
         break;

package/services/review.js

@@ -1,4 +1,4 @@
-const { gitlabToken, projectIdMap, mrPrompt, mrLang, mrApiUri } = require('./utils');
+const { gitlabConfig, projectIdMap, mrPrompt, mrLang, mrApiUri } = require('./utils');
 const axios = require('axios');
 
 const executeMergeRequestReview = async (values) => {
@@ -9,7 +9,7 @@ const executeMergeRequestReview = async (values) => {
     headers: { 'Content-Type': 'application/json' },
     data: JSON.stringify({
       language: mrLang,
-      gitlabToken,
+      gitlabToken: gitlabConfig.token,
       llmModel: 'claude',
       prompt: mrPrompt,
     }),