CSCTTV-4052 Add jufoCodeRecorded and jufoClassCodeRecorded

aspnetcore/src/ApiModels/Publication/Publication.cs

@@ -127,14 +127,14 @@
     ///
     /// http://uri.suomi.fi/codelist/research/AvoinSaatavuusKytkin
     /// </summary>
     public OpenAccess OpenAccess { get; set; }
 
     /// <summary>
     /// Open Access status of a publication channel
     ///
     /// http://uri.suomi.fi/codelist/research/JulkaisuKanavaOA
     /// </summary>
     public PublisherOpenAccess PublisherOpenAccess { get; set; }
 
     /// <summary>
     /// Parent publication
@@ -163,6 +163,18 @@
     /// </summary>
     public JufoClass? JufoClass { get; set; }
 
+    /// <summary>
+    /// Publication forum (recorded)
+    /// </summary>
+    public string? JufoCodeRecorded { get; set; }
+
+    /// <summary>
+    /// Publication forum classification (recorded)
+    ///
+    /// http://uri.suomi.fi/codelist/research/julkaisufoorumiluokitus
+    /// </summary>
+    public JufoClass? jufoClassRecorded { get; set; }
+
     /// <summary>
     /// DOI
     /// </summary>

aspnetcore/src/ApiModels/Query/GetPublicationsQueryParameters.cs

@@ -71,7 +71,7 @@ public class GetPublicationsQueryParameters
     /// <summary>
     /// The field type:code is exactly equal to the text.
     ///
-    /// Code: http://uri.suomi.fi/codelist/research/Julkaisutyyppiluokitus
+    /// Code: https://koodistot.suomi.fi/codescheme;registryCode=research;schemeCode=Julkaisutyyppiluokitus
     /// </summary>
     /// <see cref="Publication.Type"/>
     public string? Type { get; set; }
@@ -121,11 +121,33 @@ public class GetPublicationsQueryParameters
     public string? PublisherName { get; set; }
 
     /// <summary>
-    /// The field jufocode contains text.
+    /// The field jufoCode contains text.
     /// </summary>
     /// <see cref="Publication.JufoCode"/>
     public string? JufoCode { get; set; }
 
+    /// <summary>
+    /// The field jufoCodeRecorded contains text. Recorded as part of national publication data collection.
+    /// </summary>
+    /// <see cref="Publication.JufoCodeRecorded"/>
+    public string? JufoCodeRecorded { get; set; }
+
+    /// <summary>
+    /// The field jufoClass is exactly equal to text.
+    /// 
+    /// Code: https://koodistot.suomi.fi/codescheme;registryCode=research;schemeCode=Julkaisufoorumiluokitus
+    /// </summary>
+    /// <see cref="Publication.JufoClass"/>
+    public string? JufoClass { get; set; }
+
+    /// <summary>
+    /// The field jufoClassRecorded is exactly equal to text. Recorded as part of national publication data collection.
+    /// 
+    /// Code: https://koodistot.suomi.fi/codescheme;registryCode=research;schemeCode=Julkaisufoorumiluokitus
+    /// </summary>
+    /// <see cref="Publication.JufoClassRecorded"/>
+    public string? JufoClassRecorded { get; set; }
+
     /// <summary>
     /// The field doi is exactly equal to the text.
     /// </summary>
@@ -142,7 +164,7 @@ public class GetPublicationsQueryParameters
     /// <summary>
     /// The field publisherOpenAccess:code is exactly equal to the text.
     ///
-    /// Code: http://uri.suomi.fi/codelist/research/JulkaisuKanavaOA
+    /// Code: https://koodistot.suomi.fi/codescheme;registryCode=research;schemeCode=JulkaisuKanavaOA
     /// </summary>
     /// <see cref="Publication.PublisherOpenAccess"/>
     public string? PublisherOpenAccess { get; set; }
@@ -156,7 +178,7 @@ public class GetPublicationsQueryParameters
     /// <summary>
     /// The field status is exactly equal to the text.
     ///
-    /// Code: http://uri.suomi.fi/codelist/research/julkaisuntila
+    /// Code: https://koodistot.suomi.fi/codescheme;registryCode=research;schemeCode=julkaisuntila
     /// </summary>
     /// <see cref="Publication.Status"/>
     public string? Status { get; set; }

aspnetcore/src/DatabaseContext/Entities/DimPublication.cs

@@ -123,6 +123,10 @@ public partial class DimPublication
 
     public int? DimPublicationId { get; set; }
 
