minimonolith 0.15.1 → 0.15.3

package/README.md

@@ -6,25 +6,6 @@
 
 In addition to its simplicity, `minimonolith` enables seamless inter-service communication within your API. This allows services to call one another's functionality without directly importing them, fostering a modular design. For example, you can call the get method of the todo service from the todoList service using SERVICES.todo.get({ id }). By registering services within the API, you can easily call their methods from other services, which not only promotes a clean architecture but also paves the way for future support of automated end-to-end testing.
 
-## Project Structure
-
-A typical project using `minimonolith` will have the following structure:
-
-```go
-.
-├── package.json
-├── .gitignore
-├── .env
-├── server.js                  // For local development
-├── index.js                   // Root of the code in a deployed AWS Lambda
-└── service1
-    ├── index.js               // Service1 method handlers are declared here
-    ├── model.js               // Optional: Sequelize model for Service1 is declared here
-    └── method1
-        ├── index.js           // Service1 Method1 handler is declared here
-        └── valid.js           // Optional: Method1 handler body validation, if not empty
-```
-
 ## Example Project
 
 Here's an example project using `minimonolith`:
@@ -37,11 +18,11 @@ Here's an example project using `minimonolith`:
 ├── server.js                  // For local development
 ├── index.js                   // Root of the code in a deployed AWS Lambda
 └── todo
-    ├── index.js               // Todo method handlers are declared here
-    ├── model.js               // Todo Sequelize model is declared here
+    ├── index.js               // Service 'todo' exported method handlers are declared here
+    ├── model.js               // Optional: Sequelize model for service 'todo' is declared here
     └── get
-        ├── index.js           // /todo/get/ handler
-        └── valid.js           // /todo/get/index.js body validation
+        ├── index.js           // Service 'todo' method 'get' handler
+        └── valid.js           // Optional: Method 'get' handler validation, if body not empty
 ```
 
 ### server.js

package/package.json

@@ -1,13 +1,18 @@
 {
   "name": "minimonolith",
   "type": "module",
-  "version": "0.15.1",
+  "version": "0.15.3",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
     "start:development": "nodemon --inspect=0.0.0.0 ./server.js",
     "test": "NODE_OPTIONS=--experimental-vm-modules npx jest --coverage"
   },
+  "keywords": [
+    "lambda-api",
+    "zod",
+    "sequelize"
+  ],
   "dependencies": {
     "lambda-api": "^1.0.1",
     "sequelize": "^6.30.0",

package/src/api/createAPI.js

@@ -36,6 +36,8 @@ const createAPI = () => {
   API.handler = async () => {
     if (API.ORM) API.MODELS = await loadAndSyncModels(API);
     else console.log({ ROUTE_CODE, INFO: 'NO_DATABASE_REGISTERED' });
+
+    console.log({ ROUTE_CODE, INFO: 'LISTENING' });
     return apiHandler(API);
   }
 

package/src/model/loadModels.js

@@ -10,16 +10,20 @@ const registerModel = async (SERVICE_NAME, SERVICE_URL) => {
 }
 
 const loadAndSyncModels = async API => {
-  console.log({ ROUTE_CODE, LOADING_MODELS: 'LOADING_MODELS' });
   const MODELS = Object.keys(modelSchemas).reduce((loadedModels, serviceName) => {
+    console.log({ ROUTE_CODE, LOADING_MODEL: serviceName });
     loadedModels[serviceName] = modelSchemas[serviceName](API.ORM, DataTypes);
     return loadedModels;
   }, {});
 
-  Object.entries(MODELS).forEach(([serviceName, model]) => { model.associate(MODELS); });
+  Object.entries(MODELS).forEach(([serviceName, model]) => {
+    console.log({ ROUTE_CODE, ASSOCIATING_MODEL: serviceName });
+    model.associate(MODELS);
+  });
 
-  console.log({ ROUTE_CODE, SYNCING_ORM: 'SYNCING_ORM' });
+  console.log({ ROUTE_CODE, SYNCING_ORM: 'WAIT_SYNCING_ORM' });
   await API.ORM.sync({ alter: process.env.MM_API_LOCAL_ENV ? true : false });
+  console.log({ ROUTE_CODE, SYNCING_ORM: 'DONE_SYNCING_ORM' });
 
   return MODELS;
 };

package/src/service/registerService.js

@@ -43,10 +43,10 @@ const registerService = async (API, SERVICE_NAME, SRC_FOLDER, MODULE_FOLDER) =>
 
       const methodType = getMethodType(METHOD_NAME);
       API[methodType](METHOD_ROUTE, async (event, res) => {
-        const { body, params, queryStringParameters } = event;
+        const { body, params, query } = event;
         const claims = event.requestContext.authorizer?.jwt?.claims;
-        const parsedBody = body || Object.keys(params).length > 0 || queryStringParameters ?
-          { ...body, ...params, ...queryStringParameters } : undefined;
+        const parsedBody = body || Object.keys(params).length > 0 || query ?
+          { ...body, ...params, ...query } : undefined;
         await exposedMethodHandler(parsedBody, res, claims, API,
           SERVICE_METHODS[METHOD_CODE], METHOD_ROUTE_CODE);
       });