mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-08 21:30:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

tests updated

Browse Source
This commit is contained in:
Roman Perekhod
2024-09-25 18:54:57 +02:00
parent 3935d39e67
commit 204e9df249
3 changed files with 565 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/activitylog/pkg/service/http.go
View File

@@ -134,15 +134,15 @@ func (s *ActivitylogService) HandleGetItemActivities(w http.ResponseWriter, r *h
message = MessageResourceUpdated
}
ts = utils.TSToTime(ev.Timestamp)
vars, err = s.GetVars(ctx, WithResource(ev.FileRef, true), WithUser(nil, ev.ExecutingUser, ev.ImpersonatingUser))
vars, err = s.GetVars(ctx, WithResource(ev.FileRef, false), WithUser(nil, ev.ExecutingUser, ev.ImpersonatingUser))
case events.FileTouched:
message = MessageResourceCreated
ts = utils.TSToTime(ev.Timestamp)
vars, err = s.GetVars(ctx, WithResource(ev.Ref, true), WithUser(ev.Executant, nil, ev.ImpersonatingUser))
vars, err = s.GetVars(ctx, WithResource(ev.Ref, false), WithUser(ev.Executant, nil, ev.ImpersonatingUser))
case events.ContainerCreated:
message = MessageResourceCreated
ts = utils.TSToTime(ev.Timestamp)
vars, err = s.GetVars(ctx, WithResource(ev.Ref, true), WithUser(ev.Executant, nil, ev.ImpersonatingUser))
vars, err = s.GetVars(ctx, WithResource(ev.Ref, false), WithUser(ev.Executant, nil, ev.ImpersonatingUser))
case events.ItemTrashed:
message = MessageResourceTrashed
ts = utils.TSToTime(ev.Timestamp)
@@ -154,7 +154,7 @@ func (s *ActivitylogService) HandleGetItemActivities(w http.ResponseWriter, r *h
vars, err = s.GetVars(ctx, WithResource(ev.Ref, false), WithOldResource(ev.OldReference), WithUser(ev.Executant, nil, ev.ImpersonatingUser))
case false:
message = MessageResourceMoved
vars, err = s.GetVars(ctx, WithResource(ev.Ref, true), WithUser(ev.Executant, nil, ev.ImpersonatingUser))
vars, err = s.GetVars(ctx, WithResource(ev.Ref, false), WithUser(ev.Executant, nil, ev.ImpersonatingUser))
}
ts = utils.TSToTime(ev.Timestamp)
case events.ShareCreated:

659
tests/acceptance/features/apiActivities/activities.feature
View File

