refactor: add stream for list invitee invitations method

Signed-off-by: Felix Gateru <[email protected]>

Author: felixgateru

domains/events/events.go

@@ -26,7 +26,7 @@ const (
 	invitationAccept      = invitationPrefix + "accept"
 	invitationReject      = invitationPrefix + "reject"
 	invitationList        = invitationPrefix + "list"
-	InvitationListInvitee = invitationPrefix + "list_invitee"
+	invitationListInvitee = invitationPrefix + "list_invitee"
 	invitationRetrieve    = invitationPrefix + "retrieve"
 	invitationDelete      = invitationPrefix + "delete"
 )
@@ -43,7 +43,7 @@ var (
 	_ events.Event = (*sendInvitationEvent)(nil)
 	_ events.Event = (*viewInvitationEvent)(nil)
 	_ events.Event = (*listInvitationsEvent)(nil)
-
+	_ events.Event = (*listInviteeInvitationsEvent)(nil)
 	_ events.Event = (*acceptInvitationEvent)(nil)
 	_ events.Event = (*rejectInvitationEvent)(nil)
 	_ events.Event = (*deleteInvitationEvent)(nil)
@@ -387,7 +387,7 @@ type listInviteeInvitationsEvent struct {
 
 func (lie listInviteeInvitationsEvent) Encode() (map[string]interface{}, error) {
 	val := map[string]interface{}{
-		"operation":       InvitationListInvitee,
+		"operation":       invitationListInvitee,
 		"offset":          lie.Offset,
 		"limit":           lie.Limit,
 		"invitee_user_id": lie.InviteeUserID,

domains/events/streams.go

@@ -16,20 +16,21 @@ import (
 )
 
 const (
-	supermqPrefix            = "supermq."
-	createStream             = supermqPrefix + domainCreate
-	retrieveStream           = supermqPrefix + domainRetrieve
-	updateStream             = supermqPrefix + domainUpdate
-	enableStream             = supermqPrefix + domainEnable
-	disableStream            = supermqPrefix + domainDisable
-	freezeStream             = supermqPrefix + domainFreeze
-	listStream               = supermqPrefix + domainList
-	sendInvitationStream     = supermqPrefix + invitationSend
-	acceptInvitationStream   = supermqPrefix + invitationAccept
-	rejectInvitationStream   = supermqPrefix + invitationReject
-	listInvitationsStream    = supermqPrefix + invitationList
-	retrieveInvitationStream = supermqPrefix + invitationRetrieve
-	deleteInvitationStream   = supermqPrefix + invitationDelete
+	supermqPrefix                = "supermq."
+	createStream                 = supermqPrefix + domainCreate
+	retrieveStream               = supermqPrefix + domainRetrieve
+	updateStream                 = supermqPrefix + domainUpdate
+	enableStream                 = supermqPrefix + domainEnable
+	disableStream                = supermqPrefix + domainDisable
+	freezeStream                 = supermqPrefix + domainFreeze
+	listStream                   = supermqPrefix + domainList
+	sendInvitationStream         = supermqPrefix + invitationSend
+	acceptInvitationStream       = supermqPrefix + invitationAccept
+	rejectInvitationStream       = supermqPrefix + invitationReject
+	listInvitationsStream        = supermqPrefix + invitationList
+	listInviteeInvitationsStream = supermqPrefix + invitationListInvitee
+	retrieveInvitationStream     = supermqPrefix + invitationRetrieve
+	deleteInvitationStream       = supermqPrefix + invitationDelete
 )
 
 var _ domains.Service = (*eventStore)(nil)
@@ -263,7 +264,7 @@ func (es *eventStore) ListInviteeInvitations(ctx context.Context, session authn.
 		session:            session,
 	}
 
-	if err := es.Publish(ctx, listInvitationsStream, event); err != nil {
+	if err := es.Publish(ctx, listInviteeInvitationsStream, event); err != nil {
 		return ip, err
 	}
 

domains/postgres/invitations.go

@@ -53,7 +53,7 @@ func (repo domainRepo) RetrieveInvitation(ctx context.Context, inviteeUserID, do
 }
 
 func (repo domainRepo) RetrieveAllInvitations(ctx context.Context, pm domains.InvitationPageMeta) (domains.InvitationPage, error) {
-	query := pageQuery(pm, false)
+	query := pageQuery(pm)
 
 	q := fmt.Sprintf(`
 		SELECT
@@ -162,18 +162,24 @@ func (repo domainRepo) DeleteInvitation(ctx context.Context, inviteeUserID, doma
 	return nil
 }
 
-func pageQuery(pm domains.InvitationPageMeta, invitee bool) string {
+func pageQuery(pm domains.InvitationPageMeta) string {
 	var query []string
 	var emq string
 	if pm.DomainID != "" {
 		query = append(query, "i.domain_id = :domain_id")
 	}
+	if pm.InviteeUserID != "" {
+		query = append(query, "i.invitee_user_id = :invitee_user_id")
+	}
 	if pm.InvitedBy != "" {
 		query = append(query, "i.invited_by = :invited_by")
 	}
 	if pm.RoleID != "" {
 		query = append(query, "i.role_id = :role_id")
 	}
+	if pm.InvitedByOrUserID != "" {
+		query = append(query, "(i.invited_by = :invited_by_or_user_id OR i.invitee_user_id = :invited_by_or_user_id)")
+	}
 	if pm.State == domains.Accepted {
 		query = append(query, "i.confirmed_at IS NOT NULL")
 	}
@@ -183,15 +189,6 @@ func pageQuery(pm domains.InvitationPageMeta, invitee bool) string {
 	if pm.State == domains.Rejected {
 		query = append(query, "i.rejected_at IS NOT NULL")
 	}
-	if invitee && len(query) > 0 {
-		return fmt.Sprintf("AND %s", strings.Join(query, " AND "))
-	}
-	if pm.InviteeUserID != "" {
-		query = append(query, "i.invitee_user_id = :invitee_user_id")
-	}
-	if pm.InvitedByOrUserID != "" {
-		query = append(query, "(i.invited_by = :invited_by_or_user_id OR i.invitee_user_id = :invited_by_or_user_id)")
-	}
 
 	if len(query) > 0 {
 		emq = fmt.Sprintf("WHERE %s", strings.Join(query, " AND "))