src/Project.Tests/Project.Tests.csproj

@@ -4,7 +4,7 @@
 		<RootNamespace>Coscine.Api.Project.Tests</RootNamespace>
 		<AssemblyName>Coscine.Api.Project.Tests</AssemblyName>
 		<TargetFramework>net6.0</TargetFramework>
-	<Version>4.2.2</Version></PropertyGroup>
+	<Version>4.2.3</Version></PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Project\Project.csproj" />
 	</ItemGroup>

src/Project/Controllers/DisciplineController.cs

@@ -30,7 +30,7 @@ namespace Coscine.Api.Project.Controllers
         [Route("[controller]")]
         public ActionResult<IEnumerable<DisciplineObject>> Index()
         {
-            return Json(_disciplineModel.GetAll()
+            return Ok(_disciplineModel.GetAll()
                 .OrderBy(discipline => discipline.DisplayNameDe.Substring(discipline.DisplayNameDe.Length - 3))
                 .Select((discipline) => new DisciplineObject(discipline.Id, discipline.Url, discipline.DisplayNameDe, discipline.DisplayNameEn)));
         }

src/Project/Controllers/LicenseController.cs

@@ -30,7 +30,7 @@ namespace Coscine.Api.Project.Controllers
         [Route("[controller]")]
         public ActionResult<IEnumerable<LicenseObject>> Index()
         {
-            return Json(_licenseModel.GetAll()
+            return Ok(_licenseModel.GetAll()
                 .Select((license) => new LicenseObject(license.Id, license.DisplayName)));
         }
     }

src/Project/Controllers/ProjectController.cs

@@ -180,7 +180,7 @@ namespace Coscine.Api.Project.Controllers
                     var projectObject = _projectModel.CreateReturnObjectFromDatabaseObject(_projectModel.GetById(project.Id));
                     LogAnalyticsViewProject(project, resources.ToList(), projectObject.Disciplines, projectObject.Organizations, user);
                 }
-                return Json(resources);
+                return Ok(resources);
             }
             else
             {
@@ -225,7 +225,7 @@ namespace Coscine.Api.Project.Controllers
                 var projectObject = _projectModel.CreateReturnObjectFromDatabaseObject(_projectModel.GetById(project.Id));
                 LogAnalyticsDeleteProject(project, projectObject.Disciplines, projectObject.Organizations, user);
                 DeleteProject(project);
-                return Json(_projectModel.CreateReturnObjectFromDatabaseObject(project));
+                return Ok(_projectModel.CreateReturnObjectFromDatabaseObject(project));
             }
             else
             {
@@ -376,7 +376,7 @@ namespace Coscine.Api.Project.Controllers
 
             LogAnalyticsAddProject(project, _projectModel.GetMetadataCompleteness(projectObject), projectObject.Disciplines, projectObject.Organizations, user);
 
-            return Json(_projectModel.CreateReturnObjectFromDatabaseObject(project));
+            return Ok(_projectModel.CreateReturnObjectFromDatabaseObject(project));
         }
 
         /// <summary>
@@ -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)
         {
-            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));
 

src/Project/Controllers/ProjectQuotaController.cs

@@ -69,9 +69,10 @@ namespace Coscine.Api.Project.Controllers
                 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
             }
 
             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 Json(Helpers.CreateProjectQuotaExtendedReturnObject(resourceType, id));
+            return Ok(Helpers.CreateProjectQuotaExtendedReturnObject(resourceType, id));
         }
 
         /// <summary>
@@ -133,8 +135,9 @@ namespace Coscine.Api.Project.Controllers
             }
 
             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}");
             }
@@ -198,7 +201,8 @@ namespace Coscine.Api.Project.Controllers
 
         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));
 

src/Project/Controllers/ProjectRoleController.cs

@@ -81,7 +81,7 @@ namespace Coscine.Api.Project.Controllers
                     LogAnalytics("View Users", user, users, projectId.ToString());
                 }
 
-                return Json(users);
+                return Ok(users);
             }
             else
             {
@@ -101,7 +101,7 @@ namespace Coscine.Api.Project.Controllers
             var user = _authenticator.GetUser();
             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.ProjectId == projectId)
             ).Select((projectRole) =>
@@ -141,7 +141,7 @@ namespace Coscine.Api.Project.Controllers
 
                 LogAnalytics(userIsAlreadymember == true ? "Change Role" : "Add Member", user, null, project.Id.ToString());
 
-                return Json(_projectRoleModel.SetFromObject(projectRoleObject));
+                return Ok(_projectRoleModel.SetFromObject(projectRoleObject));
             }
             else
             {
@@ -178,7 +178,7 @@ namespace Coscine.Api.Project.Controllers
 
                 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.UserId == userId
                         && projectRole.RoleId == roleId)));
@@ -212,7 +212,7 @@ namespace Coscine.Api.Project.Controllers
                 });
 
                 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.UserId == user.Id
                         && projectRole.RoleId == roleId)));

src/Project/Controllers/RoleController.cs

@@ -30,7 +30,7 @@ namespace Coscine.Api.Project.Controllers
         [Route("[controller]")]
         public ActionResult<IEnumerable<RoleObject>> Index()
         {
-            return Json(_roleModel.GetAll()
+            return Ok(_roleModel.GetAll()
                 .Select((role) => new RoleObject(role.Id, role.DisplayName)));
         }
     }

src/Project/Controllers/SubProjectController.cs

@@ -56,7 +56,7 @@ namespace Coscine.Api.Project.Controllers
                                                     .Select((subProject) => projectModel.GetById(subProject.SubProjectId))
                                                     .Select((project) => projectModel.CreateReturnObjectFromDatabaseObject(project, parentGuid))
                                                     .OrderBy(element => element.DisplayName);
-                return Json(subProjects);
+                return Ok(subProjects);
             }
             else
             {
@@ -87,7 +87,7 @@ namespace Coscine.Api.Project.Controllers
                 {
                     json["id"] = subProjects[0].ProjectId;
                 }
-                return Json(json);
+                return Ok(json);
             }
             else
             {

src/Project/Controllers/VisibilityController.cs

@@ -31,7 +31,7 @@ namespace Coscine.Api.Project.Controllers
         [Route("[controller]")]
         public ActionResult<IEnumerable<VisibilityObject>> Index()
         {
-            return Json(_visibilityModel.GetAll()
+            return Ok(_visibilityModel.GetAll()
                 .Select((visibility) => new VisibilityObject(visibility.Id, visibility.DisplayName)));
         }
     }

src/Project/Project.csproj

@@ -5,7 +5,7 @@
 		<AssemblyName>Coscine.Api.Project</AssemblyName>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<TargetFramework>net6.0</TargetFramework>
-		<Version>4.2.2</Version>
+		<Version>4.2.3</Version>
 	</PropertyGroup>
 	<PropertyGroup>
 		<Authors>RWTH Aachen University</Authors>