Merge branch 'Sprint/2020-09' into 'master'

Sprint/2020-09

See merge request coscine/cs/database!70

src/Database/Models/ResourceModel.cs

@@ -13,8 +13,6 @@ namespace Coscine.Database.Models
 {
     public class ResourceModel : DatabaseModel<Resource>
     {
-        private readonly IConfiguration _configuration = new ConsulConfiguration();
-
         public Resource StoreFromObject(ResourceObject resourceObject)
         {
             if (resourceObject.Disciplines.Count() == 0 || resourceObject.ResourceTypeOption == null)
@@ -90,7 +88,7 @@ namespace Coscine.Database.Models
                 {
                     RDSResourceType rdsResourceType = new RDSResourceType()
                     {
-                        BucketName = GetRDSBucketName(),
+                        BucketName = resource.Id.ToString(),
                         Size = rdsResourceTypeObject.Size,
                     };
                     rdsResourceTypeModel.Insert(rdsResourceType);
@@ -158,17 +156,6 @@ namespace Coscine.Database.Models
             }
         }
 
-        private string GetRDSBucketName()
-        {
-            var prefix = _configuration.GetStringAndWait("coscine/global/buckets/prefix");
-            var number = Int32.Parse(_configuration.GetStringAndWait("coscine/global/buckets/currentid"));
-            var maxNumber = Int32.Parse(_configuration.GetStringAndWait("coscine/global/buckets/highestid"));
-            var newNumber = number % maxNumber == 0 ? 1 : number + 1;
-            _configuration.Put("coscine/global/buckets/currentid", "" + newNumber);
-
-            return String.Format("{0}{1,3:000}", prefix, number);
-        }
-
         private void SetDisciplines(Resource resource, IEnumerable<DisciplineObject> disciplines)
         {
             ResourceDisciplineModel resourceDisciplineModel = new ResourceDisciplineModel();
@@ -323,7 +310,7 @@ namespace Coscine.Database.Models
                 (resource.License != null) ? new LicenseObject(resource.License.Id, resource.License.DisplayName) : null,
                 JObject.FromObject(resourceTypeOptionObject),
                 resource.ApplicationProfile,
-                JToken.Parse(resource.FixedValues == null ? "{}": resource.FixedValues ),
+                JToken.Parse(resource.FixedValues ?? "{}"),
                 (resource.Creator != null) ? resource.Creator : null
             );
         }