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-updateDependencies
  • Hotfix/0071-fixResourceCreate
  • Hotfix/1035-fixResourceApi
  • Hotfix/1360-databaseScaffolding
  • Hotfix/1383-topLevel
  • Hotfix/1383-topLevelAlternative
  • Hotfix/1433-defaultQuota
  • Hotfix/1796-projectDdos
  • Hotfix/2087-efNet6
  • Hotfix/64-releaseUDE
  • Hotfix/73-fixResourceCreateRDS
  • Issue/1321-pidEnquiryOverhaul
  • Issue/1788-extractionCronjob
  • Issue/1866-ExtendResourceTypeConfigurationTUDo
  • Issue/1867-addNewResourceTypes
  • Issue/1877-ExtendResourceTypeConfigurationNRWFHs
  • Issue/1878-addNewResourceTypes
  • Issue/1910-MigrationtoNET6.0
  • Issue/1913-ModificationsResourceMetadata
  • Issue/1951-quotaImplementation
  • Issue/1999-gitlabResourcesLib
  • Issue/2072-wormResourceType
  • Issue/2101-gitLabResTypeUi
  • Issue/2102-gitLabResTypeRCV
  • Issue/2183-kpiGeneratorResource
  • Issue/2221-projectDateCreated
  • Issue/2222-resourceDateCreated
  • Issue/2278-gitlabToS
  • Issue/2287-guestRole
  • Issue/2309-docs
  • Issue/2364-testingKpiParser
  • Issue/2449-GuidPidSlugToProjectSettings
  • Issue/3003-stsInstitute
  • Issues/0028-maxQuotaFix
  • Product/1100-fdsS3
  • Product/1149-dfnaai
  • Product/1154-resourceTypeDefinition
  • Product/1188-LoggingExtended
  • Product/1287-dotnet5Sharepoint
  • Product/1414-fhPrivileges
  • Product/1470-migrationForArchiving
  • Product/1573-ReadOnlyResources
  • Product/1629-onboardingOtherUniversities
  • Product/202-userInvitation
  • Product/407-net5migration
  • Product/704-basicReporting
  • Product/789-userContactEmail
  • Product/903-ApiTokens
  • Sprint/2020-20
  • Sprint/2020-22
  • Sprint/2021-01
  • Sprint/2021-03
  • Sprint/2021-04
  • Sprint/2021-05
  • Sprint/2021-08
  • Sprint/2021-10
  • Sprint/2021-11
  • Sprint/2021-15
  • Sprint/2021-19
  • Sprint/2022-01
  • Test/xxxx-pipelineTriggers
  • Topic/1051-basicReporting
  • Topic/1125-apiTokens
  • Topic/1159-rtdApi
  • Topic/1221-LogginExtendedNew
  • Topic/1221-LoggingExtended
  • Topic/1226-databaseLibraryMigration
  • Topic/1278-dfnAAI
  • Topic/1286-dotnet5Database
  • Topic/1292-FdsS3
  • Topic/1294-contactChangeFunctionality
  • Topic/1425-fhPrivileges
  • Topic/1453-userInvitation
  • Topic/1556-migrationForArchiving
  • Topic/1597-AddArchiveFlagInResourceObject
  • Topic/1711-extendResourceTypeConfiguration
  • Topic/1714-newResourceTypesUDE
  • dev
  • gitkeep
  • master
  • v1.0.0
  • v1.1.0
  • v1.10.0
  • v1.11.0
  • v1.12.0
  • v1.12.1
  • v1.13.0
  • v1.14.0
  • v1.15.0
  • v1.15.1
  • v1.16.0
  • v1.17.0
  • v1.18.0
  • v1.19.0
  • v1.2.0
  • v1.2.1
  • v1.2.2
  • v1.20.0
  • v1.21.0
  • v1.22.0
  • v1.22.1
  • v1.22.2
  • v1.23.0
  • v1.24.0
  • v1.25.0
  • v1.25.1
  • v1.26.0
  • v1.27.0
  • v1.27.1
  • v1.28.0
  • v1.3.0
  • v1.4.0
  • v1.5.0
  • v1.5.1
  • v1.6.0
  • v1.7.0
  • v1.8.0
  • v1.9.0
  • v2.0.0
  • v2.0.1
  • v2.1.0
  • v2.1.1
  • v2.10.0
  • v2.10.1
  • v2.11.0
  • v2.11.1
  • v2.12.0
  • v2.12.1
  • v2.13.0
  • v2.14.0
  • v2.15.0
  • v2.16.0
  • v2.16.1
  • v2.16.2
  • v2.17.0
  • v2.18.0
  • v2.19.0
  • v2.19.1
  • v2.2.0
  • v2.2.1
  • v2.20.0
  • v2.22.0
  • v2.3.0
  • v2.4.0
  • v2.4.1
  • v2.5.0
  • v2.6.0
  • v2.7.0
  • v2.7.1
  • v2.7.2
  • v2.7.3
  • v2.8.0
  • v2.9.0
  • v2.9.1
154 results

Target

Select target project
  • coscine/backend/libraries/database
1 result
Select Git revision
  • Fix/xxxx-updateDependencies
  • Hotfix/0071-fixResourceCreate
  • Hotfix/1035-fixResourceApi
  • Hotfix/1360-databaseScaffolding
  • Hotfix/1383-topLevel
  • Hotfix/1383-topLevelAlternative
  • Hotfix/1433-defaultQuota
  • Hotfix/1796-projectDdos
  • Hotfix/2087-efNet6
  • Hotfix/64-releaseUDE
  • Hotfix/73-fixResourceCreateRDS
  • Issue/1321-pidEnquiryOverhaul
  • Issue/1788-extractionCronjob
  • Issue/1866-ExtendResourceTypeConfigurationTUDo
  • Issue/1867-addNewResourceTypes
  • Issue/1877-ExtendResourceTypeConfigurationNRWFHs
  • Issue/1878-addNewResourceTypes
  • Issue/1910-MigrationtoNET6.0
  • Issue/1913-ModificationsResourceMetadata
  • Issue/1951-quotaImplementation
  • Issue/1999-gitlabResourcesLib
  • Issue/2072-wormResourceType
  • Issue/2101-gitLabResTypeUi
  • Issue/2102-gitLabResTypeRCV
  • Issue/2183-kpiGeneratorResource
  • Issue/2221-projectDateCreated
  • Issue/2222-resourceDateCreated
  • Issue/2278-gitlabToS
  • Issue/2287-guestRole
  • Issue/2309-docs
  • Issue/2364-testingKpiParser
  • Issue/2449-GuidPidSlugToProjectSettings
  • Issue/3003-stsInstitute
  • Issues/0028-maxQuotaFix
  • Product/1100-fdsS3
  • Product/1149-dfnaai
  • Product/1154-resourceTypeDefinition
  • Product/1188-LoggingExtended
  • Product/1287-dotnet5Sharepoint
  • Product/1414-fhPrivileges
  • Product/1470-migrationForArchiving
  • Product/1573-ReadOnlyResources
  • Product/1629-onboardingOtherUniversities
  • Product/202-userInvitation
  • Product/407-net5migration
  • Product/704-basicReporting
  • Product/789-userContactEmail
  • Product/903-ApiTokens
  • Sprint/2020-20
  • Sprint/2020-22
  • Sprint/2021-01
  • Sprint/2021-03
  • Sprint/2021-04
  • Sprint/2021-05
  • Sprint/2021-08
  • Sprint/2021-10
  • Sprint/2021-11
  • Sprint/2021-15
  • Sprint/2021-19
  • Sprint/2022-01
  • Test/xxxx-pipelineTriggers
  • Topic/1051-basicReporting
  • Topic/1125-apiTokens
  • Topic/1159-rtdApi
  • Topic/1221-LogginExtendedNew
  • Topic/1221-LoggingExtended
  • Topic/1226-databaseLibraryMigration
  • Topic/1278-dfnAAI
  • Topic/1286-dotnet5Database
  • Topic/1292-FdsS3
  • Topic/1294-contactChangeFunctionality
  • Topic/1425-fhPrivileges
  • Topic/1453-userInvitation
  • Topic/1556-migrationForArchiving
  • Topic/1597-AddArchiveFlagInResourceObject
  • Topic/1711-extendResourceTypeConfiguration
  • Topic/1714-newResourceTypesUDE
  • dev
  • gitkeep
  • master
  • v1.0.0
  • v1.1.0
  • v1.10.0
  • v1.11.0
  • v1.12.0
  • v1.12.1
  • v1.13.0
  • v1.14.0
  • v1.15.0
  • v1.15.1
  • v1.16.0
  • v1.17.0
  • v1.18.0
  • v1.19.0
  • v1.2.0
  • v1.2.1
  • v1.2.2
  • v1.20.0
  • v1.21.0
  • v1.22.0
  • v1.22.1
  • v1.22.2
  • v1.23.0
  • v1.24.0
  • v1.25.0
  • v1.25.1
  • v1.26.0
  • v1.27.0
  • v1.27.1
  • v1.28.0
  • v1.3.0
  • v1.4.0
  • v1.5.0
  • v1.5.1
  • v1.6.0
  • v1.7.0
  • v1.8.0
  • v1.9.0
  • v2.0.0
  • v2.0.1
  • v2.1.0
  • v2.1.1
  • v2.10.0
  • v2.10.1
  • v2.11.0
  • v2.11.1
  • v2.12.0
  • v2.12.1
  • v2.13.0
  • v2.14.0
  • v2.15.0
  • v2.16.0
  • v2.16.1
  • v2.16.2
  • v2.17.0
  • v2.18.0
  • v2.19.0
  • v2.19.1
  • v2.2.0
  • v2.2.1
  • v2.20.0
  • v2.22.0
  • v2.3.0
  • v2.4.0
  • v2.4.1
  • v2.5.0
  • v2.6.0
  • v2.7.0
  • v2.7.1
  • v2.7.2
  • v2.7.3
  • v2.8.0
  • v2.9.0
  • v2.9.1
