Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Project
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Coscine
backend
apis
Project
Commits
a251e11d
Commit
a251e11d
authored
Mar 15, 2022
by
L. Ellenbeck
Browse files
Options
Downloads
Patches
Plain Diff
New: extended analytics log (coscine/issues#2001)
parent
fcb50b4a
No related branches found
No related tags found
4 merge requests
!196
Release: Sprint/2022 05 :robot:
,
!194
Chore: 2.6.2
,
!189
New: extended analytics log (coscine/issues#2001)
,
!186
Update: Project API methods (coscine/issues#1971)
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/Project/Controllers/ProjectController.cs
+25
-2
25 additions, 2 deletions
src/Project/Controllers/ProjectController.cs
with
25 additions
and
2 deletions
src/Project/Controllers/ProjectController.cs
+
25
−
2
View file @
a251e11d
...
@@ -115,7 +115,7 @@ namespace Coscine.Api.Project.Controllers
...
@@ -115,7 +115,7 @@ namespace Coscine.Api.Project.Controllers
var
project
=
_projectModel
.
GetById
(
Guid
.
Parse
(
id
));
var
project
=
_projectModel
.
GetById
(
Guid
.
Parse
(
id
));
if
(
_projectModel
.
HasAccess
(
user
,
project
,
UserRoles
.
Member
,
UserRoles
.
Owner
))
if
(
_projectModel
.
HasAccess
(
user
,
project
,
UserRoles
.
Member
,
UserRoles
.
Owner
))
{
{
SubProjectModel
subProjectModel
=
new
SubProjectModel
();
var
subProjectModel
=
new
SubProjectModel
();
var
subProjectRel
=
subProjectModel
.
GetAllWhere
((
subProject
)
=>
subProject
.
SubProjectId
==
project
.
Id
&&
!
project
.
Deleted
);
var
subProjectRel
=
subProjectModel
.
GetAllWhere
((
subProject
)
=>
subProject
.
SubProjectId
==
project
.
Id
&&
!
project
.
Deleted
);
var
parentProjectRelation
=
subProjectRel
.
FirstOrDefault
();
var
parentProjectRelation
=
subProjectRel
.
FirstOrDefault
();
...
@@ -422,6 +422,12 @@ namespace Coscine.Api.Project.Controllers
...
@@ -422,6 +422,12 @@ namespace Coscine.Api.Project.Controllers
projectQuotaForCurrent
.
Quota
=
updateProjectQuotaObject
.
Allocated
;
projectQuotaForCurrent
.
Quota
=
updateProjectQuotaObject
.
Allocated
;
_projectQuotaModel
.
Update
(
projectQuotaForCurrent
);
_projectQuotaModel
.
Update
(
projectQuotaForCurrent
);
}
}
if
(
Request
.
Query
!=
null
&&
Request
.
Query
[
"noanalyticslog"
]
!=
"true"
)
{
LogAnalyticsOwnerProjectQuotaChange
(
project
,
user
);
}
return
NoContent
();
return
NoContent
();
}
}
...
@@ -914,5 +920,22 @@ namespace Coscine.Api.Project.Controllers
...
@@ -914,5 +920,22 @@ namespace Coscine.Api.Project.Controllers
Visibility
=
project
.
VisibilityId
.
HasValue
?
_visibilityModel
.
GetById
(
project
.
VisibilityId
.
Value
)?.
DisplayName
:
null
,
Visibility
=
project
.
VisibilityId
.
HasValue
?
_visibilityModel
.
GetById
(
project
.
VisibilityId
.
Value
)?.
DisplayName
:
null
,
});
});
}
}
private
void
LogAnalyticsOwnerProjectQuotaChange
(
Database
.
DataModel
.
Project
project
,
User
user
)
{
var
resourceTypes
=
_resourceTypeModel
.
GetAllWhere
(
x
=>
x
.
Enabled
==
true
);
var
objects
=
resourceTypes
.
Select
(
x
=>
CreateProjectQuotaReturnObject
(
x
,
project
.
Id
));
_coscineLogger
.
AnalyticsLog
(
new
AnalyticsLogObject
{
Type
=
"Action"
,
Operation
=
"Owner Project Quota Change"
,
RoleId
=
_projectRoleModel
.
GetGetUserRoleForProject
(
project
.
Id
,
user
.
Id
).
ToString
(),
ProjectId
=
project
.
Id
.
ToString
(),
QuotaSize
=
objects
.
Select
(
x
=>
$"
{
x
.
Name
}
:
{
x
.
Used
}
/
{
x
.
Allocated
}
"
).
ToList
()
});
}
}
}
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment