Merge pull request #16 from cap-js/simon/always-provide-queue

refactor and implment printToPrintService.js

Author: SirSimon04

jest.config.js

@@ -1,8 +1,8 @@
 const config = {
   verbose: true,
   testTimeout: 100000,
-  testMatch: ["**/test/lib/**/*.test.js"],
-  collectCoverageFrom: ["**/lib/**/*"],
+  testMatch: ["**/test/lib/**/*.test.js","**/test/srv/**/*.test.js"],
+  collectCoverageFrom: ["**/lib/**/*","srv/**/*"],
   coveragePathIgnorePatterns: ["node_modules", "<rootDir>/lib/persistence"],
   coverageReporters: ["lcov", "text", "text-summary"],
   coverageThreshold: {

lib/printUtil.js

@@ -1,16 +1,16 @@
 const { getJwt, readVcapServices } = require("./authUtil");
 const { getPrintConfigFromActionOrEntity } = require('./annotation-helper');
+const cds = require('@sap/cds');
 const axios = require('axios');
 const logger = cds.log("print");
-const CONSOLE_MODE = process.env.PRINT_CONSOLE_MODE === 'true';
 
 /**
  * Populates the queue value help with available printers.
  * @param {Object} _ - Unused parameter.
  * @param {Object} req - The request object.
  */
-const populateQueueValueHelp = async function (_, req) {
-    if (!CONSOLE_MODE) {
+const getQueues = async function (_, req) {
+
         const vcap = await readVcapServices();
         if (!vcap || vcap?.status === 500) {
             // For Production, return the error if print service is not found
@@ -31,28 +31,19 @@ const populateQueueValueHelp = async function (_, req) {
                 "Content-Type": "application/json"
             }
         });
-        const resp = await api.get(`/qm/api/v1/rest/queues`);
-
-        resp.data.forEach((item, index) => {
-            req.results[index] = { ID: item.qname };
-        });
-        req.results.$count = resp.data.length;
-    } else { // Offline / Console Mode - Mocked printer queues
-            const offlineQueues = [
-            { ID: 'DEFAULT_PRINTER' },
-            { ID: 'HP_LASERJET_PRO' },
-            { ID: 'CANON_IMAGECLASS' },
-            { ID: 'XEROX_WORKCENTRE' },
-            { ID: 'OFFICE_PRINTER_01' },
-            { ID: 'OFFICE_PRINTER_02' }
-        ];
+        let resp;
+        try {
+          resp = await api.get('/qm/api/v1/rest/queues');
+        } catch (e) {
+          logger.error('Failed to fetch queues', e.response?.data || e.message);
+          return req.error(500, 'Failed to fetch queues');
+        }
+    
+        const results = Array.isArray(resp.data)
+          ? resp.data.map(q => ({ ID: q.qname }))
+          : [{ ID: resp.data.qname }];
+        return results;
 
-       offlineQueues.forEach((item, index) => {
-           req.results[index] = { ID: item.ID };
-       });
-       req.results.$count = offlineQueues.length;
-       return;
-    }
 }
 
 /**
@@ -61,8 +52,21 @@ const populateQueueValueHelp = async function (_, req) {
  * @param {Object} req - The request object.
  */
 const print = async function (_, req) {
-    let { qname, numberOfCopies, docsToPrint } = await getPrintConfigFromActionOrEntity(req);
-    if (!CONSOLE_MODE) {
+
+    cds.log('=== REQUEST BASIC INFO ===');
+    cds.log('Event:', req.event);
+    cds.log('Target:', req.target?.name);
+    cds.log('User ID:', req.user?.id);
+    
+    let qname, numberOfCopies, docsToPrint;
+
+    if (req?.target?.name) {
+      const printConfig = await getPrintConfigFromActionOrEntity(req);
+      ({ qname, numberOfCopies, docsToPrint } = printConfig);
+    } else {
+        ({ qname, numberOfCopies, docsToPrint } = req);
+    }
+
         const vcap = await readVcapServices(req);
         if (!vcap || vcap?.status === 500) {
             // For Production, return the error if print service is not found
@@ -131,13 +135,14 @@ const print = async function (_, req) {
                 return req.error('Print task failed');
             }
             logger.info(`Document sent to print queue ${qname}`);
-            return req.info(200, `Document sent to print queue ${qname} \n 
-                    No. of copies requested: ${numberOfCopies}`);
-    } else { // Offline / Console Mode
-        docsToPrint.forEach((doc) => {
-            logger.info(`Document ${doc.fileName} with object key ${doc.objectKey} and content length ${doc.content.length} has been sent to print queue ${qname}`);
-        });
-    }
+
+            return {
+                status: 'SUCCESS',
+                queue: qname,
+                numberOfCopies,
+                taskId: itemId,
+                rawResponse: printTaskResp?.data
+            };
 }
 
-module.exports = { print, populateQueueValueHelp };
+module.exports = { print, getQueues };

package.json

@@ -47,6 +47,10 @@
           "destination": "SAP_Print_Service", 
           "kind": "print-to-service"
         },
+        "[hybrid]": {
+          "destination": "SAP_Print_Service", 
+          "kind": "print-to-service"
+        },
         "vcap": {
           "tag": "print"
         },

srv/printToConsole.js

@@ -48,18 +48,17 @@ module.exports = class PrintToConsole extends PrintService {
     if (docsToPrint && docsToPrint.length > 0) {
       docsToPrint.forEach((doc, index) => {
         LOG.info(`\nDocument ${index + 1}: ${doc.fileName}`);
-        LOG.info('-------------------------------');
-        
+        LOG.info('-------------------------------');        
         // Decode base64 content and display
-        const content = Buffer.from(doc.content, 'base64').toString('utf8');
-        console.log(content);
+        // const content = Buffer.from(doc.content, 'base64').toString('utf-8');
+        console.log(doc.content);
 
         LOG.info('-------------------------------\n');
       });
     }
 
     LOG.info(`Print job completed successfully!`);
-    LOG.info(`Sent to: ${selectedQueue.ID} (${selectedQueue.location})`);
+    LOG.info(`Sent to: ${selectedQueue}`);
 
     return {
       status: 'success',

srv/printToPrintService.js

@@ -1,5 +1,5 @@
 const PrintService = require('./service');
-const { print, populateQueueValueHelp } = require('../lib/printUtil');
+const { print, getQueues } = require('../lib/printUtil');
 const cds = require("@sap/cds");
 const LOG = cds.log('print');
 
@@ -16,9 +16,15 @@ module.exports = class PrintToPrintService extends PrintService {
   /**
    * Get available print queues (dummy data for console mode)
    */
-  async getQueues() {
-    // TODO: return the actual queues here as in printUtil.js
-    return [];
+  async getQueues(req) {
+    try{
+      const result = await getQueues(null, req)
+      return result;
+     }catch(err){
+       console.log(err, 'Feching queues failed')
+       return req.error(500, 'Failed to fetch queues');
+     }
+
   }
 
   /**
@@ -28,18 +34,27 @@ module.exports = class PrintToPrintService extends PrintService {
   async print(printRequest) {
     const { qname, numberOfCopies, docsToPrint } = printRequest;
 
-    LOG.info('===============================');
-    LOG.info(`Queue: ${qname || 'DEFAULT'}`);
-    LOG.info(`Copies: ${numberOfCopies || 1}`);
-    LOG.info(`Documents: ${docsToPrint?.length || 0}`);
-    LOG.info('===============================');
-    
-    // TODO: call actual print functions from printUtil.js
+    LOG.info(`Print request received for queue: ${qname}, copies: ${numberOfCopies}, documents: ${docsToPrint?.length || 0}`);   
+    try{
+      const result = await print(null, printRequest)
+      console.log(result);
+      
+      return {
+        status: 'success',
+        message: `Print job sent to ${qname} for ${numberOfCopies} copies`,
+        taskId: `console-task-${Date.now()}`,
+        details: result
+      };
+     }catch(err){
+      console.log(err, 'Failed to create print tasks');
+      
+      return {
+        status: 'error',
+        message: `Print job failed for queue ${qname}`,
+        error: err.message,
+        taskId: `failed-task-${Date.now()}`
+      };
+     }
 
-    return {
-      status: 'success',
-      message: `Print job sent to ${qname} for ${numberOfCopies} copies`,
-      taskId: `console-task-${Date.now()}`
-    };
   }
 }