Merge pull request #22 from hackjunction/Junction-Platform-2.0

Updating STAG to Junction platform 2.0

Author: wickathou

azure-pipelines-1.yml

@@ -65,11 +65,20 @@ class UnauthorizedError extends CustomError {
     }
 }
 
+class AlreadyExistsError extends CustomError {
+    constructor(message) {
+        const name = 'AlreadyExistsError'
+        const code = 7
+        super(message, name, code)
+    }
+}
+
 module.exports = {
     InsufficientPrivilegesError,
     EmailVerificationError,
     NotFoundError,
     ValidationError,
     ForbiddenError,
     UnauthorizedError,
+    AlreadyExistsError,
 }

backend/common/errors/errors.js

@@ -47,6 +47,24 @@ function isOrganiser(user, event) {
     return null
 }
 
+function isPartner(user, event) {
+    console.log('isPartner func running')
+    if (!event) {
+        return new NotFoundError('Event does not exist')
+    }
+    if (event.recruiters.length > 0) {
+        const recruiterIds = event.recruiters.map(recruiter => {
+            return recruiter.recruiterId
+        })
+        if (recruiterIds.indexOf(user.sub) === -1) {
+            return new InsufficientPrivilegesError(
+                'Must be partner in the of event',
+            )
+        }
+    }
+    return null
+}
+
 function canRegister(user, event) {
     if (!event) {
         return new NotFoundError('Event does not exist')
@@ -178,7 +196,6 @@ const EventMiddleware = {
     isEventOrganiser: async (req, res, next) => {
         // TODO this method is called quite often. Not really problem here, but a reminder to run a profiler on the frontend at some point
         const event = await getEventFromParams(req.params)
-        // TODO what the fuck is the logic with these? :D if true, return null?
         const superAdminError = isSuperAdmin(req.user)
         const error = isOrganiser(req.user, event)
         if (error && superAdminError) {
@@ -188,6 +205,19 @@ const EventMiddleware = {
             next()
         }
     },
+    isEventPartner: async (req, res, next) => {
+        console.log('isEventPartner running')
+        // TODO this method is called quite often. Not really problem here, but a reminder to run a profiler on the frontend at some point
+        const event = await getEventFromParams(req.params)
+        const superAdminError = isSuperAdmin(req.user)
+        const error = isPartner(req.user, event)
+        if (error && superAdminError) {
+            next(error)
+        } else {
+            req.event = event
+            next()
+        }
+    },
     isEventOwner: async (req, res, next) => {
         const event = await getEventFromParams(req.params)
         const superAdminError = isSuperAdmin(req.user)
@@ -237,6 +267,24 @@ const EventMiddleware = {
             next()
         }
     },
+    isOrganiserOrCanSubmitProject: async (req, res, next) => {
+        const event = await getEventFromParams(req.params)
+        const [registration, team] = await Promise.all([
+            getRegistration(req.user, event),
+            getTeamWithMeta(req.user, event),
+        ])
+        const superAdminError = isSuperAdmin(req.user)
+        const organiserError = isOrganiser(req.user, event)
+        const projectError = canSubmitProject(event, registration, team)
+        if ((organiserError && superAdminError) && projectError) {
+            next(error)
+        } else {
+            req.event = event
+            req.registration = registration
+            req.team = team
+            next()
+        }
+    },
     hasPartnerToken: async (req, res, next) => {
         /*         const [match, ...other] = await hasPartnerToken(
             req.event,

backend/common/middleware/events.js

@@ -24,6 +24,7 @@ function allowPublishPlugin(schema, { defaultPublished = false } = {}) {
                     `must be set before the event can be published!`,
                 ],
             }
+            //console.log("error with publishing", "options", options, "path", path)//TODO: migrate the publish button to the end and show errors
             delete newOptions.requiredForPublish
             schema.path(path, newOptions)
         }

backend/common/plugins/allowPublish.js

@@ -6,13 +6,13 @@ const { updateMeetingGoogleInfo } = require('../../../modules/meeting/helpers')
 
 const TOKEN_PATH = `${__dirname}/token.json`
 const install = {
-        client_id: "752565208443-0g0ui7afokfi2b1t1von4qankq1vh62h.apps.googleusercontent.com",//"758477701769-hasb17jt161beprjr34kgqjma0sb815h.apps.googleusercontent.com",//global.gConfig.GOOGLE_CLIENT_ID,
-        project_id: "prod-calendar-386407",//"junction-calendar-375014",//global.gConfig.GOOGLE_PROJECT_ID,
-        auth_uri: "https://accounts.google.com/o/oauth2/auth",//"https://accounts.google.com/o/oauth2/auth", //global.gConfig.GOOGLE_AUTH_URI,
-        token_uri: "https://oauth2.googleapis.com/token",//"https://oauth2.googleapis.com/token", //global.gConfig.GOOGLE_TOKEN_URI,
-        auth_provider_x509_cert_url: "https://www.googleapis.com/oauth2/v1/certs",//"https://www.googleapis.com/oauth2/v1/certs", //global.gConfig.GOOGLE_AUTH_PROVIDER,
-        client_secret: "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",//"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", //global.gConfig.GOOGLE_CLIENT_SECRET,
-        redirect_uris:["http://localhost","https://app.hackjunction.com","https://eu.junctionplatform.com"]//["http://localhost","https://app.hackjunction.com"], //[ global.gConfig.GOOGLE_REDIRECT]
+    client_id: "752565208443-0g0ui7afokfi2b1t1von4qankq1vh62h.apps.googleusercontent.com",//"758477701769-hasb17jt161beprjr34kgqjma0sb815h.apps.googleusercontent.com",//global.gConfig.GOOGLE_CLIENT_ID,
+    project_id: "prod-calendar-386407",//"junction-calendar-375014",//global.gConfig.GOOGLE_PROJECT_ID,
+    auth_uri: "https://accounts.google.com/o/oauth2/auth",//"https://accounts.google.com/o/oauth2/auth", //global.gConfig.GOOGLE_AUTH_URI,
+    token_uri: "https://oauth2.googleapis.com/token",//"https://oauth2.googleapis.com/token", //global.gConfig.GOOGLE_TOKEN_URI,
+    auth_provider_x509_cert_url: "https://www.googleapis.com/oauth2/v1/certs",//"https://www.googleapis.com/oauth2/v1/certs", //global.gConfig.GOOGLE_AUTH_PROVIDER,
+    client_secret: "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",//"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", //global.gConfig.GOOGLE_CLIENT_SECRET,
+    redirect_uris: ["http://localhost", "https://app.hackjunction.com", "https://eu.junctionplatform.com"]//["http://localhost","https://app.hackjunction.com"], //[ global.gConfig.GOOGLE_REDIRECT]
 }
 const credentialsJ = {
     installed: install
@@ -39,9 +39,9 @@ function authorize(credentials, callback, callbackParameter = null) {
             console.log('Error loading google calendar token file')
             return false
         }
-        console.log("got token",token)
+
         oAuth2Client.setCredentials(JSON.parse(token))
-        console.log("oAuth2Client, callbackParameter",callback(oAuth2Client, callbackParameter))
+
         callback(oAuth2Client, callbackParameter)
     })
 
@@ -60,7 +60,7 @@ function authorize(credentials, callback, callbackParameter = null) {
 }
 
 const insertEvent = (auth, eventInfo) => {
-    console.log("inserting")
+
     const calendar = google.calendar({ version: 'v3', auth })
     calendar.events.insert(
         {
@@ -76,7 +76,6 @@ const insertEvent = (auth, eventInfo) => {
                 )
                 // cancelMeeting(eventInfo.meetingId)
             } else {
-                console.log(res)
                 updateMeetingGoogleInfo(
                     eventInfo.meetingId,
                     res.data.id,
@@ -116,7 +115,7 @@ const deleteGoogleEvent = eventId => {
             return true
         })*/
 
-        authorize(JSON.parse(JSON.stringify(credentialsJ)),deleteEvent,eventId)
+        authorize(JSON.parse(JSON.stringify(credentialsJ)), deleteEvent, eventId)
         return true
 
     } catch (err) {
@@ -167,8 +166,7 @@ const createGoogleEvent = event => {
         
         })*/
 
-        console.log(credentialsJ)
-        authorize(JSON.parse(JSON.stringify(credentialsJ)),insertEvent,eventInfo)
+        authorize(JSON.parse(JSON.stringify(credentialsJ)), insertEvent, eventInfo)
         console.log("success")
         return true
     } catch (err) {

backend/common/services/google-calendar/google-calendar.js

@@ -99,7 +99,7 @@ const SendgridService = {
                 subtitle: event.emailConfig.acceptanceEmail.subtitle || `You've been accepted to ${event.name}!`,
                 body: replaceBodyTags(event.emailConfig.acceptanceEmail.body, event, user),
                 cta_text: 'Event dashboard',
-                cta_link: `${global.gConfig.FRONTEND_URL}/dashboard/${event.slug}`,
+                cta_link: `${global.gConfig.FRONTEND_URL}/dashboard/event/${event.slug}`,
             },
         )
         return SendgridService.send(msg)
@@ -137,7 +137,7 @@ const SendgridService = {
                     subtitle: event.emailConfig.registrationEmail.subtitle || 'Awesome! Now just sit back and relax.',
                     body: replaceBodyTags(event.emailConfig.registrationEmail.body, event, user),
                     cta_text: 'Event dashboard',
-                    cta_link: `${global.gConfig.FRONTEND_URL}/dashboard/${event.slug}`,
+                    cta_link: `${global.gConfig.FRONTEND_URL}/dashboard/event/${event.slug}`,
                 },
             )
         } else {
@@ -193,7 +193,7 @@ const SendgridService = {
                 Psst, please note that the transaction will be made in Euros, so please make sure you have a bank account able to receive Euro payments available.
             `,
                 cta_text: 'Event dashboard',
-                cta_link: `${global.gConfig.FRONTEND_URL}/dashboard/${event.slug}`,
+                cta_link: `${global.gConfig.FRONTEND_URL}/dashboard/event/${event.slug}`,
             },
         )
 
@@ -228,7 +228,7 @@ const SendgridService = {
                 accept someone from the waitlist.
             `,
                 cta_text: 'Event dashboard',
-                cta_link: `${global.gConfig.FRONTEND_URL}/dashboard/${event.slug}`,
+                cta_link: `${global.gConfig.FRONTEND_URL}/dashboard/event/${event.slug}`,
             },
         )
 
@@ -285,7 +285,7 @@ const SendgridService = {
                 <br />
                 Please refer to finance@hackjunction.com (by replying to this email) with any further questions on the matter.
             `,
-                cta_link: `${global.gConfig.FRONTEND_URL}/dashboard/${event.slug}/travel-grant`,
+                cta_link: `${global.gConfig.FRONTEND_URL}/dashboard/event/${event.slug}/travel-grant`,
                 cta_text: 'Edit your details',
                 reply_to: 'finance@hackjunction.com',
             },

backend/common/services/sendgrid.js

@@ -0,0 +1,44 @@
+//TODO move this code into the user profile helpers
+
+const userProfileUtils = {
+    publicProfileBuilder: profileData => {
+        return {
+            userId: profileData.userId,
+            profile: {
+                firstName: profileData.firstName,
+                lastName: profileData.lastName,
+                email: profileData.email,
+                gender: profileData.gender,
+                nationality: profileData.nationality,
+                countryOfResidence: profileData.countryOfResidence,
+                dateOfBirth: profileData.dateOfBirth,
+                spokenLanguages: profileData.spokenLanguages,
+                // TODO remove profilePicture and replace with avatar property
+                profilePicture: profileData.avatar || null,
+                avatar: profileData.avatar || null,
+                headline: profileData.headline,
+                biography: profileData.biography,
+            },
+            skills: profileData.skills,
+            roles: profileData.roles,
+            industriesOfInterest: profileData.industriesOfInterest,
+            themesOfInterest: profileData.themesOfInterest,
+            education: profileData.education,
+            social: {
+                github: profileData.github,
+                linkedin: profileData.linkedin,
+                portfolio: profileData.portfolio,
+                curriculumVitae: profileData.curriculumVitae,
+            },
+        }
+    },
+    recruitmentProfileBuilder: function (profileData) {
+        return {
+            ...this.publicProfileBuilder(profileData),
+            recruitmentOptions: profileData.recruitmentOptions,
+            registrations: profileData.registrations,
+        }
+    },
+}
+
+module.exports = userProfileUtils

backend/common/utils/userProfileUtils.js

@@ -66,12 +66,31 @@ app.use(require('./common/errors/errorHandler'))
 
 /* Database connection */
 require('./misc/db').connect()
+//let gfs = require('./misc/db').gfs
 
+// const storage = require('./misc/gridfs').storage
+// const upload = require('./misc/gridfs').upload
 const migrations = require('./migrations/index')
 
 /** A clone of the npm library throng, with a minor edit. See the file for details. */
 const throng = require('./misc/throng')
 
+const memoryUsage = () => {
+    const formatMemoryUsage = (data) => `${Math.round(data / 1024 / 1024 * 100) / 100} MB`
+
+    const memoryData = process.memoryUsage()
+
+    const memoryUsage = {
+        rss: `${formatMemoryUsage(memoryData.rss)} -> Resident Set Size - total memory allocated for the process execution`,
+        heapTotal: `${formatMemoryUsage(memoryData.heapTotal)} -> total size of the allocated heap`,
+        heapUsed: `${formatMemoryUsage(memoryData.heapUsed)} -> actual memory used during the execution`,
+        external: `${formatMemoryUsage(memoryData.external)} -> V8 external memory`,
+    }
+
+    console.log(memoryUsage)
+
+}
+
 throng({
     workers: process.env.WEB_CONCURRENCY || 1,
     grace: 1000,
@@ -91,10 +110,20 @@ throng({
         httpServer.listen(PORT, () => {
             logger.info(
                 `Worker ${process.pid} started, listening on port ${httpServer.address().port}`,
-                
+
             )
+
         })
+
+        memoryUsage()
+
+
+
+
     },
+
+
+
     /** This is run only if the master function errors out, which means the
      *  server could not start properly. Workers are automatically revived on failure, if e.g.
      *  the app crashes or runs out of memory while processing a request.

backend/index.js

@@ -0,0 +1,18 @@
+const mongoose = require('mongoose')
+const Promise = require('bluebird')
+
+module.exports = {
+    index: 9,
+    name: '09-add-challengesenabled-false',
+    description: 'if no challenges, set challengesEnabled to false',
+    run: async () => {
+        const nres = await mongoose
+            .model('Event')
+            .updateMany(
+                { challenges: { $exists: true, $size: 0 } },
+                { $set: { challengesEnabled: false } },
+            )
+        console.info('Done with challengesEnabled to false', nres.n, nres.nModified)
+        return Promise.resolve()
+    },
+}

backend/migrations/09-add-challengesenabled-false

@@ -0,0 +1,44 @@
+const mongoose = require('mongoose')
+const Promise = require('bluebird')
+
+module.exports = {
+    index: 11,
+    name: '11-add-emailConfig-to-event',
+    description: 'Add emailConfig to event',
+    run: async () => {
+        // Update emailConfig field
+        const resEmailConfig = await mongoose.model('Event').updateMany(
+            { emailConfig: { $exists: false } },
+            {
+                $set: {
+                    emailConfig: {
+                        senderName: '',
+                        senderEmail: 'noreply@hackjunction.com',
+                        acceptanceEmail: {
+                            title: '',
+                            subtitle: '',
+                            body: '',
+                        },
+                        rejectionEmail: {
+                            title: '',
+                            subtitle: '',
+                            body: '',
+                        },
+                        registrationEmail: {
+                            title: '',
+                            subtitle: '',
+                            body: '',
+                        },
+                    },
+                },
+            },
+        )
+        console.log(
+            'Done updating emailConfig field',
+            resEmailConfig.n,
+            resEmailConfig.nModified,
+        )
+
+        return Promise.resolve()
+    },
+}