Fix trainee attendance (#385)

* fix(attendance): move attendance calculation logic from client to server

* fix-trainee-attendance

---------

Co-authored-by: aimedivin <[email protected]>

Author: Calebgisa72

src/resolvers/userResolver.ts

@@ -115,7 +115,7 @@ const resolvers: any = {
   Query: {
 
     async getOrganizations(_: any, __: any, context: Context) {
-      ; (await checkUserLoggedIn(context))([RoleOfUser.SUPER_ADMIN])
+      ;(await checkUserLoggedIn(context))([RoleOfUser.SUPER_ADMIN])
 
       return Organization.find()
     },
@@ -169,7 +169,7 @@ const resolvers: any = {
       { organisation, username }: any,
       context: Context
     ) {
-      ; (await checkUserLoggedIn(context))([
+      ;(await checkUserLoggedIn(context))([
         RoleOfUser.ADMIN,
         RoleOfUser.COORDINATOR,
         'trainee',
@@ -181,7 +181,7 @@ const resolvers: any = {
         name: organisation,
       })
       if (!organisationExists)
-        throw new Error('This Organization doesn\'t exist')
+        throw new Error("This Organization doesn't exist")
 
       organisation = organisationExists.gitHubOrganisation
 
@@ -531,9 +531,9 @@ const resolvers: any = {
       ]
       const org = await checkLoggedInOrganization(orgToken)
       const roleExists = allRoles.includes(name)
-      if (!roleExists) throw new Error('This role doesn\'t exist')
+      if (!roleExists) throw new Error("This role doesn't exist")
       const userExists = await User.findById(id)
-      if (!userExists) throw new Error('User doesn\'t exist')
+      if (!userExists) throw new Error("User doesn't exist")
 
       const getAllUsers = await User.find({
         role: RoleOfUser.ADMIN,
@@ -770,7 +770,7 @@ const resolvers: any = {
       context: Context
     ) {
       // check if requester is super admin
-      ; (await checkUserLoggedIn(context))([RoleOfUser.SUPER_ADMIN])
+      ;(await checkUserLoggedIn(context))([RoleOfUser.SUPER_ADMIN])
       const orgExists = await Organization.findOne({ name: name })
       if (action == 'approve') {
         if (!orgExists) {
@@ -840,7 +840,7 @@ const resolvers: any = {
       context: Context
     ) {
       // the below commented line help to know if the user is an superAdmin to perform an action of creating an organization
-      ; (await checkUserLoggedIn(context))([RoleOfUser.SUPER_ADMIN])
+      ;(await checkUserLoggedIn(context))([RoleOfUser.SUPER_ADMIN])
       if (action == 'new') {
         const orgExists = await Organization.findOne({ name: name })
         if (orgExists) {
@@ -905,7 +905,7 @@ const resolvers: any = {
       { name, gitHubOrganisation }: any,
       context: Context
     ) {
-      ; (await checkUserLoggedIn(context))([
+      ;(await checkUserLoggedIn(context))([
         RoleOfUser.ADMIN,
         RoleOfUser.SUPER_ADMIN,
       ])
@@ -998,15 +998,15 @@ const resolvers: any = {
     },
 
     async deleteOrganization(_: any, { id }: any, context: Context) {
-      ; (await checkUserLoggedIn(context))([
+      ;(await checkUserLoggedIn(context))([
         RoleOfUser.ADMIN,
         RoleOfUser.SUPER_ADMIN,
       ])
 
       const organizationExists = await Organization.findOne({ _id: id })
 
       if (!organizationExists)
-        throw new Error('This Organization doesn\'t exist')
+        throw new Error("This Organization doesn't exist")
       await Cohort.deleteMany({ organization: id })
       await Team.deleteMany({ organization: id })
       await Phase.deleteMany({ organization: id })
@@ -1084,7 +1084,7 @@ const resolvers: any = {
       if (password === confirmPassword) {
         const user: any = await User.findOne({ email })
         if (!user) {
-          throw new Error('User doesn\'t exist! ')
+          throw new Error("User doesn't exist! ")
         }
         user.password = password
         await user.save()

src/schema/index.ts

@@ -192,7 +192,7 @@ const Schema = gql`
     description: String
   }
 
-  type Rating {
+    type Rating {
     id: ID!
     user: User!
     sprint: Int!
@@ -206,6 +206,8 @@ const Schema = gql`
     cohort: Cohort!
     average: String
     feedbacks: [RatingMessageTemp]
+    createdAt: String
+    updatedAt: String
   }
 
   type AddRating {