Centralized cache helper with tenant/org scoping, update signatures

src/constants/common.js

@@ -101,7 +101,7 @@ module.exports = {
 	WRITE_ACCESS: 'w',
 	READ_ACCESS: 'r',
 	TYPE_ALL: 'all',
-	ENGLISH_LANGUGE_CODE: 'en',
+	ENGLISH_LANGUAGE_CODE: 'en',
 	ORG_CODE_HEADER: 'organizationcode',
 	TENANT_CODE_HEADER: 'tenantcode',
 	DELETE_METHOD: 'DELETE',
@@ -113,4 +113,17 @@ module.exports = {
 	SIGNEDUP_STATUS: 'SIGNEDUP',
 	SEQUELIZE_UNIQUE_CONSTRAINT_ERROR: 'SequelizeUniqueConstraintError',
 	SEQUELIZE_UNIQUE_CONSTRAINT_ERROR_CODE: 'ER_DUP_ENTRY',
+	CACHE_CONFIG: {
+		enableCache: true,
+		enableTracking: true,
+		shards: 32,
+		versionDefault: 0,
+		namespaces: {
+			profile: { name: 'profile', enabled: true, defaultTtl: 3600, useInternal: false },
+			entity_types: { name: 'entity_types', enabled: true, defaultTtl: 86400, useInternal: false },
+			tenant: { name: 'tenant', enabled: true, defaultTtl: 21600, useInternal: false },
+			branding: { name: 'branding', enabled: true, defaultTtl: 43200, useInternal: false },
+			organization: { name: 'organization', enabled: true, defaultTtl: 21600, useInternal: false },
+		},
+	},
 }

src/controllers/v1/organization.js

@@ -92,7 +92,12 @@ module.exports = class Organization {
 				})
 			}
 
-			const updatedOrg = await orgService.update(req.params.id, req.body, req.decodedToken.id)
+			const updatedOrg = await orgService.update(
+				req.params.id,
+				req.body,
+				req.decodedToken.id,
+				req.decodedToken.tenant_code
+			)
 			return updatedOrg
 		} catch (error) {
 			return error
@@ -188,7 +193,8 @@ module.exports = class Organization {
 		try {
 			const result = await orgService.addRelatedOrg(
 				req.params.id ? req.params.id : '',
-				req.body.related_orgs ? req.body.related_orgs : []
+				req.body.related_orgs ? req.body.related_orgs : [],
+				req.decodedToken.tenant_code
 			)
 			return result
 		} catch (error) {
@@ -199,7 +205,8 @@ module.exports = class Organization {
 		try {
 			const result = await orgService.removeRelatedOrg(
 				req.params.id ? req.params.id : '',
-				req.body.related_orgs ? req.body.related_orgs : []
+				req.body.related_orgs ? req.body.related_orgs : [],
+				req.decodedToken.tenant_code
 			)
 			return result
 		} catch (error) {

src/controllers/v1/user-role.js

@@ -61,6 +61,7 @@ module.exports = class userRole {
 				req.params.id,
 				req.body,
 				req.decodedToken.organization_id,
+				req.decodedToken.organization_code,
 				req.decodedToken.tenant_code
 			)
 			return updateRole
@@ -83,6 +84,7 @@ module.exports = class userRole {
 			return await roleService.delete(
 				req.params.id,
 				req.decodedToken.organization_id,
+				req.decodedToken.organization_code,
 				req.decodedToken.tenant_code
 			)
 		} catch (error) {

src/controllers/v1/user.js

@@ -49,7 +49,8 @@ module.exports = class User {
 				req.params.id ? req.params.id : req.decodedToken.id,
 				req.headers,
 				req.query.language ? req.query.language : '',
-				req.decodedToken.tenant_code
+				req.decodedToken.tenant_code,
+				req.decodedToken.organization_code
 			)
 			return userDetails
 		} catch (error) {

src/database/queries/organization.js

@@ -111,35 +111,36 @@ exports.update = async (filter, update, options = {}) => {
 	}
 }
 
-exports.appendRelatedOrg = async (relatedOrg, ids, options = {}) => {
+exports.appendRelatedOrg = async (relatedOrg, ids, tenantCode, options = {}) => {
 	try {
+		const whereClause = {
+			id: ids,
+			tenant_code: tenantCode, // enforce tenant
+			[Op.or]: [
+				{
+					[Op.not]: {
+						related_orgs: {
+							[Op.contains]: [relatedOrg],
+						},
+					},
+				},
+				{
+					related_orgs: {
+						[Op.is]: null,
+					},
+				},
+			],
+		}
 		const result = await Organization.update(
 			{
 				related_orgs: sequelize.fn('array_append', sequelize.col('related_orgs'), relatedOrg),
 			},
 			{
-				where: {
-					id: ids,
-					[Op.or]: [
-						{
-							[Op.not]: {
-								related_orgs: {
-									[Op.contains]: [relatedOrg],
-								},
-							},
-						},
-						{
-							related_orgs: {
-								[Op.is]: null,
-							},
-						},
-					],
-				},
+				where: whereClause,
 				...options,
 				individualHooks: true,
 			}
 		)
-
 		const [rowsAffected, updatedRows] = result
 		return options.returning ? { rowsAffected, updatedRows } : rowsAffected
 	} catch (error) {
@@ -148,13 +149,17 @@ exports.appendRelatedOrg = async (relatedOrg, ids, options = {}) => {
 	}
 }
 
-exports.removeRelatedOrg = async (removedOrgIds, ids, options = {}) => {
+// (removedOrgIds, ids, tenantCode, options = {})
+exports.removeRelatedOrg = async (removedOrgIds, ids, tenantCode, options = {}) => {
 	try {
 		const result = await Organization.update(
-			{ related_orgs: sequelize.fn('array_remove', sequelize.col('related_orgs'), removedOrgIds) },
+			{
+				related_orgs: sequelize.fn('array_remove', sequelize.col('related_orgs'), removedOrgIds),
+			},
 			{
 				where: {
 					id: ids,
+					tenant_code: tenantCode, // enforce same tenant
 				},
 				...options,
 				individualHooks: true,
@@ -168,6 +173,7 @@ exports.removeRelatedOrg = async (removedOrgIds, ids, options = {}) => {
 		throw error
 	}
 }
+
 exports.listOrganizations = async (page, limit, search) => {
 	try {
 		let filterQuery = {

src/database/queries/userOrganization.js

@@ -106,7 +106,7 @@ exports.findOne = async (filter, options = {}) => {
 
 exports.findAll = async (filter = {}, options = {}) => {
 	try {
-		if (options.organizationAttributes.length > 0) {
+		if (options?.organizationAttributes?.length > 0) {
 			options.include = [
 				{
 					model: Organization,