@tolinax/ayoune-cli 2024.2.18 → 2024.3.0

package/lib/commands/createStreamCommand.js

@@ -1,45 +0,0 @@
-import { Option } from "commander";
-import { localStorage } from "../helpers/localStorage.js";
-import { decodeToken } from "../api/decodeToken.js";
-import { customerSocket } from "../socket/customerSocketClient.js";
-import { spinner } from "../../index.js";
-import yaml from "js-yaml";
-export function createStreamCommand(program) {
-    program
-        .command("stream")
-        .alias("listen")
-        .description("Attach to the live data stream")
-        .addOption(new Option("-f, --format <format>", "Set the output format")
-        .choices(["json", "yaml", "table"])
-        .default("json"))
-        .addOption(new Option("-l, --level <level>", "Set the detail level")
-        .choices(["default", "minimal", "extended"])
-        .default("default"))
-        .action(async (options) => {
-        try {
-            const tokenPayload = decodeToken(localStorage.getItem("token"));
-            const user = tokenPayload.payload;
-            console.log(user);
-            console.log(`Starting stream with [${user._customerID}]`);
-            spinner.start({ text: `Starting stream with [${user._customerID}]` });
-            const socket = customerSocket(user);
-            spinner.update({ text: "Stream active" });
-            socket.onAny((channel, data) => {
-                spinner.update({ text: `Received [${channel}]` });
-                if (options.format === "table") {
-                    console.table(data);
-                }
-                if (options.format === "yaml") {
-                    console.log(yaml.dump(data));
-                }
-                if (options.format === "json") {
-                    console.log(JSON.stringify(data, null, 2));
-                }
-            });
-        }
-        catch (e) {
-            spinner.error({ text: e.message });
-            console.error(e);
-        }
-    });
-}

package/lib/commands/createWhoAmICommand.js

@@ -1,26 +0,0 @@
-import { localStorage } from "../helpers/localStorage.js";
-import { decodeToken } from "../api/decodeToken.js";
-import { spinner } from "../../index.js";
-import { login } from "../api/login.js";
-export function createWhoAmICommand(program) {
-    program
-        .command("whoami")
-        .alias("who")
-        .description("Shows your user information")
-        .action(async (options) => {
-        try {
-            const tokenPayload = decodeToken(localStorage.getItem("token"));
-            if (tokenPayload) {
-                const user = tokenPayload.payload;
-                console.log(user);
-            }
-            else {
-                await login();
-            }
-        }
-        catch (e) {
-            spinner.error({ text: e.message });
-            console.error(e);
-        }
-    });
-}

package/lib/helpers/addSpacesToCamelCase.js

@@ -1,5 +0,0 @@
-export const addSpacesToCamelCase = (str) => {
-    return str
-        .replace(/([a-z])([A-Z])/g, "$1 $2") // add space between lower & upper case letters
-        .replace(/^./, (str) => str.toUpperCase()); // capitalize the first letter
-};

package/lib/helpers/handleResponseFormatOptions.js

@@ -1,43 +0,0 @@
-import yaml from "js-yaml";
-export function handleResponseFormatOptions(opts, res) {
-    let plainResult;
-    let result;
-    let meta = {};
-    let content;
-    if (opts.responseFormat && opts.responseFormat === "yaml") {
-        plainResult = yaml.load(res);
-        result = plainResult.payload;
-        meta = plainResult.meta;
-        content = yaml.dump(result);
-        console.log("\n");
-        console.log(content);
-        console.log("\n");
-    }
-    if (opts.responseFormat && opts.responseFormat === "csv") {
-        plainResult = res;
-        result = res.payload;
-        meta = res.meta;
-        content = result;
-        console.log("\n");
-        console.log(content);
-        console.log("\n");
-    }
-    if (opts.responseFormat && opts.responseFormat === "table") {
-        plainResult = res;
-        result = res.payload;
-        meta = res.meta;
-        content = result;
-        console.log("\n");
-        console.log(res);
-        console.log("\n");
-    }
-    if (opts.responseFormat && opts.responseFormat === "json") {
-        result = res.payload;
-        meta = res.meta;
-        content = JSON.stringify(result, null, 4);
-        console.log("\n");
-        console.table(result);
-        console.log("\n");
-    }
-    return { plainResult, result, meta, content };
-}

