Refactor migration and Drupal services for improved clarity and functionality

- Removed redundant audit log index calculations in migration.service.ts.
- Cleaned up import statements in entries.service.ts by removing unused constants.
- Enhanced uidCorrector function to support a default prefix for UID generation.
- Streamlined error handling and logging in various Drupal services for better maintainability.

Author: sauravraw

api/src/services/drupal/entries.service.ts

@@ -9,11 +9,7 @@ import {
   jsonToHtml,
   jsonToMarkdown,
 } from '@contentstack/json-rte-serializer';
-import {
-  CHUNK_SIZE,
-  LOCALE_MAPPER,
-  MIGRATION_DATA_CONFIG,
-} from '../../constants/index.js';
+import { CHUNK_SIZE, MIGRATION_DATA_CONFIG } from '../../constants/index.js';
 import { getLogMessage } from '../../utils/index.js';
 import customLogger from '../../utils/custom-logger.utils.js';
 import { getDbConnection } from '../../helper/index.js';
@@ -27,26 +23,33 @@ import {
   type AssetFieldMapping,
 } from './field-analysis.service.js';
 import FieldFetcherService from './field-fetcher.service.js';
-import {
-  entriesFieldCreator,
-  unflatten,
-} from '../../utils/entries-field-creator.utils.js';
 import { mapDrupalLocales } from './locales.service.js';
 // Dynamic import for phpUnserialize will be used in the function
 
 // Local utility functions (extracted from entries-field-creator.utils.ts patterns)
-const append = 'a';
+// Default prefix fallback if none provided
+const DEFAULT_PREFIX = 'cs';
 
 function startsWithNumber(str: string) {
   return /^\d/.test(str);
 }
 