@@ -39,8 +39,17 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource","space","user"],
"required": ["folder", "resource", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "Alice Hansen"
}
}
},
"resource": {
"type": "object",
"required": ["id","name"],
@@ -54,19 +63,6 @@ Feature: check activities
}
}
},
"space": {
"type": "object",
"required": ["id","name"],
"properties": {
"id": {
"type": "string",
"pattern": "^%user_id_pattern%!%user_id_pattern%$"
},
"name": {
"const": "Alice Hansen"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
@@ -129,8 +125,17 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource","space","user"],
"required": ["folder","resource","user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "Alice Hansen"
}
}
},
"resource": {
"type": "object",
"required": ["id","name"],
@@ -144,19 +149,6 @@ Feature: check activities
}
}
},
"space": {
"type": "object",
"required": ["id","name"],
"properties": {
"id": {
"type": "string",
"pattern": "^%user_id_pattern%!%user_id_pattern%$"
},
"name": {
"const": "Alice Hansen"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
@@ -225,7 +217,7 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource", "space", "user"],
"required": ["resource", "folder", "user"],
"properties": {
"resource": {
"type": "object",
@@ -255,7 +247,7 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource", "space", "user"],
"required": ["resource", "folder", "user"],
"properties": {
"resource": {
"type": "object",
@@ -289,7 +281,7 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource","space","user"],
"required": ["resource","folder","user"],
"properties": {
"resource": {
"type": "object",
@@ -304,14 +296,10 @@ Feature: check activities
}
}
},
"space": {
"folder": {
"type": "object",
"required": ["id","name"],
"required": ["name"],
"properties": {
"id": {
"type": "string",
"pattern": "^%file_id_pattern%$"
},
"name": {
"const": "Alice Hansen"
}
@@ -363,7 +351,7 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource","space","user"],
"required": ["resource","folder","user"],
"properties": {
"resource": {
"type": "object",
@@ -378,14 +366,10 @@ Feature: check activities
}
}
},
"space": {
"folder": {
"type": "object",
"required": ["id","name"],
"required": ["name"],
"properties": {
"id": {
"type": "string",
"pattern": "^%file_id_pattern%$"
},
"name": {
"const": "Alice Hansen"
}
@@ -459,6 +443,43 @@ Feature: check activities
"properties": {
"message": {
"const": "{user} added {resource} to {folder}"
},
"variables": {
"type": "object",
"required": ["folder", "resource", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "Alice Hansen"
}
}
},
"resource": {
"type": "object",
"required": ["id","name"],
"properties": {
"name": {
"const": "textfile.txt"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
"properties": {
"id": {
"type": "string",
"pattern": "%user_id_pattern%"
},
"displayName": {
"const": "Alice Hansen"
}
}
}
}
}
}
}
@@ -481,8 +502,17 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource","space","user"],
"required": ["folder", "resource", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "New Folder"
}
}
},
"resource": {
"type": "object",
"required": ["id","name"],
@@ -496,19 +526,6 @@ Feature: check activities
}
}
},
"space": {
"type": "object",
"required": ["id","name"],
"properties": {
"id": {
"type": "string",
"pattern": "^%user_id_pattern%!%user_id_pattern%$"
},
"name": {
"const": "Alice Hansen"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
@@ -569,6 +586,43 @@ Feature: check activities
"properties": {
"message": {
"const": "{user} added {resource} to {folder}"
},
"variables": {
"type": "object",
"required": ["folder", "resource", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "Alice Hansen"
}
}
},
"resource": {
"type": "object",
"required": ["id","name"],
"properties": {
"name": {
"const": "FOLDER"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
"properties": {
"id": {
"type": "string",
"pattern": "%user_id_pattern%"
},
"displayName": {
"const": "Alice Hansen"
}
}
}
}
}
}
}
@@ -591,8 +645,17 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource","space","user"],
"required": ["folder", "resource", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "New Folder"
}
}
},
"resource": {
"type": "object",
"required": ["id","name"],
@@ -606,19 +669,6 @@ Feature: check activities
}
}
},
"space": {
"type": "object",
"required": ["id","name"],
"properties": {
"id": {
"type": "string",
"pattern": "^%user_id_pattern%!%user_id_pattern%$"
},
"name": {
"const": "Alice Hansen"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
@@ -920,46 +970,93 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource", "space", "user"],
"required": ["folder", "resource", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "Alice Hansen"
}
}
},
"resource": {
"type": "object",
"required": ["id", "name"],
"properties": {
"id": {
"type": "string"
},
"name": {
"const": "New Folder"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
"properties": {
"id": {
"type": "string",
"pattern": "%user_id_pattern%"
},
"displayName": {
"const": "Alice Hansen"
}
}
}
}
}
}
}
}
},
{
"type": "object",
"required": ["id", "template", "times"],
"properties": {
"template": {
"type": "object",
"required": ["message", "variables"],
"properties": {
"message": {
"const": "{user} added {resource} to {folder}"
},
"variables": {
"type": "object",
"required": ["resource", "folder", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "New Folder"
}
}
}
}
}
}
}
}
},
{
"type": "object",
"required": ["id", "template", "times"],
"properties": {
"template": {
"type": "object",
"required": ["message", "variables"],
"properties": {
"message": {
"const": "{user} added {resource} to {folder}"
},
"variables": {
"type": "object",
"required": ["resource", "space", "user"],
"properties": {
},
"resource": {
"type": "object",
"required": ["id", "name"],
"required": ["name"],
"properties": {
"name": {
"const": "Folder"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
"properties": {
"id": {
"type": "string",
"pattern": "%user_id_pattern%"
},
"displayName": {
"const": "Alice Hansen"
}
}
}
}
}
@@ -980,8 +1077,17 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource", "space", "user"],
"required": ["folder", "resource", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "New Folder"
}
}
},
"resource": {
"type": "object",
"required": ["id", "name"],
@@ -990,6 +1096,19 @@ Feature: check activities
"const": "Sub Folder"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
"properties": {
"id": {
"type": "string",
"pattern": "%user_id_pattern%"
},
"displayName": {
"const": "Alice Hansen"
}
}
}
}
}
@@ -1010,8 +1129,17 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource", "space", "user"],
"required": ["folder", "resource", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "New Folder"
}
}
},
"resource": {
"type": "object",
"required": ["id", "name"],
@@ -1020,6 +1148,19 @@ Feature: check activities
"const": "textfile.txt"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
"properties": {
"id": {
"type": "string",
"pattern": "%user_id_pattern%"
},
"displayName": {
"const": "Alice Hansen"
}
}
}
}
}
@@ -1040,8 +1181,17 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource", "space", "user"],
"required": ["folder", "resource", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "Sub Folder"
}
}
},
"resource": {
"type": "object",
"required": ["id", "name"],
@@ -1050,6 +1200,19 @@ Feature: check activities
"const": "textfile.txt"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
"properties": {
"id": {
"type": "string",
"pattern": "%user_id_pattern%"
},
"displayName": {
"const": "Alice Hansen"
}
}
}
}
}
@@ -1070,8 +1233,17 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource", "space", "user"],
"required": ["folder", "resource", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "Sub Folder"
}
}
},
"resource": {
"type": "object",
"required": ["id", "name"],
@@ -1080,6 +1252,19 @@ Feature: check activities
"const": "Folder"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
"properties": {
"id": {
"type": "string",
"pattern": "%user_id_pattern%"
},
"displayName": {
"const": "Alice Hansen"
}
}
}
}
}
@@ -1178,8 +1363,17 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource", "space", "user"],
"required": ["folder", "resource", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "Sub Folder"
}
}
},
"resource": {
"type": "object",
"required": ["id", "name"],
@@ -1188,6 +1382,19 @@ Feature: check activities
"const": "renamed.txt"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
"properties": {
"id": {
"type": "string",
"pattern": "%user_id_pattern%"
},
"displayName": {
"const": "Alice Hansen"
}
}
}
}
}
@@ -1208,8 +1415,17 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource", "space", "user"],
"required": ["folder", "resource", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "Sub Folder"
}
}
},
"resource": {
"type": "object",
"required": ["id", "name"],
@@ -1218,6 +1434,19 @@ Feature: check activities
"const": "Renamed Folder"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
"properties": {
"id": {
"type": "string",
"pattern": "%user_id_pattern%"
},
"displayName": {
"const": "Alice Hansen"
}
}
}
}
}
@@ -1360,8 +1589,17 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource", "space", "user"],
"required": ["folder", "resource", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "Alice Hansen"
}
}
},
"resource": {
"type": "object",
"required": ["id", "name"],
@@ -1370,38 +1608,17 @@ Feature: check activities
"const": "New Folder"
}
}
}
}
}
}
},
"times": {
"type": "object",
"required": ["recordedTime"]
}
}
},
{
"type": "object",
"required": ["id", "template", "times"],
"properties": {
"template": {
"type": "object",
"required": ["message", "variables"],
"properties": {
"message": {
"const": "{user} added {resource} to {folder}"
},
"variables": {
"type": "object",
"required": ["resource", "space", "user"],
"properties": {
"resource": {
},
"user": {
"type": "object",
"required": ["id", "name"],
"required": ["id","displayName"],
"properties": {
"name": {
"const": "Sub Folder"
"id": {
"type": "string",
"pattern": "%user_id_pattern%"
},
"displayName": {
"const": "Alice Hansen"
}
}
}
@@ -1428,8 +1645,73 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource", "space", "user"],
"required": ["folder", "resource", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "New Folder"
}
}
},
"resource": {
"type": "object",
"required": ["id", "name"],
"properties": {
"name": {
"const": "Sub Folder"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
"properties": {
"id": {
"type": "string",
"pattern": "%user_id_pattern%"
},
"displayName": {
"const": "Alice Hansen"
}
}
}
}
}
}
},
"times": {
"type": "object",
"required": ["recordedTime"]
}
}
},
{
"type": "object",
"required": ["id", "template", "times"],
"properties": {
"template": {
"type": "object",
"required": ["message", "variables"],
"properties": {
"message": {
"const": "{user} added {resource} to {folder}"
},
"variables": {
"type": "object",
"required": ["folder", "resource", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "Sub Folder"
}
}
},
"resource": {
"type": "object",
"required": ["id", "name"],
@@ -1438,6 +1720,19 @@ Feature: check activities
"const": "textfile.txt"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
"properties": {
"id": {
"type": "string",
"pattern": "%user_id_pattern%"
},
"displayName": {
"const": "Alice Hansen"
}
}
}
}
}
@@ -1489,8 +1784,17 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource", "space", "user"],
"required": ["folder", "resource", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "Alice Hansen"
}
}
},
"resource": {
"type": "object",
"required": ["id", "name"],
@@ -1499,6 +1803,19 @@ Feature: check activities
"const": "New Folder"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
"properties": {
"id": {
"type": "string",
"pattern": "%user_id_pattern%"
},
"displayName": {
"const": "Alice Hansen"
}
}
}
}
}
@@ -1523,8 +1840,17 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource", "space", "user"],
"required": ["folder", "resource", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "New Folder"
}
}
},
"resource": {
"type": "object",
"required": ["id", "name"],
@@ -1533,6 +1859,19 @@ Feature: check activities
"const": "Sub Folder"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
"properties": {
"id": {
"type": "string",
"pattern": "%user_id_pattern%"
},
"displayName": {
"const": "Alice Hansen"
}
}
}
}
}
@@ -1584,8 +1923,17 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource", "space", "user"],
"required": ["folder", "resource", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "Alice Hansen"
}
}
},
"resource": {
"type": "object",
"required": ["id", "name"],
@@ -1594,6 +1942,19 @@ Feature: check activities
"const": "New Folder"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
"properties": {
"id": {
"type": "string",
"pattern": "%user_id_pattern%"
},
"displayName": {
"const": "Alice Hansen"
}
}
}
}
}
@@ -1618,8 +1979,17 @@ Feature: check activities
},
"variables": {
"type": "object",
"required": ["resource", "space", "user"],
"required": ["folder", "resource", "user"],
"properties": {
"folder": {
"type": "object",
"required": ["name"],
"properties": {
"name": {
"const": "New Folder"
}
}
},
"resource": {
"type": "object",
"required": ["id", "name"],
@@ -1628,6 +1998,19 @@ Feature: check activities
"const": "Sub Folder"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
"properties": {
"id": {
"type": "string",
"pattern": "%user_id_pattern%"
},
"displayName": {
"const": "Alice Hansen"
}
}
}
}
}