package/lib/helpers/initializeSettings.js

@@ -1,14 +0,0 @@
-//Initializes settings for system environment and inquirer
-import inquirer from "inquirer";
-import inquirerFuzzyPath from "inquirer-fuzzy-path";
-import inquirerSearchList from "inquirer-search-list";
-import inquirerFileTreeSelection from "inquirer-file-tree-selection-prompt";
-import inquirerTableInput from "inquirer-table-input";
-import InterruptedPrompt from "inquirer-interrupted-prompt";
-export function initializeSettings() {
-    inquirer.registerPrompt("fuzzypath", inquirerFuzzyPath);
-    inquirer.registerPrompt("search-list", inquirerSearchList);
-    inquirer.registerPrompt("file-tree-selection", inquirerFileTreeSelection);
-    inquirer.registerPrompt("table-input", inquirerTableInput);
-    InterruptedPrompt.fromAll(inquirer);
-}

package/lib/helpers/localStorage.js

@@ -1,4 +0,0 @@
-import { LocalStorage } from "node-localstorage";
-import path from "path";
-import os from "os";
-export const localStorage = new LocalStorage(path.join(os.homedir(), "aYOUne", "storage"));

package/lib/helpers/makeRandomToken.js

@@ -1,27 +0,0 @@
-import { randomBytes } from "crypto";
-/** Sync */
-const randomString = (length, chars) => {
-    if (!chars) {
-        throw new Error("Argument 'chars' is undefined");
-    }
-    const charsLength = chars.length;
-    if (charsLength > 256) {
-        throw new Error("Argument 'chars' should not have more than 256 characters" +
-            ", otherwise unpredictability will be broken");
-    }
-    const _randomBytes = randomBytes(length);
-    let result = new Array(length);
-    let cursor = 0;
-    for (let i = 0; i < length; i++) {
-        cursor += _randomBytes[i];
-        result[i] = chars[cursor % charsLength];
-    }
-    return result.join("");
-};
-/** Sync */
-export const randomAsciiString = (length = 32, alphabet = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789") => {
-    if (typeof length === "undefined") {
-        length = 32;
-    }
-    return randomString(length, alphabet);
-};

package/lib/helpers/parseInt.js

@@ -1,9 +0,0 @@
-export function parseInteger(value, dummyPrevious) {
-    // parseInt takes a string and a radix
-    console.log(value);
-    const parsedValue = parseInt(value, 10);
-    if (isNaN(parsedValue)) {
-        throw new Error("Not a number.");
-    }
-    return parsedValue;
-}

package/lib/helpers/saveFile.js

@@ -1,39 +0,0 @@
-import { mkdirp } from "mkdirp";
-import moment from "moment";
-import path from "path";
-import { writeFile } from "fs/promises";
-import { spinner } from "../../index.js";
-export async function saveFile(type, opts, result) {
-    if (opts.save) {
-        await mkdirp(opts.outPath);
-        const fileName = opts.name
-            ? opts.name
-            : type +
-                "_page_" +
-                result.meta.pageInfo.page +
-                "_" +
-                moment().format("YYYY_DD_MM_HH_mm_ss");
-        const pathToWrite = path.join(opts.outPath, `${fileName}`).toString();
-        console.log(pathToWrite);
-        spinner.start({
-            text: `Saving operation as ${pathToWrite}.${opts.responseFormat}`,
-            color: "yellow",
-        });
-        await writeFile(`${pathToWrite}.${opts.responseFormat}`, result.content, {
-            encoding: "utf8",
-        });
-        spinner.success({
-            text: `File written: ${pathToWrite}.${opts.responseFormat}`,
-        });
-        if (opts.debug) {
-            spinner.start({
-                text: `Saving operation as ${pathToWrite}.meta.json`,
-                color: "yellow",
-            });
-            await writeFile(`${pathToWrite}.meta.json`, JSON.stringify(result.meta, null, 4), {
-                encoding: "utf8",
-            });
-            spinner.success({ text: `File written: ${pathToWrite}.meta.json` });
-        }
-    }
-}

package/lib/models/getCollections.js

