#217 Ft update profile (#157)

* update schema to include bio and manager

* setup image uploading

---------

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

Author: berniceu

Diff for: package.json

@@ -42,6 +42,7 @@
     "axios": "^1.7.7",
     "bcrypt": "^5.1.1",
     "bcryptjs": "^2.4.3",
+    "cloudinary": "^2.5.1",
     "dotenv": "^16.0.2",
     "google-auth-library": "^8.7.0",
     "googleapis": "^108.0.1",

Diff for: src/config/cloudinary.ts

@@ -0,0 +1,9 @@
+import { v2 as cloudinary } from 'cloudinary';
+
+cloudinary.config({
+    cloud_name: process.env.CLOUDINARY_CLOUD_NAME,
+    api_key: process.env.CLOUDINARY_API_KEY,
+    api_secret: process.env.CLOUDINARY_API_SECRET,
+})
+
+export default cloudinary;

Diff for: src/models/AuthUser.ts

@@ -13,6 +13,10 @@ const userSchema = new Schema(
       type: String,
       default: process.env.DEFAULT_AVATAR,
     },
+    bio: {
+      type: String,
+      default: "",
+    },
     isVerified:{
       type:Boolean,
       default:false

Diff for: src/models/cohortModel.ts

@@ -32,6 +32,9 @@ export const cohortModels = mongoose.model('cohortModel',
         trainees: [{
             type: Schema.Types.ObjectId,
             ref: "Trainees",
-        }]
+        }], 
+        manager: {
+            type: String,
+        }
     })
 )

Diff for: src/resolvers/loginUserResolver.ts

@@ -13,6 +13,7 @@ import { sessionModel } from '../models/session';
 import { cohortModels } from '../models/cohortModel';
 import TraineeApplicant from '../models/traineeApplicant';
 import { publishNotification } from './adminNotificationsResolver';
+import { uploadImage } from '../utils/uploadImage';
 
 const FrontendUrl = process.env.FRONTEND_URL
 
@@ -26,15 +27,17 @@ export const loggedUserResolvers: any = {
 
       const userWithRole = await LoggedUserModel.findById(
         ctx.currentUser._id
-      ).populate("role");
+      ).populate("role")
+      .populate('cohort')
 
       const userId = userWithRole?._id.toString();
 
       if (userId !== id) {
         throw new AuthenticationError("Unauthorized to update  user.");
       }
-      const upvalue = await LoggedUserModel.findById(id).populate("role");
-      return upvalue;
+      // const upvalue = await LoggedUserModel.findById(id).populate("role");
+      // return upvalue;
+      return userWithRole
     },
     async getUsers_Logged(_: any, args: any, ctx: any, amount: any) {
       const users = await LoggedUserModel.find()
@@ -94,6 +97,7 @@ export const loggedUserResolvers: any = {
           password,
           role,
           applicationPhase,
+          bio,
         },
       }: any,
       ctx: any
@@ -135,6 +139,7 @@ export const loggedUserResolvers: any = {
             country,
             role,
             applicationPhase: applicationPhase || "Applied",
+            bio,
           });
           const res: any = await createdUser.save();
           await sendEmailTemplate(
@@ -170,6 +175,7 @@ export const loggedUserResolvers: any = {
           email,
           code,
           password,
+          bio,
         });
         if (error) {
           throw new Error(
@@ -228,6 +234,7 @@ export const loggedUserResolvers: any = {
           gender,
           country,
           role: role._id.toString(),
+          bio,
         });
 
         const res: any = await createdUser.save();
@@ -373,6 +380,7 @@ export const loggedUserResolvers: any = {
           picture,
           code,
           password,
+          bio,
         },
       }: any,
       ctx: any
@@ -382,9 +390,23 @@ export const loggedUserResolvers: any = {
         lastname,
         email,
         telephone,
-        picture,
         code,
+        bio,
       };
+
+      if(picture){
+        try {
+          const uploadResult = await uploadImage(
+            picture,
+            'profile_pictures',
+            `user_${ID}_profile`
+          );
+          updateData.picture = uploadResult.url;
+
+        } catch(err){
+          throw new Error('Failed to upload picture');
+        }
+      }
       if (!ctx.currentUser) {
         throw new AuthenticationError("You must be logged in");
       }
@@ -414,7 +436,7 @@ export const loggedUserResolvers: any = {
 
     async updateUserSelf(
       _: any,
-      { ID, editUserInput: { firstname, lastname, gender, code, country, telephone, picture } }: any, ctx: any) {
+      { ID, editUserInput: { firstname, lastname, gender, code, country, telephone, picture, bio } }: any, ctx: any) {
 
       if (!ctx.currentUser) {
         throw new AuthenticationError('You must be logged in');
@@ -431,6 +453,7 @@ export const loggedUserResolvers: any = {
       if (country) updateFields.country = country;
       if (telephone) updateFields.telephone = telephone;
       if (picture) updateFields.picture = picture;
+      if(bio) updateFields.bio = bio;
 
       const wasEdited = (
         await LoggedUserModel.updateOne(

Diff for: src/schema/cohortScheme.ts

@@ -10,6 +10,8 @@ export const cohortSchema = gql`
 		end: String
 		phase: String
 		trainees:[traineeApplicant]
+		manager: String
+
 		
 	}
 
@@ -25,6 +27,7 @@ export const cohortSchema = gql`
         start: String!
         end: String!
 		phase: String!
+		manager: String
   }
   input updateCohortInput {
     title: String
@@ -33,6 +36,7 @@ export const cohortSchema = gql`
     start: String
     end: String
     phase: String
+	manager: String
   }
 
 	type Mutation {

Diff for: src/schema/loggedUser.ts

@@ -19,6 +19,7 @@ export const LoggedUserSchema = gql`
     isActive: Boolean,
     applicationPhase: String,
     cohort: Cohort
+    bio: String,
 
     isVerified:Boolean
   }
@@ -39,6 +40,7 @@ export const LoggedUserSchema = gql`
 		end: String
 		phase: Int
 		trainees:[User_Logged!]
+    manager: String
   }
 
   type CurrentUser{
@@ -59,6 +61,7 @@ export const LoggedUserSchema = gql`
     country: String
     role: String
     applicationPhase: String
+    bio: String
   }
   input EditUserSelfInput_Logged {
     firstname: String
@@ -68,6 +71,7 @@ export const LoggedUserSchema = gql`
     telephone: String
     gender: String
     country: String
+    bio: String
   }
   input EditUserInput_Logged {
     firstname: String
@@ -79,6 +83,7 @@ export const LoggedUserSchema = gql`
     picture:String
     applicationPhase: String
     cohortId: ID
+    bio: String
   }
   input EmailInput {
     email: String

Diff for: src/utils/uploadImage.ts

@@ -0,0 +1,28 @@
+import cloudinary from "../config/cloudinary";
+
+export const uploadImage = async (
+    base64Image: string,
+    folder: string = 'profile_picture',
+    public_id?: string
+) => {
+    try{
+        const options = {
+            folder,
+            public_id,
+            allowed_formats: ['jpg', 'png', 'jpeg', 'gif'],
+            transformation: [
+                {width: 500, height: 500, crop: 'limit'},
+                {quality: 'auto'}
+            ]
+        };
+
+        const result = await cloudinary.uploader.upload(base64Image, options);
+        return {
+            url: result.secure_url,
+            public_id: result.public_id
+        }
+    } catch(err){
+        console.error('Cloudinary upload error:', err);
+        throw new Error('Failed to upload image to Cloudinary');
+    }
+}