fix: notification settings in sidebar

api/internal/features/notification/init.go

@@ -181,6 +181,32 @@ func (m *NotificationManager) SendOrganizationNotification(payload NotificationP
 			}
 			m.sendWebhookNotification(payload.UserID, fmt.Sprintf("User %s (%s) removed from organization %s", data.UserName, data.UserEmail, data.OrganizationName))
 		}
+	case NortificationPayloadTypeCreateOrganization:
+		if org, ok := payload.Data.(shared_types.Organization); ok {
+			message := fmt.Sprintf("Organization '%s' has been created successfully", org.Name)
+			m.sendWebhookNotification(payload.UserID, message)
+			log.Printf("Organization created notification sent for organization: %s", org.Name)
+		}
+	case NotificationPayloadTypeUpdateOrganization:
+		if org, ok := payload.Data.(shared_types.Organization); ok {
+			message := fmt.Sprintf("Organization '%s' has been updated", org.Name)
+			m.sendWebhookNotification(payload.UserID, message)
+			log.Printf("Organization updated notification sent for organization: %s", org.Name)
+		} else if orgReq, ok := payload.Data.(*NotificationOrganizationData); ok {
+			message := fmt.Sprintf("Organization (ID: %s) has been updated", orgReq.OrganizationID)
+			m.sendWebhookNotification(payload.UserID, message)
+			log.Printf("Organization updated notification sent for organization ID: %s", orgReq.OrganizationID)
+		}
+	case NotificationPayloadTypeDeleteOrganization:
+		if orgReq, ok := payload.Data.(shared_types.Organization); ok {
+			message := fmt.Sprintf("Organization '%s' has been deleted", orgReq.Name)
+			m.sendWebhookNotification(payload.UserID, message)
+			log.Printf("Organization deleted notification sent for organization: %s", orgReq.Name)
+		} else if orgReq, ok := payload.Data.(NotificationOrganizationData); ok {
+			message := fmt.Sprintf("Organization (ID: %s) has been deleted", orgReq.OrganizationID)
+			m.sendWebhookNotification(payload.UserID, message)
+			log.Printf("Organization deleted notification sent for organization ID: %s", orgReq.OrganizationID)
+		}
 	}
 }
 

api/internal/features/organization/controller/create_organization.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/go-fuego/fuego"
 	"github.com/raghavyuva/nixopus-api/internal/features/logger"
+	"github.com/raghavyuva/nixopus-api/internal/features/notification"
 	"github.com/raghavyuva/nixopus-api/internal/features/organization/types"
 	"github.com/raghavyuva/nixopus-api/internal/features/supertokens"
 	"github.com/raghavyuva/nixopus-api/internal/utils"