@@ -1,15 +0,0 @@
-import { modelsAndRights } from "../../data/modelsAndRights.js";
-import { addSpacesToCamelCase } from "../helpers/addSpacesToCamelCase.js";
-const getCollections = () => {
-    return modelsAndRights
-        .filter((el) => {
-        return el.module !== "su";
-    })
-        .map((el) => {
-        return {
-            name: addSpacesToCamelCase(el.plural),
-            value: el.plural.toLowerCase(),
-        };
-    });
-};
-export { getCollections };

package/lib/models/getModelsInModules.js

@@ -1,13 +0,0 @@
-import _ from "lodash";
-import { addSpacesToCamelCase } from "../helpers/addSpacesToCamelCase.js";
-import { modelsAndRights } from "../../data/modelsAndRights.js";
-const getModelsInModules = (module) => {
-    const m = _.filter(modelsAndRights, { module });
-    return m.map((el) => {
-        return {
-            name: addSpacesToCamelCase(el.plural),
-            value: el.plural.toLowerCase(),
-        };
-    });
-};
-export { getModelsInModules };

package/lib/models/getModuleFromCollection.js

@@ -1,7 +0,0 @@
-import _ from "lodash";
-import { modelsAndRights } from "../../data/modelsAndRights.js";
-const getModuleFromCollection = (collection) => {
-    const m = _.find(modelsAndRights, (el) => el.plural.toLowerCase() === collection);
-    return m;
-};
-export { getModuleFromCollection };

package/lib/operations/handleAuditOperation.js

@@ -1,22 +0,0 @@
-// Operation handling functions
-import { spinner } from "../../index.js";
-import { handleResponseFormatOptions } from "../helpers/handleResponseFormatOptions.js";
-import { localStorage } from "../helpers/localStorage.js";
-import { auditCallHandler } from "../api/auditCallHandler.js";
-export async function handleAuditOperation(collection, id, opts) {
-    spinner.start({
-        text: `Getting audit for ${id} in [${collection}]`,
-        color: "magenta",
-    });
-    let res = await auditCallHandler(`${collection.toLowerCase()}/${id}`, "get", null, {
-        responseFormat: opts.responseFormat,
-        verbosity: opts.verbosity,
-    });
-    let { plainResult, result, meta, content } = handleResponseFormatOptions({ ...opts }, res);
-    spinner.success({
-        text: `Got Audit ${id} in ${collection}`,
-    });
-    spinner.stop();
-    localStorage.setItem("lastId", result._id);
-    return { data: plainResult, content, result, meta };
-}

package/lib/operations/handleCollectionOperation.js

@@ -1,68 +0,0 @@
-// All the remaining operations are classified here
-import { apiCallHandler } from "../api/apiCallHandler.js";
-import { handleEditOperation } from "./handleEditOperation.js";
-import { handleEditRawOperation } from "./handleEditRawOperation.js";
-import { spinner } from "../../index.js";
-import { promptDefaultAction } from "../prompts/promptDefaultAction.js";
-import yaml from "js-yaml";
-import { promptFilePath } from "../prompts/promptFilePath.js";
-import { promptFileName } from "../prompts/promptFileName.js";
-import path from "path";
-import { writeFile } from "fs/promises";
-import { mkdirp } from "mkdirp";
-export async function handleCollectionOperation(module, collection, entry, opts) {
-    spinner.start({ text: "", color: "magenta" });
-    let res;
-    let editContent;
-    const action = await promptDefaultAction();
-    switch (action) {
-        case "edit":
-            res = await apiCallHandler(`${module}/${collection.toLowerCase()}/${entry}?responseFormat=table`);
-            spinner.success({
-                text: `Got entry ${res.payload.name} - Took ${res.meta.responseTime} ms`,
-            });
-            spinner.stop();
-            editContent = res.payload;
-            await handleEditOperation(module, collection, editContent);
-            break;
-        case "edit raw":
-            res = await apiCallHandler(`${module}/${collection.toLowerCase()}/${entry}?responseFormat=${opts.responseFormat}`);
-            spinner.success({
-                text: `Got entry ${res.payload.name} - Took ${res.meta.responseTime} ms`,
-            });
-            spinner.stop();
-            editContent = res.payload;
-            await handleEditRawOperation(module, collection, editContent);
-            break;
-        case "describe":
-            res = await apiCallHandler(`${module}/${collection.toLowerCase()}/${entry}?responseFormat=yaml}`);
-            spinner.success({
-                text: `Got entry ${res.payload.name} - Took ${res.meta.responseTime} ms`,
-            });
-            spinner.stop();
-            editContent = res.payload;
-            console.log(yaml.dump(editContent));
-            break;
-        case "download":
-            res = await apiCallHandler(`${module}/${collection.toLowerCase()}/${entry}?responseFormat=${opts.responseFormat}}`);
-            spinner.success({
-                text: `Got entry ${res.payload.name} - Took ${res.meta.responseTime} ms`,
-            });
-            spinner.stop();
-            editContent = res.payload;
-            const folder = await promptFilePath(collection);
-            await mkdirp(folder);
-            const fileName = await promptFileName(`${collection}_${editContent._id}.${opts.responseFormat}`);
-            const contentToWrite = opts.responseFormat === "yaml"
-                ? yaml.dump(editContent)
-                : opts.responseFormat === "csv"
-                    ? editContent
-                    : JSON.stringify(editContent, null, 4);
-            await writeFile(path.join(folder, fileName), contentToWrite, {
-                encoding: "utf8",
-            });
-            break;
-        default:
-            break;
-    }
-}