96
tests/acceptance/features/apiActivities/shareActivities.feature
View File

@@ -543,8 +543,17 @@ Feature: check share activity
},
"variables": {
"type": "object",
"required": ["resource","space","user"],
"required": ["folder","resource","user"],
"properties": {
"folder": {
"type": "object",
"required": ["id","name"],
"properties": {
"name": {
"const": "Alice Hansen"
}
}
},
"resource": {
"type": "object",
"required": ["id","name"],
@@ -554,19 +563,6 @@ Feature: check share activity
}
}
},
"space": {
"type": "object",
"required": ["id","name"],
"properties": {
"id": {
"type": "string",
"pattern": "^%user_id_pattern%!%user_id_pattern%$"
},
"name": {
"const": "Alice Hansen"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
@@ -622,8 +618,17 @@ Feature: check share activity
},
"variables": {
"type": "object",
"required": ["resource","space","user"],
"required": ["folder","resource","user"],
"properties": {
"folder": {
"type": "object",
"required": ["id","name"],
"properties": {
"name": {
"const": "FOLDER"
}
}
},
"resource": {
"type": "object",
"required": ["id","name"],
@@ -633,19 +638,6 @@ Feature: check share activity
}
}
},
"space": {
"type": "object",
"required": ["id","name"],
"properties": {
"id": {
"type": "string",
"pattern": "^%file_id_pattern%$"
},
"name": {
"const": "Alice Hansen"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
@@ -682,8 +674,17 @@ Feature: check share activity
},
"variables": {
"type": "object",
"required": ["resource","space","user"],
"required": ["folder","resource","user"],
"properties": {
"folder": {
"type": "object",
"required": ["id","name"],
"properties": {
"name": {
"const": "FOLDER"
}
}
},
"resource": {
"type": "object",
"required": ["id","name"],
@@ -693,19 +694,6 @@ Feature: check share activity
}
}
},
"space": {
"type": "object",
"required": ["id","name"],
"properties": {
"id": {
"type": "string",
"pattern": "^%file_id_pattern%$"
},
"name": {
"const": "Alice Hansen"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],
@@ -742,8 +730,17 @@ Feature: check share activity
},
"variables": {
"type": "object",
"required": ["resource","space","user"],
"required": ["folder","resource","user"],
"properties": {
"folder": {
"type": "object",
"required": ["id","name"],
"properties": {
"name": {
"const": "Alice Hansen"
}
}
},
"resource": {
"type": "object",
"required": ["id","name"],
@@ -753,19 +750,6 @@ Feature: check share activity
}
}
},
"space": {
"type": "object",
"required": ["id","name"],
"properties": {
"id": {
"type": "string",
"pattern": "^%file_id_pattern%$"
},
"name": {
"const": "Alice Hansen"
}
}
},
"user": {
"type": "object",
"required": ["id","displayName"],