Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • Fix/xxxx-activateGitlab
  • Fix/xxxx-resourceVisibility
  • Hotfix/1262-fixStatuscode
  • Hotfix/1308-versionConflict
  • Hotfix/1357-ymlFile
  • Hotfix/1370-swaggerDescription
  • Hotfix/1383-topLevel
  • Hotfix/1433-defaultQuota
  • Hotfix/1466-projectCreationTimeout
  • Hotfix/1584-fixResourceLoader
  • Hotfix/1590-quotaFix
  • Hotfix/1615-membersCreatingProject
  • Hotfix/1668-versionResourceConfigDepVersion
  • Hotfix/1669-RDS-S3QuotaManagement
  • Hotfix/1704-FixingArchiveFlag
  • Hotfix/1796-projectDdos
  • Hotfix/1917-PublicFilesVisibility
  • Hotfix/2015-PublicFilesVisibility
  • Hotfix/2077-fixSupportAdminLog
  • Hotfix/2087-efNet6
  • Hotfix/2202-fixNaNQuota
  • Hotfix/2203-quotaMembersFix
  • Hotfix/2224-quotaSizeAnalytics
  • Hotfix/2371-fixGitLabinRCV
  • Hotfix/64-releaseUDE
  • Issue/1321-pidEnquiryOverhaul
  • Issue/1825-codeQualityPipelines
  • Issue/1825-codeQualityPipelinesNew
  • Issue/1860-searchScoping
  • Issue/1861-searchMetadata
  • Issue/1866-ExtendResourceTypeConfigurationTUDo
  • Issue/1877-ExtendResourceTypeConfigurationNRWFHs
  • Issue/1910-MigrationtoNET6.0
  • Issue/1927-projectAppMigration
  • Issue/1940ResouceKeysForNRWAndTUDO
  • Issue/1951-quotaImplementation
  • Issue/1957-resourceAppMigrationNew
  • Issue/1971-projectEditCreateMigration
  • Issue/1971-projectForDev
  • Issue/2000-gitlabResourcesAPI
  • Issue/2001-extendAnalyticsLogger
  • Issue/2008-quotaManagement
  • Issue/2061-activateResourceTypeRdss3nrw
  • Issue/2072-wormResourceType
  • Issue/2101-gitLabResTypeUi
  • Issue/2221-projectDateCreated
  • Issue/2246-quotaResoval
  • Issue/2259-updatePids
  • Issue/2287-guestRole
  • Issue/2309-docs
  • Issue/2328-noFailOnLog
  • Issue/2349-gitlabHttps
  • Issue/2355-topLevelOrg
  • Issue/2449-GuidPidSlugToProjectSettings
  • Issues/0028-maxQuotaFix
  • Product/1100-fdsS3
  • Product/1154-resourceTypeDefinition
  • Product/1188-LoggingExtended
  • Product/1215-gitlabCleanUp
  • Product/1287-dotnet5Sharepoint
  • Product/1414-fhPrivileges
  • Product/1442-projectInviteMngmnt
  • Product/1548-projectInviteMngmnt
  • Product/1600-rdsS3QuotaManagement
  • Product/1629-onboardingOtherUniversities
  • Product/202-userInvitation
  • Product/588-quotaManagement
  • Product/932-docuProjectApi
  • Sprint/2020-20
  • Sprint/2020-21
  • Sprint/2020-22
  • Sprint/2021-01
  • Sprint/2021-02
  • Sprint/2021-03
  • Sprint/2021-05
  • Sprint/2021-08
  • Sprint/2021-09
  • Sprint/2021-10
  • Sprint/2021-11
  • Sprint/2021-12
  • Sprint/2021-13
  • Sprint/2021-15
  • Sprint/2021-19
  • Sprint/2021-2022
  • Sprint/2021-23
  • Sprint/2022-01
  • Sprint/2022-05
  • Test/xxxx-enablingGitLab
  • Topic/1115-docuProjectApi
  • Topic/1159-rtdApi
  • Topic/1221-LogginExtendedNew
  • Topic/1221-LoggingExtended
  • Topic/1279-quotaManagement
  • Topic/1292-FdsS3
  • Topic/1335-dotnet5Apis
  • Topic/1425-fhPrivileges
  • Topic/1453-userInvitation
  • Topic/1529-HandleExternalUserInvitation
  • Topic/1530-invitationUserManagement
  • Topic/1531-UseMangmntTableView
  • v1.0.0
  • v1.1.0
  • v1.10.0
  • v1.11.0
  • v1.11.1
  • v1.12.0
  • v1.13.0
  • v1.13.1
  • v1.14.0
  • v1.15.0
  • v1.15.1
  • v1.16.0
  • v1.16.1
  • v1.17.0
  • v1.17.1
  • v1.18.0
  • v1.19.0
  • v1.2.0
  • v1.2.1
  • v1.20.0
  • v1.20.1
  • v1.20.2
  • v1.21.0
  • v1.21.1
  • v1.22.0
  • v1.23.0
  • v1.23.1
  • v1.23.2
  • v1.23.3
  • v1.24.0
  • v1.24.1
  • v1.25.0
  • v1.25.1
  • v1.3.0
  • v1.4.0
  • v1.4.1
  • v1.5.0
  • v1.5.1
  • v1.6.0
  • v1.6.1
  • v1.6.2
  • v1.7.0
  • v1.7.1
  • v1.8.0
  • v1.9.0
  • v2.0.0
  • v2.0.1
  • v2.0.2
  • v2.1.0
  • v2.1.1
  • v2.1.2
  • v2.2.0
  • v2.2.1
  • v2.2.2
  • v2.2.3
  • v2.2.4
  • v2.2.5
  • v2.3.0
  • v2.4.0
  • v2.4.1
  • v2.4.2
  • v2.4.3
  • v2.5.0
  • v2.5.1
  • v2.5.2
  • v2.5.3
  • v2.5.4
  • v2.6.0
  • v2.6.1
  • v2.6.2
  • v2.7.0
  • v2.8.0
  • v2.8.1
  • v2.8.2
  • v2.8.3
  • v2.8.4
  • v2.9.0
  • v3.0.0
  • v3.0.1
  • v4.0.0
  • v4.0.1
  • v4.0.2
  • v4.0.3
  • v4.1.0
  • v4.1.1
  • v4.2.0
  • v4.2.1
  • v4.2.2
  • v4.2.3
  • v4.2.4
  • v4.2.5
  • v4.2.6
  • v4.2.7
  • v4.2.8
  • v4.3.0
  • v4.3.1
  • v4.3.2
  • v4.3.3
  • v4.3.4
  • v4.4.0