package/lib/operations/handleCopySingleOperation.js

@@ -1,22 +0,0 @@
-// Operation handling functions
-import { apiCallHandler } from "../api/apiCallHandler.js";
-import { spinner } from "../../index.js";
-import { handleResponseFormatOptions } from "../helpers/handleResponseFormatOptions.js";
-import { localStorage } from "../helpers/localStorage.js";
-export async function handleCopySingleOperation(module, collection, id, opts) {
-    spinner.start({
-        text: `Copying entry ${id} in [${collection}]`,
-        color: "magenta",
-    });
-    let res = await apiCallHandler(`${module}/${collection.toLowerCase()}/${id}/copy`, "post", null, {
-        responseFormat: opts.responseFormat,
-        verbosity: opts.verbosity,
-    });
-    let { plainResult, result, meta, content } = handleResponseFormatOptions({ ...opts }, res);
-    spinner.success({
-        text: `Copied entry ${id} in ${collection}: New ID [${result._id}]`,
-    });
-    spinner.stop();
-    localStorage.setItem("lastId", result._id);
-    return { data: plainResult, content, result, meta };
-}

package/lib/operations/handleCreateSingleOperation.js

@@ -1,27 +0,0 @@
-// Operation handling functions
-import { apiCallHandler } from "../api/apiCallHandler.js";
-import { spinner } from "../../index.js";
-import { handleResponseFormatOptions } from "../helpers/handleResponseFormatOptions.js";
-import { localStorage } from "../helpers/localStorage.js";
-export async function handleCreateSingleOperation(module, collection, name, opts) {
-    spinner.start({
-        text: `Creating entry in [${collection}]`,
-        color: "magenta",
-    });
-    let res = await apiCallHandler(`${module}/${collection.toLowerCase()}`, "post", {
-        name,
-        title: name,
-        subject: name,
-        summary: name,
-    }, {
-        responseFormat: opts.responseFormat,
-        verbosity: opts.verbosity,
-    });
-    let { plainResult, result, meta, content } = handleResponseFormatOptions({ ...opts }, res);
-    spinner.success({
-        text: `Created entry [${result._id}] in ${collection}`,
-    });
-    spinner.stop();
-    localStorage.setItem("lastId", result._id);
-    return { data: plainResult, content, result, meta };
-}

package/lib/operations/handleDescribeSingleOperation.js

@@ -1,20 +0,0 @@
-// Operation handling functions
-import { apiCallHandler } from "../api/apiCallHandler.js";
-import { spinner } from "../../index.js";
-import { handleResponseFormatOptions } from "../helpers/handleResponseFormatOptions.js";
-export async function handleDescribeSingleOperation(module, collection, id, opts) {
-    spinner.start({
-        text: `Getting entry in [${collection}]`,
-        color: "magenta",
-    });
-    let res = await apiCallHandler(`${module}/${collection.toLowerCase()}/${id}`, "get", null, {
-        responseFormat: "yaml",
-        verbosity: opts.verbosity,
-    });
-    let { plainResult, result, meta, content } = handleResponseFormatOptions({ ...opts, responseFormat: "yaml" }, res);
-    spinner.success({
-        text: `Got entry in ${collection}`,
-    });
-    spinner.stop();
-    return { data: plainResult, content, result, meta };
-}

