Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refracted generics/utils file #421

Draft
wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft

refracted generics/utils file #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d02ae1
refracted generics/utils file
nevil-mathew Feb 21, 2024
1a9e0ec
update func to arrow func
nevil-mathew Feb 25, 2024
6640394
fixed an issue with hashPassword
nevil-mathew Feb 26, 2024
6e55a45
Merge branch 'develop' of https://github.com/ELEVATE-Project/user int…
nevil-mathew Feb 26, 2024
d74517c
added helpers
nevil-mathew Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/configs/bull.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ const { Worker } = require('bullmq')
const fs = require('fs')
const userInviteService = require('@services/userInvite')
const common = require('@constants/common')
const utils = require('@generics/utils')
const cacheUtils = require('@utils/cache')
const path = require('path')

const { elevateLog } = require('elevate-logger')
const logger = elevateLog.init()

const redisConfiguration = utils.generateRedisConfigForQueue()
const redisConfiguration = cacheUtils.generateRedisConfigForQueue()

module.exports = function () {
try {
Expand Down
8 changes: 4 additions & 4 deletions src/configs/kafka.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
//Dependencies
const { Kafka } = require('kafkajs')

const utils = require('@generics/utils')
const cacheUtils = require('@utils/cache')

const { elevateLog } = require('elevate-logger')
const logger = elevateLog.init()
Expand All @@ -27,10 +27,10 @@ module.exports = async () => {
await consumer.connect()

producer.on('producer.connect', () => {
logger.info(`KafkaProvider: connected`)
logger.info('KafkaProvider: connected')
})
producer.on('producer.disconnect', () => {
logger.error(`KafkaProvider: could not connect`, {
logger.error('KafkaProvider: could not connect', {
triggerNotification: true,
})
})
Expand All @@ -42,7 +42,7 @@ module.exports = async () => {
try {
let streamingData = JSON.parse(message.value)
if (streamingData.type == 'CLEAR_INTERNAL_CACHE') {
utils.internalDel(streamingData.value)
cacheUtils.internalDel(streamingData.value)
}
} catch (error) {
logger.error('Subscribe to consumer failed:' + error, {
Expand Down
10 changes: 5 additions & 5 deletions src/controllers/v1/admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
const adminService = require('@services/admin')
const common = require('@constants/common')
const httpStatusCode = require('@generics/http-status')
const utilsHelper = require('@generics/utils')
const roleUtils = require('@utils/role')
const responses = require('@helpers/responses')

module.exports = class Admin {
Expand All @@ -23,7 +23,7 @@ module.exports = class Admin {

async deleteUser(req) {
try {
if (!utilsHelper.validateRoleAccess(req.decodedToken.roles, common.ADMIN_ROLE)) {
if (!roleUtils.validateRoleAccess(req.decodedToken.roles, common.ADMIN_ROLE)) {
throw responses.failureResponse({
message: 'USER_IS_NOT_A_ADMIN',
statusCode: httpStatusCode.bad_request,
Expand Down Expand Up @@ -97,7 +97,7 @@ module.exports = class Admin {

async addOrgAdmin(req) {
try {
if (!utilsHelper.validateRoleAccess(req.decodedToken.roles, common.ADMIN_ROLE)) {
if (!roleUtils.validateRoleAccess(req.decodedToken.roles, common.ADMIN_ROLE)) {
throw responses.failureResponse({
message: 'USER_IS_NOT_A_ADMIN',
statusCode: httpStatusCode.bad_request,
Expand Down Expand Up @@ -126,7 +126,7 @@ module.exports = class Admin {
*/
async deactivateOrg(req) {
try {
if (!utilsHelper.validateRoleAccess(req.decodedToken.roles, common.ADMIN_ROLE)) {
if (!roleUtils.validateRoleAccess(req.decodedToken.roles, common.ADMIN_ROLE)) {
throw responses.failureResponse({
message: 'USER_IS_NOT_A_ADMIN',
statusCode: httpStatusCode.bad_request,
Expand All @@ -150,7 +150,7 @@ module.exports = class Admin {
*/
async deactivateUser(req) {
try {
if (!utilsHelper.validateRoleAccess(req.decodedToken.roles, common.ADMIN_ROLE)) {
if (!roleUtils.validateRoleAccess(req.decodedToken.roles, common.ADMIN_ROLE)) {
throw responses.failureResponse({
message: 'USER_IS_NOT_A_ADMIN',
statusCode: httpStatusCode.bad_request,
Expand Down
4 changes: 2 additions & 2 deletions src/controllers/v1/notification.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

// Dependencies
const notificationService = require('@services/notification')
const utilsHelper = require('@generics/utils')
const roleUtils = require('@utils/role')
const common = require('@constants/common')
const httpStatusCode = require('@generics/http-status')
const responses = require('@helpers/responses')
Expand All @@ -29,7 +29,7 @@ module.exports = class NotificationTemplate {

async template(req) {
try {
if (!utilsHelper.validateRoleAccess(req.decodedToken.roles, [common.ADMIN_ROLE, common.ORG_ADMIN_ROLE])) {
if (!roleUtils.validateRoleAccess(req.decodedToken.roles, [common.ADMIN_ROLE, common.ORG_ADMIN_ROLE])) {
throw responses.failureResponse({
message: 'USER_IS_NOT_A_ADMIN',
statusCode: httpStatusCode.bad_request,
Expand Down
16 changes: 8 additions & 8 deletions src/controllers/v1/org-admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
const orgAdminService = require('@services/org-admin')
const common = require('@constants/common')
const httpStatusCode = require('@generics/http-status')
const utilsHelper = require('@generics/utils')
const roleUtils = require('@utils/role')
const responses = require('@helpers/responses')
module.exports = class OrgAdmin {
/**
Expand All @@ -21,7 +21,7 @@ module.exports = class OrgAdmin {
*/
async bulkUserCreate(req) {
try {
if (!utilsHelper.validateRoleAccess(req.decodedToken.roles, common.ORG_ADMIN_ROLE)) {
if (!roleUtils.validateRoleAccess(req.decodedToken.roles, common.ORG_ADMIN_ROLE)) {
throw responses.failureResponse({
message: 'USER_IS_NOT_A_ADMIN',
statusCode: httpStatusCode.bad_request,
Expand All @@ -48,7 +48,7 @@ module.exports = class OrgAdmin {
*/
async getBulkInvitesFilesList(req) {
try {
if (!utilsHelper.validateRoleAccess(req.decodedToken.roles, common.ORG_ADMIN_ROLE)) {
if (!roleUtils.validateRoleAccess(req.decodedToken.roles, common.ORG_ADMIN_ROLE)) {
throw responses.failureResponse({
message: 'USER_IS_NOT_A_ADMIN',
statusCode: httpStatusCode.bad_request,
Expand All @@ -72,7 +72,7 @@ module.exports = class OrgAdmin {
*/
async getRequestDetails(req) {
try {
if (!utilsHelper.validateRoleAccess(req.decodedToken.roles, common.ORG_ADMIN_ROLE)) {
if (!roleUtils.validateRoleAccess(req.decodedToken.roles, common.ORG_ADMIN_ROLE)) {
throw responses.failureResponse({
message: 'USER_IS_NOT_A_ADMIN',
statusCode: httpStatusCode.bad_request,
Expand Down Expand Up @@ -101,7 +101,7 @@ module.exports = class OrgAdmin {
*/
async getRequests(req) {
try {
if (!utilsHelper.validateRoleAccess(req.decodedToken.roles, common.ORG_ADMIN_ROLE)) {
if (!roleUtils.validateRoleAccess(req.decodedToken.roles, common.ORG_ADMIN_ROLE)) {
throw responses.failureResponse({
message: 'USER_IS_NOT_A_ADMIN',
statusCode: httpStatusCode.bad_request,
Expand All @@ -128,7 +128,7 @@ module.exports = class OrgAdmin {
*/
async updateRequestStatus(req) {
try {
if (!utilsHelper.validateRoleAccess(req.decodedToken.roles, common.ORG_ADMIN_ROLE)) {
if (!roleUtils.validateRoleAccess(req.decodedToken.roles, common.ORG_ADMIN_ROLE)) {
throw responses.failureResponse({
message: 'USER_IS_NOT_A_ADMIN',
statusCode: httpStatusCode.bad_request,
Expand All @@ -152,7 +152,7 @@ module.exports = class OrgAdmin {
*/
async deactivateUser(req) {
try {
if (!utilsHelper.validateRoleAccess(req.decodedToken.roles, common.ORG_ADMIN_ROLE)) {
if (!roleUtils.validateRoleAccess(req.decodedToken.roles, common.ORG_ADMIN_ROLE)) {
throw responses.failureResponse({
message: 'USER_IS_NOT_A_ADMIN',
statusCode: httpStatusCode.bad_request,
Expand Down Expand Up @@ -185,7 +185,7 @@ module.exports = class OrgAdmin {

async inheritEntityType(req) {
try {
if (!utilsHelper.validateRoleAccess(req.decodedToken.roles, common.ORG_ADMIN_ROLE)) {
if (!roleUtils.validateRoleAccess(req.decodedToken.roles, common.ORG_ADMIN_ROLE)) {
throw responses.failureResponse({
message: 'USER_IS_NOT_A_ADMIN',
statusCode: httpStatusCode.bad_request,
Expand Down
8 changes: 4 additions & 4 deletions src/controllers/v1/organization.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

// Dependencies
const utilsHelper = require('@generics/utils')
const roleUtils = require('@utils/role')
const common = require('@constants/common')
const httpStatusCode = require('@generics/http-status')
const orgService = require('@services/organization')
Expand All @@ -31,7 +31,7 @@ module.exports = class Organization {
let isAdmin = false
const roles = req.decodedToken.roles
if (roles && roles.length > 0) {
isAdmin = utilsHelper.validateRoleAccess(roles, common.ADMIN_ROLE)
isAdmin = roleUtils.validateRoleAccess(roles, common.ADMIN_ROLE)
}

if (!isAdmin) {
Expand Down Expand Up @@ -67,8 +67,8 @@ module.exports = class Organization {
const roles = req.decodedToken.roles

if (roles && roles.length > 0) {
isAdmin = utilsHelper.validateRoleAccess(roles, common.ADMIN_ROLE)
isOrgAdmin = utilsHelper.validateRoleAccess(roles, common.ORG_ADMIN_ROLE)
isAdmin = roleUtils.validateRoleAccess(roles, common.ADMIN_ROLE)
isOrgAdmin = roleUtils.validateRoleAccess(roles, common.ORG_ADMIN_ROLE)
}

if (req.params.id != req.decodedToken.organization_id && isOrgAdmin) {
Expand Down
4 changes: 2 additions & 2 deletions src/generics/materializedViews.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'
const entityTypeQueries = require('@database/queries/entityType')
const { sequelize } = require('@database/models/index')
const utils = require('@generics/utils')
const whereClauseGeneratorHelper = require('@helpers/whereClauseGenerator')
const common = require('@constants/common')
const getDefaultOrgId = process.env.DEFAULT_ORG_ID
let refreshInterval
Expand Down Expand Up @@ -146,7 +146,7 @@ const materializedViewQueryBuilder = async (model, concreteFields, metaFields) =
.join(',\n')
: '' // Empty string if there are no meta fields

const whereClause = utils.generateWhereClause(tableName)
const whereClause = whereClauseGeneratorHelper.generateWhereClause(tableName)

const materializedViewGenerationQuery = `CREATE MATERIALIZED VIEW ${temporaryMaterializedViewName} AS
SELECT
Expand Down
Loading