@gnar-engine/cli 1.0.5 → 1.0.7

package/bootstrap/services/notification/src/policies/notification.policy.js

@@ -0,0 +1,49 @@
+import { config } from '../config.js';
+
+export const authorise = {
+
+    /**
+     * Authorise get single notification
+     */
+    getSingle: async (request, reply) => {
+        if (!request.user || request.user.role !== 'service_admin') {
+            reply.code(403).send({error: 'not authorised'});
+        }
+    },
+
+    /**
+     * Authorise get many notifications
+     */
+    getMany: async (request, reply) => {
+        if (!request.user || request.user.role !== 'service_admin') {
+            reply.code(403).send({error: 'not authorised'});
+        }
+    },
+
+    /**
+     * Authorise create notifications
+     */
+    create: async (request, reply) => {
+        if (!request.user || request.user.role !== 'service_admin') {
+            reply.code(403).send({error: 'not authorised'});
+        }
+    },
+
+    /**
+     * Authorise update notification
+     */
+    update: async (request, reply) => {
+        if (!request.user || request.user.role !== 'service_admin') {
+            reply.code(403).send({error: 'not authorised'});
+        }
+    },
+
+    /**
+     * Authorise delete notification
+     */
+    delete: async (request, reply) => {
+        if (!request.user || request.user.role !== 'service_admin') {
+            reply.code(403).send({error: 'not authorised'});
+        }
+    }
+}

package/bootstrap/services/notification/src/schema/notification.schema.js

@@ -0,0 +1,17 @@
+import { schema } from '@gnar-engine/core';
+import { config } from '../config.js';
+
+export const notificationSchema = {
+    schemaName: 'notificationService.notificationSchema',
+    schema: {
+        type: 'object',
+        properties: {
+            // Add your properties here
+            
+        },
+        required: [],
+        additionalProperties: false
+    }
+};
+
+export const validateNotification = schema.compile(notificationSchema);

package/bootstrap/services/notification/src/services/notification.service.js

@@ -0,0 +1,32 @@
+import { db } from '@gnar-engine/core';
+
+export const notification = {
+    async getById({ id }) {
+        const [result] = await db.query('SELECT * FROM notifications WHERE id = ?', [id]);
+        return result || null;
+    },
+
+    async getByEmail({ email }) {
+        // Placeholder: implement if your service uses email
+        return null;
+    },
+
+    async getAll() {
+        return await db.query('SELECT * FROM notifications');
+    },
+
+    async create(data) {
+        const { insertId } = await db.query('INSERT INTO notifications (created_at, updated_at) VALUES (CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)');
+        return await this.getById({ id: insertId });
+    },
+
+    async update({ id, ...data }) {
+        await db.query('UPDATE notifications SET updated_at = CURRENT_TIMESTAMP WHERE id = ?', [id]);
+        return await this.getById({ id });
+    },
+
+    async delete({ id }) {
+        await db.query('DELETE FROM notifications WHERE id = ?', [id]);
+        return true;
+    },
+};

package/bootstrap/services/portal/src/services/client.js

@@ -20,6 +20,9 @@ client.interceptors.request.use(
             config.headers['Authorization'] = `Bearer ${authToken}`;
         }
 
