Merge pull request #888 from ELEVATE-Project/develop

Develop to staging

Author: nevil-mathew

src/constants/common.js

@@ -15,6 +15,19 @@ const ENTITY_TYPE_DATA_TYPES = {
 	BOOLEAN: ['BOOLEAN'],
 	JSON: ['JSON', 'JSONB'],
 }
+const defaultOrgPolicies = () => {
+	return {
+		session_visibility_policy: process.env.DEFAULT_SESSION_VISIBILITY_POLICY,
+		mentor_visibility_policy: process.env.DEFAULT_MENTOR_VISIBILITY_POLICY,
+		mentee_visibility_policy: process.env.DEFAULT_MENTEE_VISIBILITY_POLICY,
+		external_session_visibility_policy: process.env.DEFAULT_EXTERNAL_SESSION_VISIBILITY_POLICY,
+		external_mentor_visibility_policy: process.env.DEFAULT_EXTERNAL_MENTOR_VISIBILITY_POLICY,
+		external_mentee_visibility_policy: process.env.DEFAULT_EXTERNAL_MENTEE_VISIBILITY_POLICY,
+		allow_mentor_override: false,
+		approval_required_for: [],
+	}
+}
+
 module.exports = {
 	pagination: {
 		DEFAULT_PAGE_NO: 1,
@@ -103,16 +116,7 @@ module.exports = {
 	ORG_ADMIN_ROLE: 'org_admin',
 
 	// Default organization policies
-	DEFAULT_ORGANISATION_POLICY: {
-		session_visibility_policy: 'CURRENT',
-		mentor_visibility_policy: 'CURRENT',
-		mentee_visibility_policy: 'CURRENT',
-		external_session_visibility_policy: 'CURRENT',
-		external_mentor_visibility_policy: 'CURRENT',
-		external_mentee_visibility_policy: 'CURRENT',
-		allow_mentor_override: false,
-		approval_required_for: [],
-	},
+	getDefaultOrgPolicies: defaultOrgPolicies,
 	CURRENT: 'CURRENT',
 	ALL: 'ALL',
 	ASSOCIATED: 'ASSOCIATED',
@@ -186,7 +190,6 @@ module.exports = {
 	},
 	WRITE_ACCESS: 'w',
 	READ_ACCESS: 'r',
-	azureBlobType: 'BlockBlob',
 	ENTITY_TYPE_DATA_TYPES,
 	DEFAULT_RULES: {
 		SESSION_TYPE: 'session',

src/database/queries/organisationExtension.js

@@ -46,7 +46,7 @@ module.exports = class OrganizationExtensionQueries {
 				throw new Error('organization Id Missing')
 			}
 
-			const data = common.DEFAULT_ORGANISATION_POLICY
+			const data = common.getDefaultOrgPolicies()
 			data.organization_id = organizationId
 			// Try to find the data, and if it doesn't exist, create it
 			const [orgPolicies, created] = await OrganizationExtension.findOrCreate({

src/envVariables.js

@@ -303,6 +303,36 @@ let enviromentVariables = {
 		optional: true,
 		default: '6',
 	},
+	DEFAULT_SESSION_VISIBILITY_POLICY: {
+		message: 'Required Default Session Visibility Policy',
+		optional: true,
+		default: 'CURRENT',
+	},
+	DEFAULT_MENTOR_VISIBILITY_POLICY: {
+		message: 'Required Default Mentor Visibility Policy',
+		optional: true,
+		default: 'CURRENT',
+	},
+	DEFAULT_MENTEE_VISIBILITY_POLICY: {
+		message: 'Required Default Mentee Visibility Policy',
+		optional: true,
+		default: 'CURRENT',
+	},
+	DEFAULT_EXTERNAL_SESSION_VISIBILITY_POLICY: {
+		message: 'Required Default External Session Visibility Policy',
+		optional: true,
+		default: 'CURRENT',
+	},
+	DEFAULT_EXTERNAL_MENTOR_VISIBILITY_POLICY: {
+		message: 'Required Default External Mentor Visibility Policy',
+		optional: true,
+		default: 'CURRENT',
+	},
+	DEFAULT_EXTERNAL_MENTEE_VISIBILITY_POLICY: {
+		message: 'Required Default External Mentee Visibility Policy',
+		optional: true,
+		default: 'CURRENT',
+	},
 }
 
 let success = true

src/services/organization.js

@@ -61,9 +61,9 @@ module.exports = class OrganizationService {
 	static async createOrgExtension(eventBody) {
 		try {
 			console.log('EVENT BODY: ', eventBody)
-			console.log('DEFAULT ORGANISATION POLICY: ', common.DEFAULT_ORGANISATION_POLICY)
+			console.log('DEFAULT ORGANISATION POLICY: ', common.getDefaultOrgPolicies())
 			const extensionData = {
-				...common.DEFAULT_ORGANISATION_POLICY,
+				...common.getDefaultOrgPolicies(),
 				organization_id: eventBody.entityId,
 				created_by: eventBody.created_by,
 				updated_by: eventBody.created_by,

src/services/users.js

@@ -133,7 +133,7 @@ module.exports = class UserHelper {
 		if (orgExtension) return orgExtension
 
 		const orgExtensionData = {
-			...common.DEFAULT_ORGANISATION_POLICY,
+			...common.getDefaultOrgPolicies(),
 			organization_id: orgData.id,
 			created_by: 1,
 			updated_by: 1,