-const uidCorrector = ({ uid, id }: any) => {
+const uidCorrector = ({
+  uid,
+  id,
+  prefix,
+}: {
+  uid?: string;
+  id?: string;
+  prefix?: string;
+}) => {
   const value = uid || id;
   if (!value) return '';
 
+  const effectivePrefix = prefix || DEFAULT_PREFIX;
+
   if (startsWithNumber(value)) {
-    return `${append}_${_.replace(
+    return `${effectivePrefix}_${_.replace(
       value,
       new RegExp('[ -]', 'g'),
       '_'
@@ -69,9 +72,7 @@ interface TaxonomyFieldOutput {
 const {
   DATA,
   ENTRIES_DIR_NAME,
-  ENTRIES_MASTER_FILE,
   ASSETS_DIR_NAME,
-  ASSETS_SCHEMA_FILE,
   REFERENCES_DIR_NAME,
   REFERENCES_FILE_NAME,
   TAXONOMIES_DIR_NAME,
@@ -190,34 +191,6 @@ async function readFile(filePath: string, fileName: string) {
   }
 }
 
-/**
- * Splits the given entry data into chunks that are under the specified size in bytes.
- */
-function makeChunks(entryData: any) {
-  let currentChunkSize = 0;
-  const chunkSize = CHUNK_SIZE; // 1 MB in bytes
-  let currentChunkId = uuidv4();
-  const chunks: { [key: string]: any } = {};
-
-  for (const [key, value] of Object.entries(entryData)) {
-    const tempObj = { [(value as { uid: string }).uid]: value };
-    chunks[currentChunkId] = { ...chunks[currentChunkId], ...tempObj };
-
-    currentChunkSize = Buffer.byteLength(
-      JSON.stringify(chunks[currentChunkId]),
-      'utf8'
-    );
-
-    if (currentChunkSize > chunkSize) {
-      currentChunkId = uuidv4();
-      currentChunkSize = 0;
-      chunks[currentChunkId] = {};
-    }
-  }
-
-  return chunks;
-}
-
 /**
  * Fetches field configurations from Drupal database
  */
@@ -663,7 +636,8 @@ const processFieldData = async (
   referenceFieldMapping: ReferenceFieldMapping,
   assetFieldMapping: any,
   taxonomyReferenceLookup: Record<number, TaxonomyFieldOutput>,
-  contentType: string
+  contentType: string,
+  prefix: string = DEFAULT_PREFIX
 ): Promise<any> => {
   const fieldNames = Object.keys(entryData);
   const isoDate = new Date();
@@ -872,7 +846,10 @@ const processFieldData = async (
     } else if (fieldName.endsWith('_tid')) {
       ctValue[fieldName] = [value];
     } else if (fieldName === 'nid') {
-      ctValue.uid = uidCorrector({ id: `content_type_entries_title_${value}` });
+      ctValue.uid = uidCorrector({
+        id: `content_type_entries_title_${value}`,
+        prefix,
+      });
     } else if (fieldName === 'langcode') {
       // Use the actual langcode from the entry for proper multilingual support
       ctValue.locale = value || 'en-us'; // fallback to en-us if langcode is empty
@@ -1149,7 +1126,6 @@ const processEntries = async (
     // This replaces the old hardcoded transformation rules with dynamic user mapping
     const transformedEntriesByLocale: { [locale: string]: any[] } = {};
     const allLocales = Object.keys(entriesByLocale);
-    const hasUnd = allLocales.includes('und');
     const hasEn = allLocales.includes('en');
     const hasEnUs = allLocales.includes('en-us');
 
@@ -1252,6 +1228,9 @@ const processEntries = async (
       const existingLocaleContent =
         (await readFile(localeFolderPath, localeFileName)) || {};
 
+      // Extract prefix from project for UID correction
+      const prefix = project?.legacy_cms?.affix || DEFAULT_PREFIX;
+
       // Process each entry in this locale
       for (const entry of localeEntries) {
         let processedEntry = await processFieldData(
@@ -1264,7 +1243,8 @@ const processEntries = async (
           referenceFieldMapping,
           assetFieldMapping,
           taxonomyReferenceLookup,
-          contentType
+          contentType,
+          prefix
         );
 
         // 🏷️ TAXONOMY CONSOLIDATION: Merge all taxonomy fields into single 'taxonomies' field
@@ -1412,6 +1392,7 @@ const processEntries = async (
         if (typeof entry.nid === 'number') {
           const entryUid = uidCorrector({
             id: `content_type_entries_title_${entry.nid}`,
+            prefix,
           });
           existingLocaleContent[entryUid] = processedEntry;
           allProcessedContent[entryUid] = processedEntry;
@@ -1525,7 +1506,6 @@ const processContentType = async (
 
     // 🧪 Process entries in batches (test migration: single entry, main migration: all entries)
     const effectiveLimit = isTest ? 1 : LIMIT;
-    const maxIterations = isTest ? 1 : Math.ceil(totalCount / LIMIT); // Test: single iteration, Main: full pagination
 
     for (
       let i = 0;
@@ -1624,11 +1604,6 @@ export const createEntry = async (
       destination_stack_id,
       REFERENCES_DIR_NAME
     );
-    const taxonomiesSave = path.join(
-      DATA,
-      destination_stack_id,
-      TAXONOMIES_DIR_NAME
-    );
 
     // Initialize directories
     await fs.promises.mkdir(entriesSave, { recursive: true });

api/src/services/drupal/locales.service.ts

@@ -29,16 +29,6 @@ async function writeFile(dirPath: string, filename: string, data: any) {
   }
 }
 
-/**
- * Helper function to get key by value from an object
- */
-function getKeyByValue(
-  obj: Record<string, string>,
-  targetValue: string
-): string | undefined {
-  return Object.entries(obj).find(([_, value]) => value === targetValue)?.[0];
-}
-
 /**
  * Maps source locale to destination locale based on user-selected mapping from UI.
  * Similar to WordPress/Contentful/Sitecore mapLocales function.
@@ -115,21 +105,6 @@ export function mapDrupalLocales({
   return locale?.toLowerCase?.() || locale;
 }
 
-/**
- * Fetches locale names from Contentstack API
- */
-async function fetchContentstackLocales(): Promise<Record<string, string>> {
-  try {
-    const response = await axios.get(
-      'https://app.contentstack.com/api/v3/locales?include_all=true'
-    );
-    return response.data?.locales || {};
-  } catch (error) {
-    console.error('Error fetching Contentstack locales:', error);
-    return {};
-  }
-}
-
 /**
  * Applies special locale code transformations based on business rules
  * - "und" alone → "en-us"
@@ -299,7 +274,7 @@ export const createLocale = async (
     const localesFromProject = project?.locales || {};
 
     // 4. Fetch locale names from Contentstack API
-    const [err, localesApiResponse] = await getAllLocales();
+    const [localesApiResponse] = await getAllLocales();
     const contentstackLocales = localesApiResponse || {}; // ✅ FIX: getAllLocales already returns the locales object
 
     // 5. Map source locales to destination locales using user selection

api/src/services/drupal/query.service.ts

@@ -3,9 +3,7 @@ import path from 'path';
 import mysql from 'mysql2';
 import { getDbConnection } from '../../helper/index.js';
 import customLogger from '../../utils/custom-logger.utils.js';
-import { getLogMessage } from '../../utils/index.js';
 import { MIGRATION_DATA_CONFIG } from '../../constants/index.js';
-import OptimizedQueryBuilder from '../../utils/optimized-query-builder.utils.js';
 
 const { DATA } = MIGRATION_DATA_CONFIG;
 
@@ -132,8 +130,6 @@ const generateQueriesForFields = async (
   projectId: string,
   destination_stack_id: string
 ): Promise<QueryConfig> => {
-  const srcFunc = 'generateQueriesForFields';
-
   try {
     const select: { [contentType: string]: string } = {};
     const countQuery: { [contentType: string]: string } = {};
@@ -330,7 +326,6 @@ export const createQuery = async (
   destination_stack_id: string,
   projectId: string
 ): Promise<void> => {
-  const srcFunc = 'createQuery';
   let connection: mysql.Connection | null = null;
 
   try {
@@ -346,26 +341,31 @@ export const createQuery = async (
       user: dbConfig?.user,
       database: dbConfig?.database,
       port: dbConfig?.port,
-      hasPassword: !!dbConfig?.password
+      hasPassword: !!dbConfig?.password,
     });
 
     const message = `Generating dynamic queries from Drupal database...`;
     await customLogger(projectId, destination_stack_id, 'info', message);
 
     // Create database connection
-    console.info(`🔍 query.service.ts - About to call getDbConnection with config:`, {
-      host: dbConfig?.host,
-      user: dbConfig?.user,
-      database: dbConfig?.database
-    });
-    
+    console.info(
+      `🔍 query.service.ts - About to call getDbConnection with config:`,
+      {
+        host: dbConfig?.host,
+        user: dbConfig?.user,
+        database: dbConfig?.database,
+      }
+    );
+
     connection = await getDbConnection(
       dbConfig,
       projectId,
       destination_stack_id
     );
-    
-    console.info(`🔍 query.service.ts - Database connection established successfully`);
+
+    console.info(
+      `🔍 query.service.ts - Database connection established successfully`
+    );
 
     // SQL query to extract field configuration from Drupal
     const configQuery =