Add a CCE Minor Note feature attached to the Notes section in the User profile

app/controllers/main/routes.py

@@ -37,7 +37,7 @@
 from app.logic.landingPage import getManagerProgramDict, getActiveEventTab
 from app.logic.minor import toggleMinorInterest, declareMinorInterest, getCommunityEngagementByTerm, getEngagementTotal
 from app.logic.participants import unattendedRequiredEvents, trainedParticipants, getParticipationStatusForTrainings, checkUserRsvp, addPersonToEvent
-from app.logic.users import addUserInterest, removeUserInterest, banUser, unbanUser, isEligibleForProgram, getUserBGCheckHistory, addProfileNote, deleteProfileNote, updateDietInfo
+from app.logic.users import  addUserInterest, removeUserInterest, banUser, unbanUser, isEligibleForProgram, getUserBGCheckHistory,addProfileNote, deleteProfileNote, updateDietInfo, updateProfileNote, getProfileNoteData
 
 @main_bp.route('/logout', methods=['GET'])
 def redirectToLogout():
@@ -378,21 +378,46 @@ def eventTravelForm(eventID):
                            userList = userList,
                            )
 
-@main_bp.route('/profile/addNote', methods=['POST'])
+@main_bp.route("/profile/addNote", methods=["POST"])
 def addNote():
-    """
-    This function adds a note to the user's profile.
-    """
-    postData = request.form
     try:
-        note = addProfileNote(postData["visibility"], postData["bonner"] == "yes", postData["noteTextbox"], postData["username"])
+        noteData = getProfileNoteData(request.form,  includeUsername=True, )
+        addProfileNote(**noteData)
         flash("Successfully added profile note", "success")
-        return redirect(url_for("main.viewUsersProfile", username=postData["username"]))
-    except Exception as e:
-        print("Error adding note", e)
+    except ValueError as error:
+        flash(str(error), "danger")
+        return str(error), 400
+    except User.DoesNotExist:
+        flash("User not found", "danger")
+        return "User not found", 404
+    except Exception as error:
+        print("Error adding profile note:", error)
         flash("Failed to add profile note", "danger")
         return "Failed to add profile note", 500
+    return "success"
 
+@main_bp.route("/<username>/editNote", methods=["POST"])
+def editProfileNote(username):
+    try:
+        noteData = getProfileNoteData( request.form,includeId=True, )
+        profileNote = ProfileNote.get_by_id( noteData["profileNoteID"] )
+        if profileNote.user.username != username:
+            abort(403)
+        if ( profileNote.note.createdBy != g.current_user and not g.current_user.isCeltsAdmin ):
+            abort(403)
+        updateProfileNote(**noteData)
+        flash("Successfully updated profile note", "success")
+    except ValueError as error:
+        flash(str(error), "danger")
+        return str(error), 400
+    except ProfileNote.DoesNotExist:
+        flash("Profile note not found", "danger")
+        return "Profile note not found", 404
+    except Exception as error:
+        print("Error updating profile note:", error)
+        flash("Failed to update profile note", "danger")
+        return "Failed to update profile note", 500
+    return "success"
 
 @main_bp.route('/<username>/deleteNote', methods=['POST'])
 def deleteNote(username):

app/logic/users.py

@@ -123,20 +123,48 @@ def getUserBGCheckHistory(username):
     for row in allBackgroundChecks:
         bgHistory[row.type_id].append(row)
     return bgHistory
-
-def addProfileNote(visibility, bonner, noteTextbox, username):
+def getProfileNoteData(formData, includeUsername=False, includeId=False):
+    noteData = {
+        "visibility": int(formData.get("visibility", 1)),
+        "bonner": formData.get("bonner") == "yes",
+        "cceMinor": formData.get("cceMinor") == "yes",
+        "noteTextbox": formData.get("noteTextbox", "").strip(),
+    }
+    if not noteData["noteTextbox"]:
+        raise ValueError("Note cannot be empty")
+    if includeUsername:
+        noteData["username"] = formData.get("username")
+        if not noteData["username"]:
+            raise ValueError("Missing username")
+    if includeId:
+        noteData["profileNoteID"] = formData.get("id")
+        if not noteData["profileNoteID"]:
+            raise ValueError("Missing profile note ID")
+    return noteData
+
+def addProfileNote(visibility, bonner, cceMinor, noteTextbox, username):
+    user = User.get(User.username == username)
+    visibility = int(visibility)
     if bonner:
-        visibility = 1 # bonner notes are always admins and the student
+        visibility = 1
 
-    noteForDb = Note.create(createdBy = g.current_user,
-                            createdOn = datetime.datetime.now(),
-                            noteContent = noteTextbox,
-                            noteType = "profile")
-    createProfileNote = ProfileNote.create(user = User.get(User.username == username),
-                                           note = noteForDb,
-                                           isBonnerNote = bonner,
-                                           viewTier = visibility)
-    return createProfileNote
+    noteForDb = Note.create( createdBy=g.current_user, createdOn=datetime.datetime.now(),  noteContent=noteTextbox, noteType="profile" )
+    profileNote = ProfileNote.create( user=user, note=noteForDb, isBonnerNote=bonner, isCCEMinorNote=cceMinor, viewTier=visibility, )
+    return profileNote
+
+def updateProfileNote( profileNoteID, visibility, bonner, cceMinor, noteTextbox):
+    profileNote = ProfileNote.get_by_id(profileNoteID)
+    visibility = int(visibility)
+    if bonner:
+        visibility = 1
+    note = profileNote.note
+    note.noteContent = noteTextbox
+    note.save()
+    profileNote.viewTier = visibility
+    profileNote.isBonnerNote = bonner
+    profileNote.isCCEMinorNote = cceMinor
+    profileNote.save()
+    return profileNote
 
 def deleteProfileNote(noteId):
     return ProfileNote.delete().where(ProfileNote.id == noteId).execute()

app/models/profileNote.py

@@ -2,8 +2,10 @@
 from app.models.user import User
 from app.models.note import Note
 
+
 class ProfileNote(baseModel):
     user = ForeignKeyField(User)
     note = ForeignKeyField(Note, null=False)
     isBonnerNote = BooleanField(default=False)
-    viewTier = IntegerField(default=3)
+    isCCEMinorNote = BooleanField(default=False)
+    viewTier = IntegerField(default=3)