+        // add content-type application/json to config.headers
+        config.headers['Content-Type'] = 'application/json';
+
         return config;
     },
     (error) => {

package/bootstrap/services/user/src/commands/user.handler.js

@@ -121,31 +121,48 @@ commands.register('userService.getManyUsers', async ({}) => {
  * Creat users with random password
  * 
  * @param {Object} params
- * @param {Object} params.user - New user data
+ * @param {Array} params.users - New user data
  */
-commands.register('userService.createUserWithRandomPassword', async ({user}) => {
+commands.register('userService.createUserWithRandomPassword', async ({users}) => {
 
-    // create random password
-    const password = Math.random().toString(36);
-    const userData = {
-        ...user,
-        password: password
-    };
+    const validationErrors = [];
+    let createdNewUsers = [];
 
-    logger.info('creating new user : ' + JSON.stringify(userData));
+    // validate user data
+    for (const newUserData of users) {
 
-    // create user
-    try {
-        const newUsers = await createUsers({users: [userData]})
+        // create random password
+        const password = Math.random().toString(36);
+        newUserData.password = password;
 
-        if (!newUsers || newUsers.length === 0) {
-            throw new error.badRequest('User creation failed');
+        const { errors } = validateUser(newUserData);
+
+        if (errors?.length) {
+            validationErrors.push(errors);
+            continue;
+        }
+
+        if (!newUserData.role || newUserData.role !== 'service_admin') {
+            // ensure emails are unique
+            const existingUser = await user.getByEmail({email: newUserData.email});
+
+            if (existingUser) {
+                validationErrors.push(`User with email ${newUserData.email} already exists`);
+            }
         }
-    
-        return newUsers[0];
-    } catch (error) {
-        throw new error.badRequest('User creation failed: ' + error);
     }
+
+    if (validationErrors.length) {
+        throw new error.badRequest(`Invalid user data: ${validationErrors}`);
+    }
+
+    // add users
+    for (const newUserData of users) {
+        const newUser = await user.create(newUserData);
+        createdNewUsers.push(newUser);
+    }
+
+    return createdNewUsers;
 });
 
 /**

package/bootstrap/services/user/src/tests/commands/user.test.js

@@ -8,15 +8,24 @@ test.prep(async () => {
 })
 
 // Test create user command
-test.run('Create User Command', async () => {
-    const users = await commands.execute('createUsers', [
+test.run('Create user command', async () => {
+    const users = await commands.execute('createUsers', { users: [
         {
-            email: 'test@gnar.co.uk'
+            email: 'test@gnar.co.uk',
+            password: 'p4ssw0rd987'
         }
-    ]);
-
+    ]});
     test.assert(users.length === 1, 'User was not created successfully');
     test.assert(users[0].email === 'test@gnar.co.uk', 'User email does not match');
 });
 
-
+// Test create user with random password command
+test.run('Create user with random password command', async () => {
+    const users = await commands.execute('createUserWithRandomPassword', { users: [
+        {
+            email: 'test2@gnar.co.uk'
+        }
+    ]});
+    test.assert(users.length === 1, 'User was not created successfully');
+    test.assert(users[0].email === 'test3@gnar.co.uk', 'User email does not match');
+});

package/install-from-clone.sh

@@ -13,7 +13,7 @@ cd "$CLI_DIR"
 npm install
 
 # Link CLI to custom global folder
-npm link --prefix "$TARGET_DIR"
+npm link
 
 # Bin path for npm link
 BIN_PATH="$TARGET_DIR/bin"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gnar-engine/cli",
-    "version": "1.0.5",
+    "version": "1.0.7",
     "description": "Gnar Engine Development Framework CLI: Project bootstrap, scaffolder & control plane.",
     "type": "module",
     "bin": {

package/src/cli.js

@@ -30,9 +30,3 @@ G n a r  E n g i n e -  A powerful, AI ready microservice framework for modern a
 // Parse CLI input
 program.parse(process.argv);
 
-// Consts
-export const directories = {
-    scaffolderTemplates: path.join(import.meta.dirname, '../templates/service'),
-    bootstrap: path.join(import.meta.dirname, '../bootstrap'),
-    provisioner: path.join(import.meta.dirname, './provisioner')
-}

package/src/config.js

@@ -1,9 +1,21 @@
+import path from 'path';
+import { fileURLToPath } from 'url';
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 export const gnarEngineCliConfig = {
 
     /**
      * The path the Gnar Engine service core should be found in the service containers
      */
-    corePath: '/usr/gnar_engine/app/node_modules/@gnar-engine/core'
+    corePath: '/usr/gnar_engine/app/node_modules/@gnar-engine/core',
+    coreDevPath: path.join(__dirname, '../../core'),
 
 }
+
+export const directories = {
+    scaffolderServiceTemplates: path.join(import.meta.dirname, '../templates/service'),
+    scaffolderEntityTemplates: path.join(import.meta.dirname, '../templates/entity'),
+    bootstrap: path.join(import.meta.dirname, '../bootstrap'),
+    provisioner: path.join(import.meta.dirname, './provisioner')
+};

package/src/dev/commands.js

@@ -10,11 +10,13 @@ export function registerDevCommands(program) {
 	devCmd
 		.command('up')
 		.description('🛠️  Up Development Containers')
-		.option('-b, --build', 'Ruild without cache')
+		.option('-b, --build', 'Build without cache')
         .option('-d, --detach', 'Run containers in background')
+        .option('-a, --attach-all', 'Attach all services including database and message queues for debugging')
         .option('-t --test', 'Run the tests with ephemeral databases')
-        .option('--test-service <service>', 'Run the tests for the specified service with ephemeral databases')
+        .option('--test-service <service>', 'Run the tests for the specified service with ephemeral databases (e.g. --test-service user)')
         .addOption(new Option('--core-dev').hideHelp())
+        .addOption(new Option('--bootstrap-dev').hideHelp())
         .action(async (options) => {
 			let response = {};
 
@@ -39,8 +41,10 @@ export function registerDevCommands(program) {
                     build: options.build || false,
                     detach: options.detach || false,
                     coreDev: options.coreDev || false,
+                    bootstrapDev: options.bootstrapDev || false,
                     test: options.test || false,
-                    testService: options.testService || ''
+                    testService: options.testService || '',
+                    attachAll: options.attachAll || false
                  });
 			} catch (err) {
 				console.error("❌ Error running containers:", err.message);