Verified Commit bef80b92 authored by Zubeen's avatar Zubeen 🤖 Committed by GitLab
Browse files

fix(event_parsing): parse user access request system hook events 

Changelog: Improvements
parent 7f1dadc7

event_parsing.go

+6 −2
Changes for event_parsing.go: 6 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -175,12 +175,16 @@ func ParseSystemhook(payload []byte) (event any, err error) { 
	case

		"user_add_to_group",

		"user_remove_from_group",

		"user_update_for_group":

		"user_update_for_group",

		"user_access_request_to_group",

		"user_access_request_revoked_for_group":

		event = &UserGroupSystemEvent{}

	case

		"user_add_to_team",

		"user_remove_from_team",

		"user_update_for_team":

		"user_update_for_team",

		"user_access_request_to_project",

		"user_access_request_revoked_for_project":

		event = &UserTeamSystemEvent{}

	default:

		switch e.ObjectKind {

event_parsing_systemhook_test.go

+4 −0
Changes for event_parsing_systemhook_test.go: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -152,6 +152,8 @@ func TestParseSystemhookUserGroup(t *testing.T) { 
		{"user_add_to_group", loadFixture(t, "testdata/systemhooks/user_add_to_group.json")},

		{"user_remove_from_group", loadFixture(t, "testdata/systemhooks/user_remove_from_group.json")},

		{"user_update_for_group", loadFixture(t, "testdata/systemhooks/user_update_for_group.json")},

		{"user_access_request_to_group", loadFixture(t, "testdata/systemhooks/user_access_request_to_group.json")},

		{"user_access_request_revoked_for_group", loadFixture(t, "testdata/systemhooks/user_access_request_revoked_for_group.json")},

	}

	for _, tc := range tests {

		t.Run(tc.event, func(t *testing.T) {
@@ -175,6 +177,8 @@ func TestParseSystemhookUserTeam(t *testing.T) { 
		{"user_add_to_team", loadFixture(t, "testdata/systemhooks/user_add_to_team.json")},

		{"user_remove_from_team", loadFixture(t, "testdata/systemhooks/user_remove_from_team.json")},

		{"user_update_for_team", loadFixture(t, "testdata/systemhooks/user_update_for_team.json")},

		{"user_access_request_to_project", loadFixture(t, "testdata/systemhooks/user_access_request_to_project.json")},

		{"user_access_request_revoked_for_project", loadFixture(t, "testdata/systemhooks/user_access_request_revoked_for_project.json")},

	}

	for _, tc := range tests {

		t.Run(tc.event, func(t *testing.T) {

testdata/systemhooks/user_access_request_revoked_for_group.json

0 → 100644
+13 −0
Changes for testdata/systemhooks/user_access_request_revoked_for_group.json: 13 added lines, 0 removed lines.
Original line number Diff line number Diff line 
{

  "created_at": "2012-07-21T07:30:56Z",

  "updated_at": "2012-07-21T07:38:22Z",

  "event_name": "user_access_request_revoked_for_group",

  "group_access": "Maintainer",

  "group_id": 78,

  "group_name": "StoreCloud",

  "group_path": "storecloud",

  "user_email": "johnsmith@example.com",

  "user_name": "John Smith",

  "user_username": "johnsmith",

  "user_id": 41

}

testdata/systemhooks/user_access_request_revoked_for_project.json

0 → 100644
+15 −0
Changes for testdata/systemhooks/user_access_request_revoked_for_project.json: 15 added lines, 0 removed lines.
Original line number Diff line number Diff line 
{

  "created_at": "2012-07-21T07:30:56Z",

  "updated_at": "2012-07-21T07:38:22Z",

  "event_name": "user_access_request_revoked_for_project",

  "access_level": "Maintainer",

  "project_id": 74,

  "project_name": "StoreCloud",

  "project_path": "storecloud",

  "project_path_with_namespace": "jsmith/storecloud",

  "user_email": "johnsmith@example.com",

  "user_name": "John Smith",

  "user_username": "johnsmith",

  "user_id": 41,

  "project_visibility": "private"

}

testdata/systemhooks/user_access_request_to_group.json

0 → 100644
+13 −0
Changes for testdata/systemhooks/user_access_request_to_group.json: 13 added lines, 0 removed lines.
Original line number Diff line number Diff line 
{

  "created_at": "2012-07-21T07:30:56Z",

  "updated_at": "2012-07-21T07:38:22Z",

  "event_name": "user_access_request_to_group",

  "group_access": "Maintainer",

  "group_id": 78,

  "group_name": "StoreCloud",

  "group_path": "storecloud",

  "user_email": "johnsmith@example.com",

  "user_name": "John Smith",

  "user_username": "johnsmith",

  "user_id": 41

}