nitor 1.3.1 → 1.3.3

package/README.md

@@ -115,14 +115,19 @@ Once enabled, you can use Tab to autocomplete:
   ```bash
   nitor refactor <text>
   ```
-- **Backup:**
-  ```bash
-  nitor backup <text>
-  ```
-- **Restore:**
+- **MongoDB Backup & Restore:**
+
   ```bash
-  nitor restore <text>
+  # Backup from Kubernetes pods and restore to local MongoDB
+  nitor backup
+
+  # Backup specific projects only
+  nitor backup -project <project1> <project2>
+
+  # Restore to Docker container (default: local MongoDB)
+  nitor backup -docker <boolean>
   ```
+
 - **Merge:**
   ```bash
   nitor merge -source <source branch> -target <target branch>
@@ -191,8 +196,7 @@ Once enabled, you can use Tab to autocomplete:
 - `create-branch` : Create git branch
 - `review` : AI review specified merge request
 - `refactor` : AI refactor specified text
-- `backup` : Backup specified projects
-- `restore` : Restore specified projects
+- `backup` : Backup MongoDB databases from Kubernetes pods and restore to local/Docker
 - `merge` : Merge source branch into target branch
 - `cleanup` : Cleanup local git branches (checkout to master and delete all other branches)
 - `time-init` : Initialize time entry configuration
@@ -208,6 +212,140 @@ Once enabled, you can use Tab to autocomplete:
 - `task-stats` : View task statistics with GitLab merge request details
 - `get-task` : Extract Zoho task IDs from GitLab issue descriptions
 
+## MongoDB Backup & Restore
+
+### Overview
+
+The MongoDB backup service provides automated backup and restore functionality for MongoDB databases running in Kubernetes pods. It supports:
+
+- ✅ Backup from Kubernetes pods using `kubectl`
+- ✅ Restore to Docker containers or local MongoDB instances
+- ✅ Cross-platform support (Windows, macOS, Linux)
+- ✅ Multi-project configuration
+- ✅ Automatic cleanup of temporary files
+- ✅ Error handling with detailed logging
+
+### Configuration
+
+Configure your backup settings in the `.env.nu` file using JSON format:
+
+#### BACKUP_CONFIG
+
+Defines the source databases to backup from Kubernetes pods:
+
+```json
+BACKUP_CONFIG={
+  "project1": [
+    {
+      "pod": "mongodb-pod-name",
+      "username": "admin",
+      "password": "password123",
+      "database": "mydb",
+      "backupPath": "/data/backup",
+      "localBackupPath": "~/backups/mongo"
+    }
+  ],
+  "project2": [
+    {
+      "pod": "another-pod",
+      "username": "dbuser",
+      "password": "dbpass",
+      "database": "anotherdb"
+    }
+  ]
+}
+```
+
+**Configuration Options:**
+
+- `pod` (required): Name of the Kubernetes pod
+- `username` (required): MongoDB username
+- `password` (required): MongoDB password
+- `database` (required): Database name
+- `backupPath` (optional): Path inside pod for temporary backup (default: `/data/backup`)
+- `localBackupPath` (optional): Local path to store backups (default: `~/backups/mongo`)
+
+#### RESTORE_CONFIG
+
+Defines where to restore the backup:
+
+```json
+RESTORE_CONFIG={
+  "mongoInDocker": false,
+  "containerName": "mongodb",
+  "localBackupPath": "~/backups/mongo",
+  "containerBackupPath": "/data/backup"
+}
+```
+
+**Configuration Options:**
+
+- `mongoInDocker` (optional): Set to `true` to restore to Docker container, `false` for local MongoDB (can be overridden with `-docker` flag)
+- `containerName` (optional): Docker container name (default: `mongodb`)
+- `localBackupPath` (optional): Path where backup is stored (default: `~/backups/mongo`)
+- `containerBackupPath` (optional): Path inside container for temporary files (default: `/data/backup`)
+
+### How It Works
+
+1. **Backup Phase:**
+
+   - Executes `mongodump` inside the Kubernetes pod
+   - Copies backup files to your local machine using `kubectl cp`
+   - Cleans up temporary files from the pod
+   - Saves to `~/backups/mongo/<database-name>` by default
+
+2. **Restore Phase:**
+   - **Docker Mode** (`-docker` flag):
+     - Copies backup from local machine to Docker container
+     - Executes `mongorestore --drop` inside the container
+     - Cleans up temporary files from container
+   - **Local Mode** (default):
+     - Executes `mongorestore --drop` directly on local machine
+     - Connects to `mongodb://localhost:27017/`
+
+### Usage Examples
+
+**Backup all configured projects:**
+
+```bash
+nitor backup
+```
+
+**Backup specific projects:**
+
+```bash
+nitor backup -project project1 project2
+```
+
+**Backup and restore to Docker container:**
+
+```bash
+nitor backup -docker
+```
+
+### Prerequisites
+
+- **For Backup:** `kubectl` configured with access to your Kubernetes cluster
+- **For Restore (Docker):** Docker running with MongoDB container
+- **For Restore (Local):** MongoDB installed and running locally on port 27017
+- MongoDB tools (`mongodump`, `mongorestore`) must be available in the pod/container
+
+### Cross-Platform Support
+
+The backup service is designed to work on Windows, macOS, and Linux:
+
+- Automatically detects the operating system
+- Uses appropriate shell (`cmd.exe` on Windows, `/bin/sh` on Unix)
+- Handles path normalization across platforms
+- Adjusts command flags for Windows compatibility (e.g., removes `-it` flags)
+
+### Error Handling
+
+- Non-zero exit codes from `mongorestore` are treated as warnings (common with duplicate keys)
+- Detailed error messages with color-coded output
+- Continues processing remaining projects even if one fails
+- Cleanup operations run even if restore encounters errors
+
 ### Options
 
 - `-project` or `-p` : Project name (`portal`, `gateway`, `phr`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitor",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "A comprehensive CLI toolkit for automating GitLab operations, AI-powered code review, build/deploy automation, MongoDB backup/restore, and developer productivity tools",
   "main": "index.js",
   "author": "Nithin V <mails2nithin@gmail.com>",

package/services/cleanup.js

@@ -15,15 +15,15 @@ const cleanup = async () => {
 
     // Get current branch
     const currentBranch = execSync('git branch --show-current', execOptions).trim();
-    console.log(`Current branch: ${currentBranch}`);
 
-    // Checkout to master
+    console.log(`Current branch: ${currentBranch}`);
     console.log('\nChecking out to master branch...');
     try {
       execSync('git checkout master', execOptionsInherit);
     } catch (error) {
       // Try main if master doesn't exist
       console.log('Master branch not found, trying main...');
+
       execSync('git checkout main', execOptionsInherit);
     }
 
@@ -40,28 +40,32 @@ const cleanup = async () => {
     }
 
     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}`, execOptions);
-        console.log(`  ✓ Deleted: ${branch}`);
+        execSync(`rm -rf ~/.git/logs/refs/heads/${branch}`, execOptions);
+        execSync(`rm -rf ~/.git/refs/heads/${branch}`, execOptions);
+
+        console.log(`Deleted: ${branch}`);
+
         deletedCount++;
       } catch (error) {
-        console.log(`  ✗ Failed to delete: ${branch}`);
+        console.log(`Failed to delete: ${branch}`);
+
         failedCount++;
       }
     }
 
     console.log(`\nCleanup complete!`);
-    console.log(`  Deleted: ${deletedCount} branch(es)`);
+    console.log(`Deleted: ${deletedCount} branch(es)`);
 
     if (failedCount > 0) {
-      console.log(`  Failed: ${failedCount} branch(es)`);
+      console.log(`Failed: ${failedCount} branch(es)`);
     }
   } catch (error) {
     console.error('Error during cleanup:', error.message);

package/services/mongodb-backup.js

@@ -45,12 +45,18 @@ const executeMongoRestore = async (config) => {
       // Step 2: Execute mongorestore inside the container
       // Remove -it flag for Windows compatibility (causes issues in non-interactive shells)
       const restoreCommand = isWindows
-        ? `docker exec ${containerName} mongorestore ${containerBackupPath}`
-        : `docker exec -it ${containerName} mongorestore ${containerBackupPath}`;
+        ? `docker exec ${containerName} mongorestore --drop --stopOnError=false ${containerBackupPath}`
+        : `docker exec -it ${containerName} mongorestore --drop --stopOnError=false ${containerBackupPath}`;
 
       console.log('Executing mongorestore...');
-      execSync(restoreCommand, { stdio: 'inherit', shell: isWindows ? 'cmd.exe' : '/bin/sh' });
-      console.log(`${colors.green}✓ Mongorestore completed successfully${colors.reset}`);
+      try {
+        execSync(restoreCommand, { stdio: 'inherit', shell: isWindows ? 'cmd.exe' : '/bin/sh' });
+        console.log(`${colors.green}✓ Mongorestore completed successfully${colors.reset}`);
+      } catch (error) {
+        console.log(
+          `${colors.red}⚠ Mongorestore completed with some errors (check output above for details)${colors.reset}`,
+        );
+      }
 
       // Step 3: Remove backup data from container
       const cleanupCommand = isWindows
@@ -66,12 +72,21 @@ const executeMongoRestore = async (config) => {
       console.log(`\nStarting MongoDB restore to local machine`);
 
       console.log('Executing mongorestore...');
-      const localRestoreCommand = `mongorestore --uri="mongodb://localhost:27017/" "${normalizedLocalPath}"`;
-      execSync(localRestoreCommand, {
-        stdio: 'inherit',
-        shell: isWindows ? 'cmd.exe' : '/bin/sh',
-      });
-      console.log(`${colors.green}✓ Mongorestore completed successfully${colors.reset}`);
+      const localRestoreCommand = `mongorestore --drop --stopOnError=false --uri="mongodb://localhost:27017/" "${normalizedLocalPath}"`;
+      try {
+        execSync(localRestoreCommand, {
+          stdio: 'inherit',
+          shell: isWindows ? 'cmd.exe' : '/bin/sh',
+        });
+        console.log(`${colors.green}✓ Mongorestore completed successfully${colors.reset}`);
+      } catch (error) {
+        // mongorestore returns non-zero even for partial success (e.g., duplicate keys)
+        // Log the warning but don't throw unless it's a critical failure
+        console.log(
+          `${colors.red}⚠ Mongorestore completed with some errors (this may be expected if data already exists)${colors.reset}`,
+        );
+        console.log(`Check the output above for details`);
+      }
 
       console.log(`${colors.green}Restore completed successfully!${colors.reset}\n`);
     }

package/services/process-commands.js

@@ -11,7 +11,7 @@ const { merge } = require('./merge');
 const { cleanup } = require('./cleanup');
 
 // Time entry imports
-const { removeEmpty, getSprints } = require('./time-entry/utils');
+const { getSprints } = 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');
@@ -199,7 +199,7 @@ Enhance the provided text for improved clarity, conciseness, and professional qu
 Backup mongodb for specified project and components.
 
 project list:
-  - configCervice
+  - configService
   - medicaCentralAuth
   - medicaPortal
   - phr`);