+    public int JufoClassCodeFrozen { get; set; }
+
+    public int DimPublicationChannelIdFrozen { get; set; }
+
     public virtual DimReferencedatum? ArticleTypeCodeNavigation { get; set; }
 
     public virtual ICollection<DimLocallyReportedPubInfo> DimLocallyReportedPubInfos { get; set; } = new List<DimLocallyReportedPubInfo>();
@@ -131,6 +135,8 @@ public partial class DimPublication
 
     public virtual DimPublicationChannel DimPublicationChannel { get; set; } = null!;
 
+    public virtual DimPublicationChannel DimPublicationChannelIdFrozenNavigation { get; set; } = null!;
+
     public virtual DimPublication? DimPublicationNavigation { get; set; }
 
     public virtual DimRegisteredDataSource DimRegisteredDataSource { get; set; } = null!;
@@ -143,6 +149,8 @@ public partial class DimPublication
 
     public virtual ICollection<DimPublication> InverseDimPublicationNavigation { get; set; } = new List<DimPublication>();
 
+    public virtual DimReferencedatum JufoClassCodeFrozenNavigation { get; set; } = null!;
+
     public virtual DimReferencedatum JufoClassNavigation { get; set; } = null!;
 
     public virtual DimReferencedatum LanguageCodeNavigation { get; set; } = null!;

aspnetcore/src/DatabaseContext/Entities/DimPublicationChannel.cs

@@ -23,7 +23,9 @@ public partial class DimPublicationChannel
 
     public virtual ICollection<DimPid> DimPids { get; set; } = new List<DimPid>();
 
-    public virtual ICollection<DimPublication> DimPublications { get; set; } = new List<DimPublication>();
+    public virtual ICollection<DimPublication> DimPublicationDimPublicationChannelIdFrozenNavigations { get; set; } = new List<DimPublication>();
+
+    public virtual ICollection<DimPublication> DimPublicationDimPublicationChannels { get; set; } = new List<DimPublication>();
 
     public virtual ICollection<DimResearchActivity> DimResearchActivities { get; set; } = new List<DimResearchActivity>();
 }

aspnetcore/src/DatabaseContext/Entities/DimReferencedatum.cs

@@ -69,6 +69,8 @@ public partial class DimReferencedatum
 
     public virtual ICollection<DimPublication> DimPublicationArticleTypeCodeNavigations { get; set; } = new List<DimPublication>();
 
+    public virtual ICollection<DimPublication> DimPublicationJufoClassCodeFrozenNavigations { get; set; } = new List<DimPublication>();
+
     public virtual ICollection<DimPublication> DimPublicationJufoClassNavigations { get; set; } = new List<DimPublication>();
 
     public virtual ICollection<DimPublication> DimPublicationLanguageCodeNavigations { get; set; } = new List<DimPublication>();

aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/PublicationQueryGenerator.cs

@@ -258,15 +258,6 @@ private static IEnumerable<Func<QueryContainerDescriptor<Publication>, QueryCont
                 .Value(parameters.TypeCode)
             ));
         }
-
-        // Searching with publisher open access code requires exact match.
-        if (!string.IsNullOrWhiteSpace(parameters.PublisherOpenAccess))
-        {
-            filters.Add(t => t.Term(term => term
-                .Field(f => f.PublisherOpenAccess!.Code)
-                .Value(parameters.PublisherOpenAccess)
-            ));
-        }
 
         if (parameters.Issn is not null)
         {
@@ -289,6 +280,13 @@ private static IEnumerable<Func<QueryContainerDescriptor<Publication>, QueryCont
                 t.Term(s => s.Field(f => f.JufoCode)
                     .Value(parameters.JufoCode)));
         }
+
+        if (parameters.JufoCodeRecorded is not null)
+        {
+            filters.Add(t =>
+                t.Term(s => s.Field(f => f.JufoCodeRecorded)
+                    .Value(parameters.JufoCodeRecorded)));
+        }
 
         if (parameters.Doi is not null)
         {
@@ -297,6 +295,33 @@ private static IEnumerable<Func<QueryContainerDescriptor<Publication>, QueryCont
                     .Value(parameters.Doi)));
         }
 