154 results
Show changes
Commits on Source (4)
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<RootNamespace>Coscine.Database.Actions</RootNamespace> <RootNamespace>Coscine.Database.Actions</RootNamespace>
<AssemblyName>Coscine.Database.Actions</AssemblyName> <AssemblyName>Coscine.Database.Actions</AssemblyName>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<Version>2.15.0</Version> <Version>2.16.0</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Coscine.Database.Helpers" Version="2.*-*" /> <PackageReference Include="Coscine.Database.Helpers" Version="2.*-*" />
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<AssemblyName>Coscine.Database.Tests</AssemblyName> <AssemblyName>Coscine.Database.Tests</AssemblyName>
<TargetFrameworks>net6.0;net461</TargetFrameworks> <TargetFrameworks>net6.0;net461</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<Version>2.15.0</Version> <Version>2.16.0</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Database\Database.csproj" /> <ProjectReference Include="..\Database\Database.csproj" />
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<RootNamespace>Coscine.Database</RootNamespace> <RootNamespace>Coscine.Database</RootNamespace>
<AssemblyName>Coscine.Database</AssemblyName> <AssemblyName>Coscine.Database</AssemblyName>
<TargetFrameworks>net6.0;net461</TargetFrameworks> <TargetFrameworks>net6.0;net461</TargetFrameworks>
<Version>2.15.0</Version> <Version>2.16.0</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Authors>RWTH Aachen University</Authors> <Authors>RWTH Aachen University</Authors>
......
using Coscine.Database.DataModel;
using Microsoft.EntityFrameworkCore;
using System;
using System.Linq.Expressions;
namespace Coscine.Database.Models
{
public class MetadataExtractionModel : DatabaseModel<MetadataExtraction>
{
public override Expression<Func<MetadataExtraction, Guid>> GetIdFromObject()
{
return (metadataExtractionEntry) => metadataExtractionEntry.Id;
}
public override DbSet<MetadataExtraction> GetITableFromDatabase(CoscineDB db)
{
return db.MetadataExtractions;
}
public override void SetObjectId(MetadataExtraction databaseObject, Guid id)
{
databaseObject.Id = id;
}
}
}
...@@ -6,6 +6,7 @@ using System.Web; ...@@ -6,6 +6,7 @@ using System.Web;
namespace Coscine.Database.Models namespace Coscine.Database.Models
{ {
[Obsolete("This should not be used")]
public class MetadataModel : DatabaseModel<Resource> public class MetadataModel : DatabaseModel<Resource>
{ {
...@@ -24,6 +25,7 @@ namespace Coscine.Database.Models ...@@ -24,6 +25,7 @@ namespace Coscine.Database.Models
throw new NotImplementedException(); throw new NotImplementedException();
} }
[Obsolete("This should not be used")]
public Resource StoreFromObject(ResourceObject resourceObject) public Resource StoreFromObject(ResourceObject resourceObject)
{ {
Resource resource = new Resource() Resource resource = new Resource()
...@@ -42,6 +44,7 @@ namespace Coscine.Database.Models ...@@ -42,6 +44,7 @@ namespace Coscine.Database.Models
return resource; return resource;
} }
[Obsolete("This should not be used")]
public string GenerateId(string resourceId, string filename) public string GenerateId(string resourceId, string filename)
{ {
// Double UrlEncode since converting it to Uri executes one UrlDecode and Virtuoso // Double UrlEncode since converting it to Uri executes one UrlDecode and Virtuoso
...@@ -50,6 +53,7 @@ namespace Coscine.Database.Models ...@@ -50,6 +53,7 @@ namespace Coscine.Database.Models
return $"https://purl.org/coscine/md/{resourceId}/{encodedFileName}/"; return $"https://purl.org/coscine/md/{resourceId}/{encodedFileName}/";
} }
[Obsolete("This should not be used")]
public Uri CreateUri(string graphName) public Uri CreateUri(string graphName)
{ {
return new Uri(graphName); return new Uri(graphName);
......
using System;
using System.Collections.Generic;
// Code scaffolded by EF Core assumes nullable reference types (NRTs) are not used or disabled.
// If you have enabled NRTs for your project, then un-comment the following line:
// #nullable disable
namespace Coscine.Database.DataModel
{
public partial class MetadataExtraction
{
public Guid Id { get; set; }
public Guid ResourceId { get; set; }
public bool Activated { get; set; }
public virtual Resource Resource { get; set; }
}
}
...@@ -35,6 +35,7 @@ namespace Coscine.Database.DataModel ...@@ -35,6 +35,7 @@ namespace Coscine.Database.DataModel
public virtual DbSet<License> Licenses { get; set; } public virtual DbSet<License> Licenses { get; set; }
public virtual DbSet<LinkedResourceType> LinkedResourceTypes { get; set; } public virtual DbSet<LinkedResourceType> LinkedResourceTypes { get; set; }
public virtual DbSet<Log> Logs { get; set; } public virtual DbSet<Log> Logs { get; set; }
public virtual DbSet<MetadataExtraction> MetadataExtractions { get; set; }
public virtual DbSet<Project> Projects { get; set; } public virtual DbSet<Project> Projects { get; set; }
public virtual DbSet<ProjectDiscipline> ProjectDisciplines { get; set; } public virtual DbSet<ProjectDiscipline> ProjectDisciplines { get; set; }
public virtual DbSet<ProjectInstitute> ProjectInstitutes { get; set; } public virtual DbSet<ProjectInstitute> ProjectInstitutes { get; set; }
...@@ -367,6 +368,18 @@ namespace Coscine.Database.DataModel ...@@ -367,6 +368,18 @@ namespace Coscine.Database.DataModel
.HasMaxLength(500); .HasMaxLength(500);
}); });
modelBuilder.Entity<MetadataExtraction>(entity =>
{
entity.ToTable("MetadataExtraction");
entity.Property(e => e.Id).HasDefaultValueSql("(newid())");
entity.HasOne(d => d.Resource)
.WithMany(p => p.MetadataExtractions)
.HasForeignKey(d => d.ResourceId)
.HasConstraintName("FK_MetadataExtraction_ResourceId_Resources_Id");
});
modelBuilder.Entity<Project>(entity => modelBuilder.Entity<Project>(entity =>
{ {
entity.Property(e => e.Id).HasDefaultValueSql("(newid())"); entity.Property(e => e.Id).HasDefaultValueSql("(newid())");
......
...@@ -11,6 +11,7 @@ namespace Coscine.Database.DataModel ...@@ -11,6 +11,7 @@ namespace Coscine.Database.DataModel
{ {
public Resource() public Resource()
{ {
MetadataExtractions = new HashSet<MetadataExtraction>();
ProjectResources = new HashSet<ProjectResource>(); ProjectResources = new HashSet<ProjectResource>();
ResourceDisciplines = new HashSet<ResourceDiscipline>(); ResourceDisciplines = new HashSet<ResourceDiscipline>();
} }
...@@ -35,6 +36,7 @@ namespace Coscine.Database.DataModel ...@@ -35,6 +36,7 @@ namespace Coscine.Database.DataModel
public virtual License License { get; set; } public virtual License License { get; set; }
public virtual ResourceType Type { get; set; } public virtual ResourceType Type { get; set; }
public virtual Visibility Visibility { get; set; } public virtual Visibility Visibility { get; set; }
public virtual ICollection<MetadataExtraction> MetadataExtractions { get; set; }
public virtual ICollection<ProjectResource> ProjectResources { get; set; } public virtual ICollection<ProjectResource> ProjectResources { get; set; }
public virtual ICollection<ResourceDiscipline> ResourceDisciplines { get; set; } public virtual ICollection<ResourceDiscipline> ResourceDisciplines { get; set; }
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<RootNamespace>Coscine.Database</RootNamespace> <RootNamespace>Coscine.Database</RootNamespace>
<AssemblyName>Coscine.Database.Scaffolding</AssemblyName> <AssemblyName>Coscine.Database.Scaffolding</AssemblyName>
<TargetFrameworks>net6.0;net461</TargetFrameworks> <TargetFrameworks>net6.0;net461</TargetFrameworks>
<Version>2.15.0</Version> <Version>2.16.0</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Inflector.NetStandard" Version="1.2.2" /> <PackageReference Include="Inflector.NetStandard" Version="1.2.2" />
......