From 4673b18b80cfd2ab8dca29680af7082794a75208 Mon Sep 17 00:00:00 2001 From: Heinrichs <Heinrichs@itc.rwth-aachen.de> Date: Mon, 18 Jan 2021 15:46:56 +0100 Subject: [PATCH] Update: ExternalId contains organization (coscine/issues#1278) --- src/Database.T4/Database.T4.csproj | 4 ++-- src/Database.T4/packages.config | 2 +- src/Database/Database.csproj | 1 + .../ReturnObjects/ExternalIdsObject.cs | 23 +++++++++++++++++++ 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 src/Database/ReturnObjects/ExternalIdsObject.cs diff --git a/src/Database.T4/Database.T4.csproj b/src/Database.T4/Database.T4.csproj index 8d5c333..6bc7774 100644 --- a/src/Database.T4/Database.T4.csproj +++ b/src/Database.T4/Database.T4.csproj @@ -49,8 +49,8 @@ <Reference Include="Coscine.Database.Helpers, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\packages\Coscine.Database.Helpers.1.1.0\lib\net461\Coscine.Database.Helpers.dll</HintPath> </Reference> - <Reference Include="Coscine.Migrations, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Coscine.Migrations.1.9.0\lib\net461\Coscine.Migrations.dll</HintPath> + <Reference Include="Coscine.Migrations, Version=1.10.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Coscine.Migrations.1.10.0-topic-1277-migra0001\lib\net461\Coscine.Migrations.dll</HintPath> </Reference> <Reference Include="FluentMigrator, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> <HintPath>..\packages\FluentMigrator.3.2.8\lib\net461\FluentMigrator.dll</HintPath> diff --git a/src/Database.T4/packages.config b/src/Database.T4/packages.config index 1c684c8..78d5f8e 100644 --- a/src/Database.T4/packages.config +++ b/src/Database.T4/packages.config @@ -3,7 +3,7 @@ <package id="Consul" version="0.7.2.6" targetFramework="net461" /> <package id="Coscine.Configuration" version="1.5.0" targetFramework="net461" /> <package id="Coscine.Database.Helpers" version="1.1.0" targetFramework="net461" /> - <package id="Coscine.Migrations" version="1.9.0" targetFramework="net461" /> + <package id="Coscine.Migrations" version="1.10.0-topic-1277-migra0001" targetFramework="net461" /> <package id="FluentMigrator" version="3.2.8" targetFramework="net461" /> <package id="FluentMigrator.Abstractions" version="3.2.8" targetFramework="net461" /> <package id="FluentMigrator.Extensions.Oracle" version="3.2.8" targetFramework="net461" /> diff --git a/src/Database/Database.csproj b/src/Database/Database.csproj index 09a49f9..3df48d8 100644 --- a/src/Database/Database.csproj +++ b/src/Database/Database.csproj @@ -89,6 +89,7 @@ <Compile Include="Models\LogModel.cs" /> <Compile Include="ReturnObjects\DisciplineObject.cs" /> <Compile Include="ReturnObjects\ExternalAuthenticatorsObject.cs" /> + <Compile Include="ReturnObjects\ExternalIdsObject.cs" /> <Compile Include="ReturnObjects\FeatureObject.cs" /> <Compile Include="ReturnObjects\GitlabResourceTypeObject.cs" /> <Compile Include="ReturnObjects\IReturnObject.cs" /> diff --git a/src/Database/ReturnObjects/ExternalIdsObject.cs b/src/Database/ReturnObjects/ExternalIdsObject.cs new file mode 100644 index 0000000..880d6f7 --- /dev/null +++ b/src/Database/ReturnObjects/ExternalIdsObject.cs @@ -0,0 +1,23 @@ +using System; + +namespace Coscine.Database.ReturnObjects +{ + [Serializable] + public class ExternalIdsObject : IReturnObject + { + public Guid Id { get; set; } + public Guid UserId { get; set; } + public Guid ExternalAuthenticatorId { get; set; } + public string Organization { get; set; } + public string ExternalId { get; set; } + + public ExternalIdsObject(Guid id, Guid userId, Guid externalAuthenticatorId, string organization, string externalId) + { + Id = id; + UserId = userId; + ExternalAuthenticatorId = externalAuthenticatorId; + Organization = organization; + ExternalId = externalId; + } + } +} -- GitLab