package/lib/operations/handleEditOperation.js

@@ -1,51 +0,0 @@
-import inquirer from "inquirer";
-import chalk from "chalk";
-import { apiCallHandler } from "../api/apiCallHandler.js";
-import { spinner } from "../../index.js";
-export async function handleEditOperation(module, collection, editContent) {
-    console.log(editContent);
-    const { edits } = await inquirer.prompt([
-        {
-            type: "table-input",
-            name: "edits",
-            message: "EDIT MODE",
-            infoMessage: `Navigate and Edit`,
-            hideInfoWhenKeyPressed: true,
-            freezeColumns: 1,
-            decimalPoint: ".",
-            decimalPlaces: 2,
-            selectedColor: chalk.yellow,
-            editableColor: chalk.bgYellow.bold,
-            editingColor: chalk.bgGreen.bold,
-            columns: editContent.columns.map((column) => ({
-                ...column,
-                name: column.editable
-                    ? chalk.cyan.bold(column.name)
-                    : chalk.red.bold(column.name),
-            })),
-            rows: editContent.rows,
-            validate: () => false,
-        },
-    ]);
-    console.log(edits);
-    const { save } = await inquirer.prompt([
-        {
-            type: "confirm",
-            name: "save",
-            message: "Save changes",
-        },
-    ]);
-    if (save) {
-        spinner.start({
-            text: `Attempting to save`,
-            color: "magenta",
-        });
-        const res = await apiCallHandler(`${module}/${collection.toLowerCase()}`, "put", edits.result);
-        const result = res.payload;
-        console.log(result);
-        spinner.success({
-            text: `Saved - Took ${res.meta.responseTime} ms`,
-        });
-        spinner.stop();
-    }
-}

package/lib/operations/handleEditRawOperation.js

@@ -1,35 +0,0 @@
-import inquirer from "inquirer";
-import { apiCallHandler } from "../api/apiCallHandler.js";
-import { spinner } from "../../index.js";
-export async function handleEditRawOperation(module, collection, result) {
-    const { content } = await inquirer.prompt([
-        {
-            type: "editor",
-            name: "content",
-            postfix: ".json",
-            message: "Edit",
-            default: JSON.stringify(result, null, 4),
-        },
-    ]);
-    const contentToSave = JSON.parse(content);
-    const { save } = await inquirer.prompt([
-        {
-            type: "confirm",
-            name: "save",
-            message: "Save changes",
-        },
-    ]);
-    if (save) {
-        spinner.start({
-            text: `Attempting to save [${contentToSave.name}]`,
-            color: "magenta",
-        });
-        const res = await apiCallHandler(`${module}/${collection.toLowerCase()}`, "put", JSON.parse(content));
-        result = res.payload;
-        console.log(result);
-        spinner.success({
-            text: `Saved [${contentToSave.name}] - Took ${res.meta.responseTime} ms`,
-        });
-        spinner.stop();
-    }
-}

package/lib/operations/handleGetOperation.js

@@ -1,25 +0,0 @@
-// Operation handling functions
-import { apiCallHandler } from "../api/apiCallHandler.js";
-import { spinner } from "../../index.js";
-import { handleResponseFormatOptions } from "../helpers/handleResponseFormatOptions.js";
-export async function handleGetOperation(module, collection, opts) {
-    spinner.start({
-        text: `Getting entries in [${collection}]`,
-        color: "magenta",
-    });
-    let res = await apiCallHandler(`${module}/${collection.toLowerCase()}`, "get", null, {
-        page: opts.page,
-        responseFormat: opts.responseFormat,
-        limit: opts.limit,
-        from: opts.from,
-        fields: opts.fields,
-        hideMeta: opts.hideMeta,
-        verbosity: opts.verbosity,
-    });
-    let { plainResult, result, meta, content } = handleResponseFormatOptions(opts, res);
-    spinner.success({
-        text: `Got ${opts.limit} entries of ${meta.pageInfo.totalEntries} : Page ${meta.pageInfo.page} of ${meta.pageInfo.totalPages}`,
-    });
-    spinner.stop();
-    return { data: plainResult, content, result, meta };
-}

package/lib/operations/handleGetSingleOperation.js