200 results

Target

Select target project
  • coscine/backend/apis/project
1 result
Select Git revision
  • Fix/xxxx-activateGitlab
  • Fix/xxxx-resourceVisibility
  • Hotfix/1262-fixStatuscode
  • Hotfix/1308-versionConflict
  • Hotfix/1357-ymlFile
  • Hotfix/1370-swaggerDescription
  • Hotfix/1383-topLevel
  • Hotfix/1433-defaultQuota
  • Hotfix/1466-projectCreationTimeout
  • Hotfix/1584-fixResourceLoader
  • Hotfix/1590-quotaFix
  • Hotfix/1615-membersCreatingProject
  • Hotfix/1668-versionResourceConfigDepVersion
  • Hotfix/1669-RDS-S3QuotaManagement
  • Hotfix/1704-FixingArchiveFlag
  • Hotfix/1796-projectDdos
  • Hotfix/1917-PublicFilesVisibility
  • Hotfix/2015-PublicFilesVisibility
  • Hotfix/2077-fixSupportAdminLog
  • Hotfix/2087-efNet6
  • Hotfix/2202-fixNaNQuota
  • Hotfix/2203-quotaMembersFix
  • Hotfix/2224-quotaSizeAnalytics
  • Hotfix/2371-fixGitLabinRCV
  • Hotfix/64-releaseUDE
  • Issue/1321-pidEnquiryOverhaul
  • Issue/1825-codeQualityPipelines
  • Issue/1825-codeQualityPipelinesNew
  • Issue/1860-searchScoping
  • Issue/1861-searchMetadata
  • Issue/1866-ExtendResourceTypeConfigurationTUDo
  • Issue/1877-ExtendResourceTypeConfigurationNRWFHs
  • Issue/1910-MigrationtoNET6.0
  • Issue/1927-projectAppMigration
  • Issue/1940ResouceKeysForNRWAndTUDO
  • Issue/1951-quotaImplementation
  • Issue/1957-resourceAppMigrationNew
  • Issue/1971-projectEditCreateMigration
  • Issue/1971-projectForDev
  • Issue/2000-gitlabResourcesAPI
  • Issue/2001-extendAnalyticsLogger
  • Issue/2008-quotaManagement
  • Issue/2061-activateResourceTypeRdss3nrw
  • Issue/2072-wormResourceType
  • Issue/2101-gitLabResTypeUi
  • Issue/2221-projectDateCreated
  • Issue/2246-quotaResoval
  • Issue/2259-updatePids
  • Issue/2287-guestRole
  • Issue/2309-docs
  • Issue/2328-noFailOnLog
  • Issue/2349-gitlabHttps
  • Issue/2355-topLevelOrg
  • Issue/2449-GuidPidSlugToProjectSettings
  • Issues/0028-maxQuotaFix
  • Product/1100-fdsS3
  • Product/1154-resourceTypeDefinition
  • Product/1188-LoggingExtended
  • Product/1215-gitlabCleanUp
  • Product/1287-dotnet5Sharepoint
  • Product/1414-fhPrivileges
  • Product/1442-projectInviteMngmnt
  • Product/1548-projectInviteMngmnt
  • Product/1600-rdsS3QuotaManagement
  • Product/1629-onboardingOtherUniversities
  • Product/202-userInvitation
  • Product/588-quotaManagement
  • Product/932-docuProjectApi
  • Sprint/2020-20
  • Sprint/2020-21
  • Sprint/2020-22
  • Sprint/2021-01
  • Sprint/2021-02
  • Sprint/2021-03
  • Sprint/2021-05
  • Sprint/2021-08
  • Sprint/2021-09
  • Sprint/2021-10
  • Sprint/2021-11
  • Sprint/2021-12
  • Sprint/2021-13
  • Sprint/2021-15
  • Sprint/2021-19
  • Sprint/2021-2022
  • Sprint/2021-23
  • Sprint/2022-01
  • Sprint/2022-05
  • Test/xxxx-enablingGitLab
  • Topic/1115-docuProjectApi
  • Topic/1159-rtdApi
  • Topic/1221-LogginExtendedNew
  • Topic/1221-LoggingExtended
  • Topic/1279-quotaManagement
  • Topic/1292-FdsS3
  • Topic/1335-dotnet5Apis
  • Topic/1425-fhPrivileges
  • Topic/1453-userInvitation
  • Topic/1529-HandleExternalUserInvitation
  • Topic/1530-invitationUserManagement
  • Topic/1531-UseMangmntTableView
  • v1.0.0
  • v1.1.0
  • v1.10.0
  • v1.11.0
  • v1.11.1
  • v1.12.0
  • v1.13.0
  • v1.13.1
  • v1.14.0
  • v1.15.0
  • v1.15.1
  • v1.16.0
  • v1.16.1
  • v1.17.0
  • v1.17.1
  • v1.18.0
  • v1.19.0
  • v1.2.0
  • v1.2.1
  • v1.20.0
  • v1.20.1
  • v1.20.2
  • v1.21.0
  • v1.21.1
  • v1.22.0
  • v1.23.0
  • v1.23.1
  • v1.23.2
  • v1.23.3
  • v1.24.0
  • v1.24.1
  • v1.25.0
  • v1.25.1
  • v1.3.0
  • v1.4.0
  • v1.4.1
  • v1.5.0
  • v1.5.1
  • v1.6.0
  • v1.6.1
  • v1.6.2
  • v1.7.0
  • v1.7.1
  • v1.8.0
  • v1.9.0
  • v2.0.0
  • v2.0.1
  • v2.0.2
  • v2.1.0
  • v2.1.1
  • v2.1.2
  • v2.2.0
  • v2.2.1
  • v2.2.2
  • v2.2.3
  • v2.2.4
  • v2.2.5
  • v2.3.0
  • v2.4.0
  • v2.4.1
  • v2.4.2
  • v2.4.3
  • v2.5.0
  • v2.5.1
  • v2.5.2
  • v2.5.3
  • v2.5.4
  • v2.6.0
  • v2.6.1
  • v2.6.2
  • v2.7.0
  • v2.8.0
  • v2.8.1
  • v2.8.2
  • v2.8.3
  • v2.8.4
  • v2.9.0
  • v3.0.0
  • v3.0.1
  • v4.0.0
  • v4.0.1
  • v4.0.2
  • v4.0.3
  • v4.1.0
  • v4.1.1
  • v4.2.0
  • v4.2.1
  • v4.2.2
  • v4.2.3
  • v4.2.4
  • v4.2.5
  • v4.2.6
  • v4.2.7
  • v4.2.8
  • v4.3.0
  • v4.3.1
  • v4.3.2
  • v4.3.3
  • v4.3.4
  • v4.4.0
