Skip to content

CSCTTV-4491-4498-4505 Three new fields added to publication #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LauriHellsten merged 1 commit into from
Mar 31, 2026
Merged

CSCTTV-4491-4498-4505 Three new fields added to publication #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions aspnetcore/src/ApiModels/CodeList/ArtPublicationType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace ResearchFi.CodeList;

/// <summary>
/// artPublicationType
/// </summary>
public class ArtPublicationType : CodeList
{
}
8 changes: 8 additions & 0 deletions aspnetcore/src/ApiModels/CodeList/AudioVisualApplicationType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace ResearchFi.CodeList;

/// <summary>
/// Report
/// </summary>
public class AudioVisualApplicationType : CodeList
{
}
8 changes: 8 additions & 0 deletions aspnetcore/src/ApiModels/CodeList/ReportSwitch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace ResearchFi.CodeList;

/// <summary>
/// Report
/// </summary>
public class ReportSwitch : CodeList
{
}
22 changes: 22 additions & 0 deletions aspnetcore/src/ApiModels/V1/Publication/Publication.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,14 @@
///
/// https://uri.suomi.fi/codelist/research/AvoinSaatavuusKytkin
/// </summary>
public OpenAccess OpenAccess { get; set; }

Check warning on line 130 in aspnetcore/src/ApiModels/V1/Publication/Publication.cs

View workflow job for this annotation

GitHub Actions / build 

Non-nullable property 'OpenAccess' must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring the property as nullable.

/// <summary>
/// Open Access status of a publication channel
///
/// https://uri.suomi.fi/codelist/research/JulkaisuKanavaOA
/// </summary>
public PublisherOpenAccess PublisherOpenAccess { get; set; }

Check warning on line 137 in aspnetcore/src/ApiModels/V1/Publication/Publication.cs

View workflow job for this annotation

GitHub Actions / build 

Non-nullable property 'PublisherOpenAccess' must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring the property as nullable.

/// <summary>
/// Parent publication
Expand Down Expand Up @@ -291,6 +291,28 @@
/// </summary>
public string? Abstract { get; set; }

/// <summary>
/// Report
///
/// https://uri.suomi.fi/codelist/research/raportti
/// </summary>
public ReportSwitch? ReportSwitch { get; set; }

/// <summary>
/// Art publication type
///
/// https://uri.suomi.fi/codelist/research/TaidetyyppiKoodi
/// </summary>
public ArtPublicationType? ArtPublicationType { get; set; }

/// <summary>
/// Audiovisual Application Type
///
/// https://uri.suomi.fi/codelist/research/AVSovellusTyyppiKoodi
/// </summary>
public AudioVisualApplicationType? AudioVisualApplicationType { get; set; }


/// <summary>
/// Creation time
/// </summary>
Expand Down
3 changes: 3 additions & 0 deletions aspnetcore/src/Interface/Maps/V1/PublicationProfile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ public PublicationProfile()
CreateMap<Service.Models.ReferenceData, OpenAccess>();
CreateMap<Service.Models.ReferenceData, PublisherOpenAccess>();
CreateMap<Service.Models.ReferenceData, ThesisType>();
CreateMap<Service.Models.ReferenceData, ReportSwitch>();
CreateMap<Service.Models.ReferenceData, ArtPublicationType>();
CreateMap<Service.Models.ReferenceData, AudioVisualApplicationType>();
CreateMap<Service.Models.Keyword, Keyword>();
CreateMap<Service.Models.ResearchfiUrl, ResearchFi.ResearchfiUrl>();
CreateMap<Service.Models.OrganizationPartOfCoPublication, ResearchFi.OrganizationPartOfCoPublication>();
Expand Down
3 changes: 3 additions & 0 deletions aspnetcore/src/Repositories/Maps/PublicationProfile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ public PublicationProfile()
.ForMember(dst => dst.ArtPublicationTypeCategory, opt => opt.MapFrom(src => src.DimReferencedata))
.ForMember(dst => dst.OrgPublicationArtPublicatonTypeCategoryDTOs, opt => opt.MapFrom(src => src.InverseDimPublicationNavigation))
.ForMember(dst => dst.Abstract, opt => opt.MapFrom(src => src.DimDescriptiveItems.Where(di => di.DescriptiveItemType == DescriptiveItemType_Abstract).Select(di => di.DescriptiveItem).FirstOrDefault()))
.ForMember(dst => dst.ReportSwitch, opt => opt.MapFrom(src => src.ReportSwitchNavigation))
.ForMember(dst => dst.AudioVisualApplicationType, opt => opt.MapFrom(src => src.AvApplicationTypeCodeNavigation))
.ForMember(dst => dst.ArtPublicationType, opt => opt.MapFrom(src => src.ArtTypeCodeNavigation))
.ForMember(dst => dst.Created, opt => opt.MapFrom(src => src.Created))
.ForMember(dst => dst.Modified, opt => opt.MapFrom(src => src.Modified))
.ForMember(dst => dst.Doi, opt => opt.MapFrom(src => src.DimPids.Where(pid => pid.PidType == "doi").Select(pid => pid.PidContent).FirstOrDefault()))
Expand Down
15 changes: 15 additions & 0 deletions aspnetcore/src/Service.Models/Publication/Publication.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,21 @@ public class Publication
/// </summary>
public string? Abstract { get; set; }