@@ -387,7 +387,7 @@ Options:
 
       // Time entry commands
       case ACTIONS.TIME_ADD: {
-        const timeValues = value ? removeEmpty(value?.split(' -')) : value;
+        const timeValues = value ? value.split(' -') : value;
 
         await addNewTask(timeValues);
 
@@ -395,7 +395,7 @@ Options:
       }
 
       case ACTIONS.TIME_UPDATE: {
-        const timeValues = value ? removeEmpty(value?.split(' -')) : value;
+        const timeValues = value ? value.split(' -') : value;
 
         await updateTask(timeValues);
 
@@ -403,7 +403,7 @@ Options:
       }
 
       case ACTIONS.TIME_DELETE: {
-        const timeValues = value ? removeEmpty(value?.split(' -')) : value;
+        const timeValues = value ? value.split(' -') : value;
 
         console.log(await deleteTask(timeValues));
 
@@ -411,7 +411,7 @@ Options:
       }
 
       case ACTIONS.TIME_STATUS: {
-        const timeValues = value ? removeEmpty(value?.split(' -')) : value;
+        const timeValues = value ? value.split(' -') : value;
 
         await getStatus(timeValues);
 
@@ -419,7 +419,7 @@ Options:
       }
 
       case ACTIONS.TIME_ENTRIES: {
-        const timeValues = value ? removeEmpty(value?.split(' -')) : value;
+        const timeValues = value ? value.split(' -') : value;
 
         console.table(await getTasksByDate(timeValues));
 
@@ -433,7 +433,7 @@ Options:
       }
 
       case ACTIONS.TIME_GITLAB: {
-        const timeValues = value ? removeEmpty(value?.split(' -')) : value;
+        const timeValues = value ? value.split(' -') : value;
 
         await getGitlabActivities(timeValues);
 
@@ -505,6 +505,7 @@ Options:
         \t[${ACTIONS.BUILD}] [${ACTIONS.DEPLOY}] [${ACTIONS.BUILD_DEPLOY}]
         \t[${ACTIONS.CREATE_BRANCH}] [${ACTIONS.REVIEW}] [${ACTIONS.MERGE}]
         \t[${ACTIONS.CLEANUP}] [${ACTIONS.BACKUP}] [${ACTIONS.REFACTOR}]
+        \t[${ACTIONS.TASK_STATS}] [${ACTIONS.GET_TASK}]
         \t[${ACTIONS.TIME_INIT}] [${ACTIONS.TIME_ADD}] [${ACTIONS.TIME_STATUS}]\n
 Available commands:\n
   backup        : Backup MongoDB databases
@@ -514,11 +515,11 @@ Available commands:\n
   completion    : Setup shell autocomplete
   create-branch : Create git branch
   deploy        : Deploy specified components
-  get-task      : Get task details
+  get-task      : Get task details from GitLab merge requests
   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
-  task-stats    : View task statistics
+  task-stats    : View task statistics and merge request details
   version       : Show version info
   help          : Show help
 
@@ -542,9 +543,11 @@ Example usage:\n
   nitor cleanup
   nitor create-branch -task <task number> -type <feat|fix> -description <description> -project <project short name>
   nitor deploy -project <project> -components <components> -instance <instance>
+  nitor get-task -task <task numbers with space>
   nitor merge -source <source branch> -target <target branch>
   nitor refactor <text>
   nitor review -project <project short name> -mergeId <merge id> -repository <repository name>
+  nitor task-stats -task <task number>
   nitor time-init
   nitor time-add
   nitor time-stats
@@ -559,11 +562,12 @@ Running 'nitor help' will list available subcommands and provide some conceptual
         return;
       }
     }