200 results
Show changes

Commits on Source 4

...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<RootNamespace>Coscine.Api.Project.Tests</RootNamespace> <RootNamespace>Coscine.Api.Project.Tests</RootNamespace>
<AssemblyName>Coscine.Api.Project.Tests</AssemblyName> <AssemblyName>Coscine.Api.Project.Tests</AssemblyName>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<Version>4.2.2</Version></PropertyGroup> <Version>4.2.3</Version></PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Project\Project.csproj" /> <ProjectReference Include="..\Project\Project.csproj" />
</ItemGroup> </ItemGroup>
......
...@@ -30,7 +30,7 @@ namespace Coscine.Api.Project.Controllers ...@@ -30,7 +30,7 @@ namespace Coscine.Api.Project.Controllers
[Route("[controller]")] [Route("[controller]")]
public ActionResult<IEnumerable<DisciplineObject>> Index() public ActionResult<IEnumerable<DisciplineObject>> Index()
{ {
return Json(_disciplineModel.GetAll() return Ok(_disciplineModel.GetAll()
.OrderBy(discipline => discipline.DisplayNameDe.Substring(discipline.DisplayNameDe.Length - 3)) .OrderBy(discipline => discipline.DisplayNameDe.Substring(discipline.DisplayNameDe.Length - 3))
.Select((discipline) => new DisciplineObject(discipline.Id, discipline.Url, discipline.DisplayNameDe, discipline.DisplayNameEn))); .Select((discipline) => new DisciplineObject(discipline.Id, discipline.Url, discipline.DisplayNameDe, discipline.DisplayNameEn)));
} }
......
...@@ -30,7 +30,7 @@ namespace Coscine.Api.Project.Controllers ...@@ -30,7 +30,7 @@ namespace Coscine.Api.Project.Controllers
[Route("[controller]")] [Route("[controller]")]
public ActionResult<IEnumerable<LicenseObject>> Index() public ActionResult<IEnumerable<LicenseObject>> Index()
{ {
return Json(_licenseModel.GetAll() return Ok(_licenseModel.GetAll()
.Select((license) => new LicenseObject(license.Id, license.DisplayName))); .Select((license) => new LicenseObject(license.Id, license.DisplayName)));
} }
} }
......
...@@ -180,7 +180,7 @@ namespace Coscine.Api.Project.Controllers ...@@ -180,7 +180,7 @@ namespace Coscine.Api.Project.Controllers
var projectObject = _projectModel.CreateReturnObjectFromDatabaseObject(_projectModel.GetById(project.Id)); var projectObject = _projectModel.CreateReturnObjectFromDatabaseObject(_projectModel.GetById(project.Id));
LogAnalyticsViewProject(project, resources.ToList(), projectObject.Disciplines, projectObject.Organizations, user); LogAnalyticsViewProject(project, resources.ToList(), projectObject.Disciplines, projectObject.Organizations, user);
} }
return Json(resources); return Ok(resources);
} }
else else
{ {
...@@ -225,7 +225,7 @@ namespace Coscine.Api.Project.Controllers ...@@ -225,7 +225,7 @@ namespace Coscine.Api.Project.Controllers
var projectObject = _projectModel.CreateReturnObjectFromDatabaseObject(_projectModel.GetById(project.Id)); var projectObject = _projectModel.CreateReturnObjectFromDatabaseObject(_projectModel.GetById(project.Id));
LogAnalyticsDeleteProject(project, projectObject.Disciplines, projectObject.Organizations, user); LogAnalyticsDeleteProject(project, projectObject.Disciplines, projectObject.Organizations, user);
DeleteProject(project); DeleteProject(project);
return Json(_projectModel.CreateReturnObjectFromDatabaseObject(project)); return Ok(_projectModel.CreateReturnObjectFromDatabaseObject(project));
} }
else else
{ {
...@@ -376,7 +376,7 @@ namespace Coscine.Api.Project.Controllers ...@@ -376,7 +376,7 @@ namespace Coscine.Api.Project.Controllers
LogAnalyticsAddProject(project, _projectModel.GetMetadataCompleteness(projectObject), projectObject.Disciplines, projectObject.Organizations, user); LogAnalyticsAddProject(project, _projectModel.GetMetadataCompleteness(projectObject), projectObject.Disciplines, projectObject.Organizations, user);
return Json(_projectModel.CreateReturnObjectFromDatabaseObject(project)); return Ok(_projectModel.CreateReturnObjectFromDatabaseObject(project));
} }
/// <summary> /// <summary>
...@@ -629,7 +629,8 @@ namespace Coscine.Api.Project.Controllers ...@@ -629,7 +629,8 @@ namespace Coscine.Api.Project.Controllers
private void LogAnalyticsViewProject(Database.DataModel.Project project, List<ResourceObject> resources, IEnumerable<DisciplineObject> disciplines, IEnumerable<OrganizationObject> organizations, User user) private void LogAnalyticsViewProject(Database.DataModel.Project project, List<ResourceObject> resources, IEnumerable<DisciplineObject> disciplines, IEnumerable<OrganizationObject> organizations, User user)
{ {
var resourceTypes = _resourceTypeModel.GetAllWhere(x => x.Enabled == true); var enabledResources = ResourceTypeFactory.Instance.GetResourceTypes();
var resourceTypes = _resourceTypeModel.GetAllWhere(r => enabledResources.Any(e => r.SpecificType.Equals(e)));
var objects = resourceTypes.Select(x => Helpers.CreateProjectQuotaReturnObject(x, project.Id)); var objects = resourceTypes.Select(x => Helpers.CreateProjectQuotaReturnObject(x, project.Id));
......
...@@ -69,9 +69,10 @@ namespace Coscine.Api.Project.Controllers ...@@ -69,9 +69,10 @@ namespace Coscine.Api.Project.Controllers
return Unauthorized("The user is not authorized to perform a get on the selected project!"); return Unauthorized("The user is not authorized to perform a get on the selected project!");
} }
var resourceTypes = _resourceTypeModel.GetAllWhere(x => x.Enabled == true); var enabledResources = ResourceTypeFactory.Instance.GetResourceTypes();
var resourceTypes = _resourceTypeModel.GetAllWhere(r => enabledResources.Any(e => r.SpecificType.Equals(e)));
return Json(resourceTypes.Select(x => Helpers.CreateProjectQuotaReturnObject(x, id))); return Ok(resourceTypes.Select(x => Helpers.CreateProjectQuotaReturnObject(x, id)));
} }
...@@ -99,13 +100,14 @@ namespace Coscine.Api.Project.Controllers ...@@ -99,13 +100,14 @@ namespace Coscine.Api.Project.Controllers
} }
var resourceType = _resourceTypeModel.GetById(resourceTypeId); var resourceType = _resourceTypeModel.GetById(resourceTypeId);
var enabledResources = ResourceTypeFactory.Instance.GetResourceTypes();
if (resourceType?.Enabled.HasValue != true || !resourceType.Enabled.Value) if (!enabledResources.Contains(resourceType.SpecificType))
{ {
return base.NotFound($"Could not find resourceType with id: {resourceTypeId}"); return base.NotFound($"Could not find resourceType with id: {resourceTypeId}");
} }
return Json(Helpers.CreateProjectQuotaExtendedReturnObject(resourceType, id)); return Ok(Helpers.CreateProjectQuotaExtendedReturnObject(resourceType, id));
} }
/// <summary> /// <summary>
...@@ -133,8 +135,9 @@ namespace Coscine.Api.Project.Controllers ...@@ -133,8 +135,9 @@ namespace Coscine.Api.Project.Controllers
} }
var resourceType = _resourceTypeModel.GetById(resourceTypeId); var resourceType = _resourceTypeModel.GetById(resourceTypeId);
var enabledResources = ResourceTypeFactory.Instance.GetResourceTypes();
if (resourceType?.Enabled.HasValue != true || !resourceType.Enabled.Value) if (!enabledResources.Contains(resourceType.SpecificType))
{ {
return NotFound($"Could not find resourceType with id: {resourceTypeId}"); return NotFound($"Could not find resourceType with id: {resourceTypeId}");
} }
...@@ -198,7 +201,8 @@ namespace Coscine.Api.Project.Controllers ...@@ -198,7 +201,8 @@ namespace Coscine.Api.Project.Controllers
private void LogAnalyticsOwnerProjectQuotaChange(Database.DataModel.Project project, User user) private void LogAnalyticsOwnerProjectQuotaChange(Database.DataModel.Project project, User user)
{ {
var resourceTypes = _resourceTypeModel.GetAllWhere(x => x.Enabled == true); var enabledResources = ResourceTypeFactory.Instance.GetResourceTypes();
var resourceTypes = _resourceTypeModel.GetAllWhere(r => enabledResources.Any(e => r.SpecificType.Equals(e)));
var objects = resourceTypes.Select(x => Helpers.CreateProjectQuotaReturnObject(x, project.Id)); var objects = resourceTypes.Select(x => Helpers.CreateProjectQuotaReturnObject(x, project.Id));
......
...@@ -81,7 +81,7 @@ namespace Coscine.Api.Project.Controllers ...@@ -81,7 +81,7 @@ namespace Coscine.Api.Project.Controllers
LogAnalytics("View Users", user, users, projectId.ToString()); LogAnalytics("View Users", user, users, projectId.ToString());
} }
return Json(users); return Ok(users);
} }
else else
{ {
...@@ -101,7 +101,7 @@ namespace Coscine.Api.Project.Controllers ...@@ -101,7 +101,7 @@ namespace Coscine.Api.Project.Controllers
var user = _authenticator.GetUser(); var user = _authenticator.GetUser();
var userObject = new UserObject(user.Id, user.DisplayName, user.Givenname, user.Surname, user.EmailAddress); var userObject = new UserObject(user.Id, user.DisplayName, user.Givenname, user.Surname, user.EmailAddress);
return Json(_projectRoleModel.GetAllWhere((projectRole) => return Ok(_projectRoleModel.GetAllWhere((projectRole) =>
(projectRole.UserId == user.Id && (projectRole.UserId == user.Id &&
projectRole.ProjectId == projectId) projectRole.ProjectId == projectId)
).Select((projectRole) => ).Select((projectRole) =>
...@@ -141,7 +141,7 @@ namespace Coscine.Api.Project.Controllers ...@@ -141,7 +141,7 @@ namespace Coscine.Api.Project.Controllers
LogAnalytics(userIsAlreadymember == true ? "Change Role" : "Add Member", user, null, project.Id.ToString()); LogAnalytics(userIsAlreadymember == true ? "Change Role" : "Add Member", user, null, project.Id.ToString());
return Json(_projectRoleModel.SetFromObject(projectRoleObject)); return Ok(_projectRoleModel.SetFromObject(projectRoleObject));
} }
else else
{ {
...@@ -178,7 +178,7 @@ namespace Coscine.Api.Project.Controllers ...@@ -178,7 +178,7 @@ namespace Coscine.Api.Project.Controllers
LogAnalytics("Remove User", user, null, project.Id.ToString()); LogAnalytics("Remove User", user, null, project.Id.ToString());
return Json(_projectRoleModel.Delete(_projectRoleModel.GetWhere((projectRole) => return Ok(_projectRoleModel.Delete(_projectRoleModel.GetWhere((projectRole) =>
projectRole.ProjectId == projectId projectRole.ProjectId == projectId
&& projectRole.UserId == userId && projectRole.UserId == userId
&& projectRole.RoleId == roleId))); && projectRole.RoleId == roleId)));
...@@ -212,7 +212,7 @@ namespace Coscine.Api.Project.Controllers ...@@ -212,7 +212,7 @@ namespace Coscine.Api.Project.Controllers
}); });
LogAnalytics("Leave Project", user, null, project.Id.ToString()); LogAnalytics("Leave Project", user, null, project.Id.ToString());
return Json(_projectRoleModel.Delete(_projectRoleModel.GetWhere((projectRole) => return Ok(_projectRoleModel.Delete(_projectRoleModel.GetWhere((projectRole) =>
projectRole.ProjectId == projectId projectRole.ProjectId == projectId
&& projectRole.UserId == user.Id && projectRole.UserId == user.Id
&& projectRole.RoleId == roleId))); && projectRole.RoleId == roleId)));
......
...@@ -30,7 +30,7 @@ namespace Coscine.Api.Project.Controllers ...@@ -30,7 +30,7 @@ namespace Coscine.Api.Project.Controllers
[Route("[controller]")] [Route("[controller]")]
public ActionResult<IEnumerable<RoleObject>> Index() public ActionResult<IEnumerable<RoleObject>> Index()
{ {
return Json(_roleModel.GetAll() return Ok(_roleModel.GetAll()
.Select((role) => new RoleObject(role.Id, role.DisplayName))); .Select((role) => new RoleObject(role.Id, role.DisplayName)));
} }
} }
......
...@@ -56,7 +56,7 @@ namespace Coscine.Api.Project.Controllers ...@@ -56,7 +56,7 @@ namespace Coscine.Api.Project.Controllers
.Select((subProject) => projectModel.GetById(subProject.SubProjectId)) .Select((subProject) => projectModel.GetById(subProject.SubProjectId))
.Select((project) => projectModel.CreateReturnObjectFromDatabaseObject(project, parentGuid)) .Select((project) => projectModel.CreateReturnObjectFromDatabaseObject(project, parentGuid))
.OrderBy(element => element.DisplayName); .OrderBy(element => element.DisplayName);
return Json(subProjects); return Ok(subProjects);
} }
else else
{ {
...@@ -87,7 +87,7 @@ namespace Coscine.Api.Project.Controllers ...@@ -87,7 +87,7 @@ namespace Coscine.Api.Project.Controllers
{ {
json["id"] = subProjects[0].ProjectId; json["id"] = subProjects[0].ProjectId;
} }
return Json(json); return Ok(json);
} }
else else
{ {
......
...@@ -31,7 +31,7 @@ namespace Coscine.Api.Project.Controllers ...@@ -31,7 +31,7 @@ namespace Coscine.Api.Project.Controllers
[Route("[controller]")] [Route("[controller]")]
public ActionResult<IEnumerable<VisibilityObject>> Index() public ActionResult<IEnumerable<VisibilityObject>> Index()
{ {
return Json(_visibilityModel.GetAll() return Ok(_visibilityModel.GetAll()
.Select((visibility) => new VisibilityObject(visibility.Id, visibility.DisplayName))); .Select((visibility) => new VisibilityObject(visibility.Id, visibility.DisplayName)));
} }
} }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<AssemblyName>Coscine.Api.Project</AssemblyName> <AssemblyName>Coscine.Api.Project</AssemblyName>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<Version>4.2.2</Version> <Version>4.2.3</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Authors>RWTH Aachen University</Authors> <Authors>RWTH Aachen University</Authors>
......