+        // Searching with jufo class requires exact match.
+        if (!string.IsNullOrWhiteSpace(parameters.JufoClass))
+        {
+            filters.Add(t => t.Term(term => term
+                .Field(f => f.JufoClass!.Code)
+                .Value(parameters.JufoClass)
+            ));
+        }
+
+        // Searching with jufo class recorded requires exact match.
+        if (!string.IsNullOrWhiteSpace(parameters.JufoClassRecorded))
+        {
+            filters.Add(t => t.Term(term => term
+                .Field(f => f.JufoClassRecorded!.Code)
+                .Value(parameters.JufoClassRecorded)
+            ));
+        }
+
+        // Searching with publisher open access code requires exact match.
+        if (!string.IsNullOrWhiteSpace(parameters.PublisherOpenAccess))
+        {
+            filters.Add(t => t.Term(term => term
+                .Field(f => f.PublisherOpenAccess!.Code)
+                .Value(parameters.PublisherOpenAccess)
+            ));
+        }
+
         // Searching with status requires exact match.
         if (!string.IsNullOrWhiteSpace(parameters.Status))
         {

aspnetcore/src/ElasticService/SearchParameters/PublicationSearchParameters.cs

@@ -40,6 +40,12 @@ public class PublicationSearchParameters
 
     public string? JufoCode { get; set; }
 
+    public string? JufoCodeRecorded { get; set; }
+
+    public string? JufoClass { get; set; }
+
+    public string? JufoClassRecorded { get; set; }
+
     public string? Doi { get; set; }
 
     public string? Keywords { get; set; }

aspnetcore/src/Indexer/Indexer.csproj

@@ -13,7 +13,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />

aspnetcore/src/Repositories/Maps/PublicationProfile.cs

@@ -53,6 +53,8 @@ public PublicationProfile()
             .ForMember(dst => dst.PublisherLocation, opt => opt.MapFrom(src => src.PublisherLocation))
             .ForMember(dst => dst.JufoCode, opt => opt.MapFrom(src => src.DimPublicationChannel.JufoCode))
             .ForMember(dst => dst.JufoClass, opt => opt.MapFrom(src => src.JufoClassNavigation))
+            .ForMember(dst => dst.JufoCodeRecorded, opt => opt.MapFrom(src => src.DimPublicationChannelIdFrozenNavigation.JufoCode))
+            .ForMember(dst => dst.JufoClassRecorded, opt => opt.MapFrom(src => src.JufoClassCodeFrozenNavigation))
             .ForMember(dst => dst.Doi, opt => opt.MapFrom(src => src.Doi))
             .ForMember(dst => dst.DoiHandle, opt => opt.MapFrom(src => src.DoiHandle))
             .ForMember(dst => dst.FieldsOfScience, opt => opt.MapFrom(src => src.FactDimReferencedataFieldOfSciences.Select(f => f.DimReferencedata)))

aspnetcore/src/Service.Models/Publication/Publication.cs

@@ -137,6 +137,16 @@ public class Publication
     /// </summary>
     public ReferenceData? JufoClass { get; set; }
 
+    /// <summary>
+    /// Julkaisufoorumi (jäädytetty)
+    /// </summary>
+    public string? JufoCodeRecorded { get; set; }
+
+    /// <summary>
+    /// Julkaisufoorumitaso (jäädytetty)
+    /// </summary>
+    public ReferenceData? JufoClassRecorded { get; set; }
+
     /// <summary>
     /// Linkit
     /// </summary>

aspnetcore/test/Indexer.Tests/Maps/PublicationProfileTest.cs

@@ -261,6 +261,19 @@ private static DimPublication GetEntity()
                 ChannelNameAnylang = "channelNameAnylang",
                 PublisherNameText = "publisherNameText",
             },
+            JufoClassCodeFrozenNavigation = new DimReferencedatum
+            {
+                CodeValue = "jufoClassCodeFrozen",
+                NameFi = "jufoClassCodeFrozenNameFi",
+                NameEn = "jufoClassCodeFrozenNameEn",
+                NameSv = "jufoClassCodeFrozenNameSv"
+            },
+            DimPublicationChannelIdFrozenNavigation = new()
+            {
+                JufoCode = "jufoCodeFrozen",
+                ChannelNameAnylang = "channelNameAnylang2",
+                PublisherNameText = "publisherNameText2",
+            },
             PublisherOpenAccessCodeNavigation = new DimReferencedatum
             {
                 CodeValue = "publisherOpenAccessCode",
@@ -495,6 +508,14 @@ private Publication GetModel()
                 NameEn = "jufoClassNameEn",
                 NameSv = "jufoClassNameSv"
             },
+            JufoCodeRecorded = "jufoCodeFrozen",
+            JufoClassRecorded = new ReferenceData
+            {
+                Code = "jufoClassCodeFrozen",
+                NameFi = "jufoClassCodeFrozenNameFi",
+                NameEn = "jufoClassCodeFrozenNameEn",
+                NameSv = "jufoClassCodeFrozenNameSv"
+            },
             Doi = "doi",
             DoiHandle = "doiHandle",
             Keywords = new List<Keyword>