Status field to enum

server/action/organisation/user/create.go

@@ -117,15 +117,15 @@ func create(w http.ResponseWriter, r *http.Request) {
 				CreatedByID: uint(currentUID),
 			},
 			InviteeID:      invitee.ID,
-			Status:         false,
+			Status:         model.Pending,
 			Role:           user.Role,
 			OrganisationID: uint(orgID),
 			ExpiredAt:      time.Now().AddDate(0, 0, 7),
 		}
 
 		var invitationCount int64
 		err = tx.Model(&model.Invitation{}).
-			Where("invitee_id=? AND organisation_id=? AND status=? AND role=? AND expired_at<?", invitee.ID, uint(orgID), invitation.Status, invitation.Role, time.Now().AddDate(0, 0, 7)).
+			Where("invitee_id=? AND organisation_id=? AND role=? AND expired_at<? AND status IN (?)", invitee.ID, uint(orgID), invitation.Role, time.Now().AddDate(0, 0, 7), []model.Status{model.Pending, model.Accepted}).
 			Count(&invitationCount).Error
 
 		if err != nil {

server/action/profile/invite/accept.go

@@ -62,7 +62,7 @@ func accept(w http.ResponseWriter, r *http.Request) {
 	}
 
 	tx := model.DB.Begin()
-	err = tx.Model(&model.Invitation{}).Where(&filter).Update("status", true).Error
+	err = tx.Model(&model.Invitation{}).Where(&filter).Update("status", model.Accepted).Error
 	if err != nil {
 		loggerx.Error(err)
 		tx.Rollback()

server/action/profile/invite/delete.go

@@ -36,7 +36,11 @@ func delete(w http.ResponseWriter, r *http.Request) {
 		},
 	}
 
-	tx.Where(&invites).Delete(&invites)
+	// invitationed is being deleted
+	// instead of deleting, updating the status to rejected
+	// tx.Where(&invites).Delete(&invites)
+	tx.Where(&invites).Update("Status", model.Rejected)
 	tx.Commit()
+
 	renderx.JSON(w, http.StatusOK, nil)
 }

server/action/profile/invite/list.go

@@ -38,7 +38,7 @@ func listInvitations(w http.ResponseWriter, r *http.Request) {
 	var invitationContext model.ContextKey = "invitation_user"
 	tx := model.DB.WithContext(context.WithValue(r.Context(), invitationContext, userID)).Begin()
 	invitationList := make([]model.Invitation, 0)
-	err = tx.Model(model.Invitation{}).Where("invitee_id=? AND status=? and expired_at>?", uint(userID), false, time.Now()).Find(&invitationList).Error
+	err = tx.Model(model.Invitation{}).Where("invitee_id=? AND status=? and expired_at>?", uint(userID), model.Pending, time.Now()).Find(&invitationList).Error
 	if err != nil {
 		tx.Rollback()
 		loggerx.Error(err)

server/model/invitation.go

@@ -2,13 +2,21 @@ package model
 
 import "time"
 
-//Invitation model definition
+type Status string
+
+const (
+	Pending  Status = "pending"
+	Rejected Status = "rejected"
+	Accepted Status = "accepted"
+)
+
+// Invitation model definition
 type Invitation struct {
 	Base
 	InviteeID      uint      `gorm:"column:invitee_id" json:"invitee_id"`
 	OrganisationID uint      `gorm:"column:organisation_id" json:"organisation_id"`
 	Role           string    `gorm:"column:role" json:"role"`
-	Status         bool      `gorm:"column:status" json:"status"`
+	Status         Status    `gorm:"column:status" json:"status"`
 	ExpiredAt      time.Time `json:"expired_at"`
 }