Added add/remove member to group, and test for group

gql_cataclysm
noah metz 2023-10-11 18:11:24 -06:00
parent 190824e710
commit ae289705bb
5 changed files with 148 additions and 17 deletions

@ -1294,6 +1294,16 @@ func NewContext(db * badger.DB, log Logger) (*Context, error) {
return nil, err return nil, err
} }
err = ctx.RegisterSignal(reflect.TypeOf(RemoveMemberSignal{}), RemoveMemberSignalType)
if err != nil {
return nil, err
}
err = ctx.RegisterSignal(reflect.TypeOf(AddMemberSignal{}), AddMemberSignalType)
if err != nil {
return nil, err
}
err = ctx.RegisterSignal(reflect.TypeOf(StopSignal{}), StopSignalType) err = ctx.RegisterSignal(reflect.TypeOf(StopSignal{}), StopSignalType)
if err != nil { if err != nil {
return nil, err return nil, err

@ -517,9 +517,7 @@ func GQLHandler(ctx *Context, server *Node, gql_ext *GQLExt) func(http.ResponseW
params.VariableValues = query.Variables params.VariableValues = query.Variables
} }
ctx.Log.Logf("gql", "PARAMS: %+v", params)
result := graphql.Do(params) result := graphql.Do(params)
ctx.Log.Logf("gql", "RESULT: %+v", result)
if len(result.Errors) > 0 { if len(result.Errors) > 0 {
extra_fields := map[string]interface{}{} extra_fields := map[string]interface{}{}
extra_fields["body"] = string(str) extra_fields["body"] = string(str)

@ -1,8 +1,45 @@
package graphvent package graphvent
import ( import (
"slices"
) )
type AddMemberSignal struct {
SignalHeader
MemberID NodeID `gv:"member_id"`
}
func (signal AddMemberSignal) Permission() Tree {
return Tree{
SerializedType(AddMemberSignalType): nil,
}
}
func NewAddMemberSignal(member_id NodeID) *AddMemberSignal {
return &AddMemberSignal{
NewSignalHeader(Direct),
member_id,
}
}
type RemoveMemberSignal struct {
SignalHeader
MemberID NodeID `gv:"member_id"`
}
func (signal RemoveMemberSignal) Permission() Tree {
return Tree{
SerializedType(RemoveMemberSignalType): nil,
}
}
func NewRemoveMemberSignal(member_id NodeID) *RemoveMemberSignal {
return &RemoveMemberSignal{
NewSignalHeader(Direct),
member_id,
}
}
var GroupReadPolicy = NewAllNodesPolicy(Tree{ var GroupReadPolicy = NewAllNodesPolicy(Tree{
SerializedType(ReadSignalType): { SerializedType(ReadSignalType): {
SerializedType(GroupExtType): { SerializedType(GroupExtType): {
@ -22,6 +59,29 @@ func NewGroupExt(members []NodeID) *GroupExt {
} }
func (ext *GroupExt) Process(ctx *Context, node *Node, source NodeID, signal Signal) (Messages, Changes) { func (ext *GroupExt) Process(ctx *Context, node *Node, source NodeID, signal Signal) (Messages, Changes) {
return nil, nil var messages Messages = nil
var changes Changes = nil
switch sig := signal.(type) {
case *AddMemberSignal:
if slices.Contains(ext.Members, sig.MemberID) == true {
messages = messages.Add(ctx, node.ID, node.Key, NewErrorSignal(sig.Id, "already_member"), source)
} else {
ext.Members = append(ext.Members, sig.MemberID)
messages = messages.Add(ctx, node.ID, node.Key, NewSuccessSignal(sig.Id), source)
changes = changes.Add("member_added")
}
case *RemoveMemberSignal:
idx := slices.Index(ext.Members, sig.MemberID)
if idx == -1 {
messages = messages.Add(ctx, node.ID, node.Key, NewErrorSignal(sig.Id, "not_member"), source)
} else {
ext.Members = slices.Delete(ext.Members, idx, idx+1)
messages = messages.Add(ctx, node.ID, node.Key, NewSuccessSignal(sig.Id), source)
changes = changes.Add("member_removed")
}
}
return messages, changes
} }

@ -0,0 +1,61 @@
package graphvent
import (
"testing"
"time"
)
func TestGroupAdd(t *testing.T) {
ctx := logTestContext(t, []string{"listener", "test"})
group_listener := NewListenerExt(10)
group, err := NewNode(ctx, nil, GroupNodeType, 10, nil, group_listener, NewGroupExt(nil))
fatalErr(t, err)
user_id := RandID()
add_member_signal := NewAddMemberSignal(user_id)
messages := Messages{}
messages = messages.Add(ctx, group.ID, group.Key, add_member_signal, group.ID)
fatalErr(t, ctx.Send(messages))
_, err = WaitForResponse(group_listener.Chan, 10*time.Millisecond, add_member_signal.Id)
fatalErr(t, err)
read_signal := NewReadSignal(map[ExtType][]string{
GroupExtType: {"members"},
})
messages = Messages{}
messages = messages.Add(ctx, group.ID, group.Key, read_signal, group.ID)
fatalErr(t, ctx.Send(messages))
response, err := WaitForResponse(group_listener.Chan, 10*time.Millisecond, read_signal.Id)
fatalErr(t, err)
read_response := response.(*ReadResultSignal)
members_serialized := read_response.Extensions[GroupExtType]["members"]
_, member_value, remaining, err := DeserializeValue(ctx, members_serialized)
if len(remaining.Data) > 0 {
t.Fatalf("Data remaining after deserializing member list: %d", len(remaining.Data))
}
member_list, ok := member_value.Interface().([]NodeID)
if ok != true {
t.Fatalf("member_list wrong type %s", member_value.Type())
}
if len(member_list) != 1 {
t.Fatalf("member_list wrong length %d", len(member_list))
}
if member_list[0] != user_id {
t.Fatalf("member_list wrong value %s", member_list[0])
}
ctx.Log.Logf("test", "Read Response: %+v", read_response)
}

@ -84,22 +84,24 @@ var (
GQLExtType = NewExtType("GQL") GQLExtType = NewExtType("GQL")
GroupExtType = NewExtType("GROUP") GroupExtType = NewExtType("GROUP")
GQLNodeType = NewNodeType("GQL") GQLNodeType = NewNodeType("GQL")
BaseNodeType = NewNodeType("BASE") BaseNodeType = NewNodeType("BASE")
GroupNodeType = NewNodeType("GROUP") GroupNodeType = NewNodeType("GROUP")
StopSignalType = NewSignalType("STOP") StopSignalType = NewSignalType("STOP")
CreateSignalType = NewSignalType("CREATE") CreateSignalType = NewSignalType("CREATE")
StartSignalType = NewSignalType("START") StartSignalType = NewSignalType("START")
StatusSignalType = NewSignalType("STATUS") StatusSignalType = NewSignalType("STATUS")
LinkSignalType = NewSignalType("LINK") LinkSignalType = NewSignalType("LINK")
LockSignalType = NewSignalType("LOCK") LockSignalType = NewSignalType("LOCK")
TimeoutSignalType = NewSignalType("TIMEOUT") TimeoutSignalType = NewSignalType("TIMEOUT")
ReadSignalType = NewSignalType("READ") ReadSignalType = NewSignalType("READ")
ACLTimeoutSignalType = NewSignalType("ACL_TIMEOUT") ACLTimeoutSignalType = NewSignalType("ACL_TIMEOUT")
ErrorSignalType = NewSignalType("ERROR") ErrorSignalType = NewSignalType("ERROR")
SuccessSignalType = NewSignalType("SUCCESS") SuccessSignalType = NewSignalType("SUCCESS")
ReadResultSignalType = NewSignalType("READ_RESULT") ReadResultSignalType = NewSignalType("READ_RESULT")
RemoveMemberSignalType = NewSignalType("REMOVE_MEMBER")
AddMemberSignalType = NewSignalType("ADD_MEMBER")
MemberOfPolicyType = NewPolicyType("USER_OF") MemberOfPolicyType = NewPolicyType("USER_OF")
RequirementOfPolicyType = NewPolicyType("REQUIEMENT_OF") RequirementOfPolicyType = NewPolicyType("REQUIEMENT_OF")