@@ -1,20 +0,0 @@
-// Operation handling functions
-import { apiCallHandler } from "../api/apiCallHandler.js";
-import { spinner } from "../../index.js";
-import { handleResponseFormatOptions } from "../helpers/handleResponseFormatOptions.js";
-export async function handleGetSingleOperation(module, collection, id, opts) {
-    spinner.start({
-        text: `Getting entry in [${collection}]`,
-        color: "magenta",
-    });
-    let res = await apiCallHandler(`${module}/${collection.toLowerCase()}/${id}`, "get", null, {
-        responseFormat: "table",
-        verbosity: opts.verbosity,
-    });
-    let { plainResult, result, meta, content } = handleResponseFormatOptions({ ...opts, responseFormat: "table" }, res);
-    spinner.success({
-        text: `Got entry in ${collection}`,
-    });
-    spinner.stop();
-    return { data: plainResult, content, result, meta };
-}

package/lib/operations/handleListOperation.js

@@ -1,24 +0,0 @@
-// Operation handling functions
-import { apiCallHandler } from "../api/apiCallHandler.js";
-import { spinner } from "../../index.js";
-import { handleResponseFormatOptions } from "../helpers/handleResponseFormatOptions.js";
-export async function handleListOperation(module, collection, opts) {
-    spinner.start({
-        text: `Listing entries in [${collection}]`,
-        color: "magenta",
-    });
-    let res = await apiCallHandler(`${module}/${collection.toLowerCase()}/list`, "get", null, {
-        page: opts.page,
-        responseFormat: opts.responseFormat,
-        limit: opts.limit,
-        from: opts.from,
-        hideMeta: opts.hideMeta,
-        verbosity: opts.verbosity,
-    });
-    let { plainResult, result, meta, content } = handleResponseFormatOptions(opts, res);
-    spinner.success({
-        text: `Got ${opts.limit} entries of ${meta.pageInfo.totalEntries} : Page ${meta.pageInfo.page} of ${meta.pageInfo.totalPages}`,
-    });
-    spinner.stop();
-    return { data: plainResult, content, result, meta };
-}

package/lib/operations/handleSingleAuditOperation.js

@@ -1,27 +0,0 @@
-// Operation handling functions
-import { spinner } from "../../index.js";
-import { handleResponseFormatOptions } from "../helpers/handleResponseFormatOptions.js";
-import { localStorage } from "../helpers/localStorage.js";
-import { auditCallHandler } from "../api/auditCallHandler.js";
-export async function handleSingleAuditOperation(collection, id, auditId, opts) {
-    spinner.start({
-        text: `Getting audit [${auditId}] for [${id}] in [${collection}]`,
-        color: "magenta",
-    });
-    let res = await auditCallHandler(`${collection.toLowerCase()}/${id}/${auditId}`, "get", null, {
-        responseFormat: opts.responseFormat,
-        verbosity: opts.verbosity,
-    });
-    let { plainResult, result, meta, content } = handleResponseFormatOptions({ ...opts }, res);
-    spinner.success({
-        text: `Got audit [${auditId}] for [${id}] in [${collection}]`,
-    });
-    spinner.stop();
-    localStorage.setItem("lastId", result._id);
-    return {
-        singleData: plainResult,
-        singleContent: content,
-        singleResult: result,
-        singleMeta: meta,
-    };
-}

package/lib/prompts/promptAudits.js

@@ -1,15 +0,0 @@
-import inquirer from "inquirer";
-export async function promptAudits(result) {
-    const { audit } = await inquirer.prompt([
-        {
-            type: "list",
-            name: "audit",
-            message: "Choose a audit:",
-            choices: result.map((el) => ({
-                name: `${el.action} at ${el.ts} by ${el._userID.first_name} ${el._userID.last_name}`,
-                value: el._id,
-            })),
-        },
-    ]);
-    return audit;
-}

package/lib/prompts/promptCollection.js

@@ -1,13 +0,0 @@
-import inquirer from "inquirer";
-import { getCollections } from "../models/getCollections.js";
-async function promptCollection() {
-    const { collection } = await inquirer.prompt([
-        {
-            type: "list",
-            name: "collection",
-            message: "Choose a collection:",
-            choices: getCollections(),
-        },
-    ]);
-    return collection;
-}