+
+    process.exit(1);
   } catch (error) {
     console.log(error);
+    process.exit(1);
   }
-
-  process.exit(1);
 };
 
 module.exports = { processArgs };

package/services/task-stats.js

@@ -122,6 +122,8 @@ const getGitMergeRequestDetails = async (issueIid, projectId) => {
 };
 
 const getGitlabIssueMergeRequests = async (gitDetails) => {
+  const skippedMrBranches = ['dev-qa-testing', 'qa-testing'];
+
   for (const gitDetail of gitDetails) {
     try {
       const mergeRequests = await getGitMergeRequestDetails(
@@ -137,6 +139,10 @@ const getGitlabIssueMergeRequests = async (gitDetails) => {
             const detailResponse = await axios.request(detailConfig);
             const mrData = detailResponse.data;
 
+            if (skippedMrBranches.some((branch) => mrData.target_branch.includes(branch))) {
+              return;
+            }
+
             // Fetch approval details separately
             try {
               const approvalConfig = getGitlabConfig(
@@ -150,7 +156,7 @@ const getGitlabIssueMergeRequests = async (gitDetails) => {
                 IssueID: gitDetail.iid,
                 MRID: mrData.iid,
                 MRAssignedTo: mrData.assignee?.name,
-                MRPointedTo: mrData.target_branch,
+                MRTarget: mrData.target_branch,
                 Repo: mr.reference?.split('!')?.[0],
                 ApprovedBy:
                   (approvalData.approved_by || [])

package/services/time-entry/get-report.js

@@ -4,7 +4,6 @@ const {
   path,
   readFileSync,
   userHomeDir,
-  removeEmpty,
 } = require('./utils');
 const getTasksByDate = async (filters) => {
   try {
@@ -29,7 +28,10 @@ const getTasksByDate = async (filters) => {
       const item = readFileSync(path.join(userHomeDir, `.${stringDate}`));
 
       if (item) {
-        const timeEntries = removeEmpty(item.split(contentTableSeparator)[1].split('\n'));
+        const timeEntries = item
+          .split(contentTableSeparator)[1]
+          .split('\n')
+          .filter((entry) => entry.trim() !== '');
 
         data = data.concat(
           timeEntries.map((entry) =>

package/services/time-entry/utils.js

@@ -228,29 +228,6 @@ const readFileSync = (path) => {
     // console.log(error);
   }
 };
-const removeEmpty = (obj) => {
-  for (let [key, val] of Object.entries(obj)) {
-    if (val && typeof val === 'object') {
-      this.removeEmpty(val);
-
-      if (!(Object.keys(val).length || val instanceof Date)) {
-        delete obj[key];
-      }
-    } else {
-      if (typeof val === 'string') {
-        val = val.trim();
-      }
-
-      if (val === null || val === undefined || val === '') {
-        delete obj[key];
-      } else {
-        obj[key] = val;
-      }
-    }
-  }
-
-  return obj;
-};
 const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
 const userConfig = async (jsonData) => {
   return new Promise((resolve, reject) => {
@@ -293,7 +270,6 @@ module.exports = {
   mkdirSync,
   path,
   readFileSync,
-  removeEmpty,
   rl,
   userConfig,
   userHomeDir,

package/services/utils.js

@@ -22,7 +22,7 @@ const gitlabConfig = {
 const zohoConfig = {
   cookie: process.env.ZOHO_COOKIE,
   customViewId: process.env.ZOHO_CUSTOMVIEW_ID,
-  defaultProjectId: process.env.ZOHO_DEFAULt_PROJECT_ID,
+  defaultProjectId: process.env.ZOHO_DEFAULT_PROJECT_ID,
   portalId: process.env.ZOHO_PORTAL_ID,
   projects: process.env.ZOHO_PROJECTS,
   sessionId: process.env.ZOHO_SESSION_ID,