@@ -59,7 +60,7 @@ func (c *OrganizationsController) CreateOrganization(f fuego.ContextWithBody[typ
 		// Don't fail the entire operation for role creation failure
 	}
 
-	// c.Notify(notification.NortificationPayloadTypeCreateOrganization, loggedInUser, r, createdOrganization)
+	c.Notify(notification.NortificationPayloadTypeCreateOrganization, loggedInUser, r, createdOrganization)
 
 	return &types.OrganizationResponse{
 		Status:  "success",

api/internal/features/organization/controller/delete_organization.go

@@ -6,6 +6,7 @@ import (
 	"github.com/go-fuego/fuego"
 	"github.com/google/uuid"
 	"github.com/raghavyuva/nixopus-api/internal/features/logger"
+	"github.com/raghavyuva/nixopus-api/internal/features/notification"
 	"github.com/raghavyuva/nixopus-api/internal/features/organization/types"
 	"github.com/raghavyuva/nixopus-api/internal/utils"
 )
@@ -63,14 +64,23 @@ func (c *OrganizationsController) DeleteOrganization(f fuego.ContextWithBody[typ
 		}
 	}
 
+	// Get organization details before deletion for notification
+	orgToDelete, err := c.service.GetOrganization(organization.ID)
+	if err != nil {
+		return nil, fuego.HTTPError{
+			Err:    err,
+			Status: http.StatusInternalServerError,
+		}
+	}
+
 	if err := c.service.DeleteOrganization(organizationID); err != nil {
 		return nil, fuego.HTTPError{
 			Err:    err,
 			Status: http.StatusInternalServerError,
 		}
 	}
 
-	// c.Notify(notification.NotificationPayloadTypeDeleteOrganization, loggedInUser, r)
+	c.Notify(notification.NotificationPayloadTypeDeleteOrganization, loggedInUser, r, orgToDelete)
 
 	return &types.MessageResponse{
 		Status:  "success",

api/internal/features/organization/controller/remove_organization_user.go

@@ -5,7 +5,9 @@ import (
 
 	"github.com/go-fuego/fuego"
 	"github.com/raghavyuva/nixopus-api/internal/features/logger"
+	"github.com/raghavyuva/nixopus-api/internal/features/notification"
 	"github.com/raghavyuva/nixopus-api/internal/features/organization/types"
+	shared_types "github.com/raghavyuva/nixopus-api/internal/types"
 	"github.com/raghavyuva/nixopus-api/internal/utils"
 )
 
@@ -36,13 +38,65 @@ func (c *OrganizationsController) RemoveUserFromOrganization(f fuego.ContextWith
 		}
 	}
 
+	// Get organization details before removal for notification
+	organization, err := c.service.GetOrganization(user.OrganizationID)
+	if err != nil {
+		return nil, fuego.HTTPError{
+			Err:    err,
+			Status: http.StatusInternalServerError,
+		}
+	}
+
+	// Get user details - we'll fetch from the service's internal storage
+	// Since the service already fetches this, we'll get it after removal
+	// by querying the organization users or we can modify service to return it
+	// For now, let's get it from the request context or fetch after removal
+
+	// Note: The service already fetches the user, but we need it before removal
+	// We'll need to modify the approach - get user info from organization users list
+	orgUsers, err := c.service.GetOrganizationUsersWithRoles(user.OrganizationID)
+	if err != nil {
+		return nil, fuego.HTTPError{
+			Err:    err,
+			Status: http.StatusInternalServerError,
+		}
+	}
+
+	var removedUser *shared_types.User
+	for _, orgUser := range orgUsers {
+		if orgUser.User.ID.String() == user.UserID {
+			removedUser = orgUser.User
+			break
+		}
+	}
+
+	if removedUser == nil {
+		return nil, fuego.HTTPError{
+			Err:    types.ErrUserNotInOrganization,
+			Status: http.StatusBadRequest,
+		}
+	}
+
 	if err := c.service.RemoveUserFromOrganization(&user); err != nil {
 		return nil, fuego.HTTPError{
 			Err:    err,
 			Status: http.StatusInternalServerError,
 		}
 	}
 
+	// Send notification to organization admins about user removal
+	notificationData := notification.RemoveUserFromOrganizationData{
+		NotificationBaseData: notification.NotificationBaseData{
+			IP:      r.RemoteAddr,
+			Browser: r.UserAgent(),
+		},
+		OrganizationName: organization.Name,
+		UserName:         removedUser.Username,
+		UserEmail:        removedUser.Email,
+	}
+
+	c.Notify(notification.NotificationPayloadTypeRemoveUserFromOrganization, loggedInUser, r, notificationData)
+
 	return &types.MessageResponse{
 		Status:  "success",
 		Message: "User removed from organization successfully",

api/internal/features/organization/controller/update_organization.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	"github.com/go-fuego/fuego"
+	"github.com/raghavyuva/nixopus-api/internal/features/notification"
 	"github.com/raghavyuva/nixopus-api/internal/features/organization/types"
 	"github.com/raghavyuva/nixopus-api/internal/utils"
 )
@@ -33,7 +34,11 @@ func (c *OrganizationsController) UpdateOrganization(f fuego.ContextWithBody[typ
 		}
 	}
 
-	// c.Notify(notification.NotificationPayloadTypeUpdateOrganization, loggedInUser, r)
+	// Get updated organization for notification
+	updatedOrg, err := c.service.GetOrganization(organization.ID)
+	if err == nil {
+		c.Notify(notification.NotificationPayloadTypeUpdateOrganization, loggedInUser, r, updatedOrg)
+	}
 
 	return &types.MessageResponse{
 		Status:  "success",

view/app/settings/hooks/use-notification-settings.ts

@@ -103,36 +103,32 @@ function useNotificationSettings() {
     useUpdateNotificationPreferencesMutation();
 
   const handleOnSave = async (data: SMTPFormData) => {
-    try {
-      const smtpConfig = {
-        host: data.smtp_host,
-        port: parseInt(data.smtp_port),
-        username: data.smtp_username,
-        password: data.smtp_password,
-        from_email: data.smtp_from_email,
-        from_name: data.smtp_from_name
-      };
-      if (smtpConfigs?.id) {
-        await handleUpdateSMTPConfiguration({
-          ...smtpConfig,
-          id: smtpConfigs.id,
-          organization_id: activeOrganization?.id || ''
-        });
-      } else {
-        await handleCreateSMTPConfiguration({
-          ...smtpConfig,
-          organization_id: activeOrganization?.id || ''
-        });
-      }
-    } catch (error) {
-      toast.error(t('settings.notifications.messages.email.error'));
+    const smtpConfig = {
+      host: data.smtp_host,
+      port: parseInt(data.smtp_port),
+      username: data.smtp_username,
+      password: data.smtp_password,
+      from_email: data.smtp_from_email,
+      from_name: data.smtp_from_name
+    };
+    if (smtpConfigs?.id) {
+      await handleUpdateSMTPConfiguration({
+        ...smtpConfig,
+        id: smtpConfigs.id,
+        organization_id: activeOrganization?.id || ''
+      });
+    } else {
+      await handleCreateSMTPConfiguration({
+        ...smtpConfig,
+        organization_id: activeOrganization?.id || ''
+      });
     }
   };
 
   const handleUpdatePreference = async (id: string, enabled: boolean) => {
+    const category = getPreferenceCategoryFromId(id);
+    const type = getPreferenceTypeFromId(id);
     try {
-      const category = getPreferenceCategoryFromId(id);
-      const type = getPreferenceTypeFromId(id);
       await updateNotificationPreferences({
         category,
         type,
@@ -187,6 +183,17 @@ function useNotificationSettings() {
     }
   };
 
+  const isLoading =
+    isLoadingSMTP ||
+    isLoadingSlack ||
+    isLoadingDiscord ||
+    isLoadingPreferences ||
+    isCreatingSMTP ||
+    isUpdatingSMTP ||
+    isCreatingWebhook ||
+    isUpdatingWebhook ||
+    isUpdatingPreferences;
+
   return {
     smtpConfigs,
     slackConfig,
@@ -196,16 +203,11 @@ function useNotificationSettings() {
     handleUpdateWebhookConfig,
     handleDeleteWebhookConfig,
     preferences,
-    isLoading:
-      isLoadingSMTP ||
-      isLoadingSlack ||
-      isLoadingDiscord ||
-      isLoadingPreferences ||
-      isCreatingSMTP ||
-      isUpdatingSMTP ||
-      isCreatingWebhook ||
-      isUpdatingWebhook ||
-      isUpdatingPreferences,
+    isLoading,
+    isLoadingPreferences,
+    isLoadingSMTP,
+    isLoadingSlack,
+    isLoadingDiscord,
     error: smtpError || slackError || discordError,
     handleUpdatePreference
   };