Merge branch 'Sprint/20190829' into 'master'

Sprint/20190829

See merge request coscine/cs/database!16

src/Database/Database.csproj

@@ -77,10 +77,10 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="DataModel\CsDatabase.tt">
+    <None Include="DataModel\CsDatabase.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>CsDatabase.generated.cs</LastGenOutput>
-    </Content>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />

src/Migrator/Migrations/Migration201908231520ResourceDisplayName.cs

+using FluentMigrator;
+namespace Coscine.Database.Migration.Migrations
+{
+    //yyyymmddhhmm
+    [Migration(201908231520)]
+    public class Migration201908231520ResourceDisplayName : FluentMigrator.Migration
+    {
+        public override void Down()
+        {
+            Delete.Column("DisplayName").FromTable("Resources");
+        }
+
+        public override void Up()
+        {
+            Alter.Table("Resources").AddColumn("DisplayName").AsString(200).Nullable();
+        }
+    }
+}

src/Migrator/Migrations/Migration201908290941ORCiD.cs

+using FluentMigrator;
+namespace Coscine.Database.Migration.Migrations
+{
+    //yyyymmddhhmm
+    [Migration(201908290941)]
+    public class Migration201908290941ORCiD : FluentMigrator.Migration
+    {
+        public override void Down()
+        {
+            Rename.Column("ExternalAuthenticatorId").OnTable("ExternalIds").To("ResourceTypeId");
+
+            Delete.FromTable("ExternalAuthenticators").Row(new { DisplayName = "ORCiD" });
+        }
+
+        public override void Up()
+        {
+            Rename.Column("ResourceTypeId").OnTable("ExternalIds").To("ExternalAuthenticatorId");
+
+            Insert.IntoTable("ExternalAuthenticators").Row(new { DisplayName = "ORCiD" });
+        }
+    }
+}

src/Migrator/Migrator.csproj

@@ -145,9 +145,11 @@
   <ItemGroup>
     <Compile Include="Migrations\Migration201907011352ProjectApi.cs" />
     <Compile Include="Migrations\Migration201907081510EnhanceProjectApi.cs" />
+    <Compile Include="Migrations\Migration201908290941ORCiD.cs" />
     <Compile Include="Migrations\Migration201908121401GitlabResource.cs" />
     <Compile Include="Migrations\Migration201908071616RdsResource.cs" />
     <Compile Include="Migrations\Migration201907100900UserProfilesApi.cs" />
+    <Compile Include="Migrations\Migration201908231520ResourceDisplayName.cs" />
     <Compile Include="Migrator.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

tools/packages.config

 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-    <package id="Cake" version="0.28.0" />
+    <package id="Cake" version="0.34.1" />
 </packages>