/// <summary>
/// OKM:n raporttiluokitus
/// </summary>
public ReferenceData? ReportSwitch { get; set; }

/// <summary>
/// OKM:n AVsovellustyyppiluokitus
/// </summary>
public ReferenceData? AudioVisualApplicationType { get; set; }

/// <summary>
/// OKM:n Taidetyyppiluokitus
/// </summary>
public ReferenceData? ArtPublicationType { get; set; }

/// <summary>
/// Luontiaika
/// </summary>
Expand Down
42 changes: 42 additions & 0 deletions aspnetcore/test/Indexer.Tests/Maps/PublicationProfileTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,27 @@ private static DimPublication GetEntity()
NameSv = "targetAudienceNameSv",
NameEn = "targetAudienceNameEn"
},
ReportSwitchNavigation = new DimReferencedatum
{
CodeValue = "reportSwitchCode",
NameFi = "reportSwitchNameFi",
NameSv = "reportSwitchNameSv",
NameEn = "reportSwitchNameEn"
},
ArtTypeCodeNavigation = new DimReferencedatum
{
CodeValue = "artPublicationTypeCode",
NameFi = "artPublicationTypeNameFi",
NameSv = "artPublicationTypeNameSv",
NameEn = "artPublicationTypeNameEn"
},
AvApplicationTypeCodeNavigation = new DimReferencedatum
{
CodeValue = "avApplicationTypeCodeCode",
NameFi = "avApplicationTypeNameFi",
NameSv = "avApplicationTypeNameSv",
NameEn = "avApplicationTypeNameEn"
},
PublicationTypeCodeNavigation = new DimReferencedatum
{
CodeValue = "publicationTypeCode",
Expand Down Expand Up @@ -519,6 +540,27 @@ private Publication GetModel()
NameSv = "targetAudienceNameSv",
NameEn = "targetAudienceNameEn"
},
ReportSwitch = new ReferenceData
{
Code = "reportSwitchCode",
NameFi = "reportSwitchNameFi",
NameSv = "reportSwitchNameSv",
NameEn = "reportSwitchNameEn"
},
ArtPublicationType = new ReferenceData
{
Code = "artPublicationTypeCode",
NameFi = "artPublicationTypeNameFi",
NameSv = "artPublicationTypeNameSv",
NameEn = "artPublicationTypeNameEn"
},
AudioVisualApplicationType = new ReferenceData
{
Code = "avApplicationTypeCodeCode",
NameFi = "avApplicationTypeNameFi",
NameSv = "avApplicationTypeNameSv",
NameEn = "avApplicationTypeNameEn"
},
Type = new ReferenceData
{
Code = "publicationTypeCode",
Expand Down
44 changes: 44 additions & 0 deletions aspnetcore/test/Interface.Tests/Maps/V1/PublicationProfileTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,29 @@ private static object GetServiceModel()
NameSv = "targetAudienceNameSv",
NameEn = "targetAudienceNameEn"
},
ReportSwitch = new Service.Models.ReferenceData
{
Code = "reportSwitchCode",
NameFi = "reportSwitchNameFi",
NameSv = "reportSwitchNameSv",
NameEn = "reportSwitchNameEn"
},
ArtPublicationType = new Service.Models.ReferenceData
{

Code = "artPublicationTypeCode",
NameFi = "artPublicationTypeNameFi",
NameSv = "artPublicationTypeNameSv",
NameEn = "artPublicationTypeNameEn"
},
AudioVisualApplicationType = new Service.Models.ReferenceData
{

Code = "audioVisualApplicationTypeCode",
NameFi = "audioVisualApplicationNameFi",
NameSv = "audioVisualApplicationNameSv",
NameEn = "audioVisualApplicationTypeNameEn"
},
Type = new ReferenceData
{
Code = "publicationTypeCode"
Expand Down Expand Up @@ -346,6 +369,27 @@ private static object GetApiModel()
NameSv = "targetAudienceNameSv",
NameEn = "targetAudienceNameEn"
},
ReportSwitch = new ReportSwitch
{
Code = "reportSwitchCode",
NameFi = "reportSwitchNameFi",
NameSv = "reportSwitchNameSv",
NameEn = "reportSwitchNameEn"
},
ArtPublicationType = new ArtPublicationType
{
Code = "artPublicationTypeCode",
NameFi = "artPublicationTypeNameFi",
NameSv = "artPublicationTypeNameSv",
NameEn = "artPublicationTypeNameEn"
},
AudioVisualApplicationType = new AudioVisualApplicationType
{
Code = "audioVisualApplicationTypeCode",
NameFi = "audioVisualApplicationNameFi",
NameSv = "audioVisualApplicationNameSv",
NameEn = "audioVisualApplicationTypeNameEn"
},
Type = new PublicationType
{
Code = "publicationTypeCode"
Expand Down
Loading