Add LinkType to weblinks. Add new property WebLinks to research activity. (#290)

sarkikos · web-flow · commit f28947c39b85 · 2025-11-26T14:12:02.000+02:00
diff --git a/aspnetcore/src/api.Tests/Services_Tests/ElasticsearchMapperTest.cs b/aspnetcore/src/api.Tests/Services_Tests/ElasticsearchMapperTest.cs
@@ -746,6 +746,21 @@ private ProfileEditorDataResponse GetProfileEditorDataResponse()
                             DepartmentNameSv = "activityAndReward 1 - department-name-sv",
                             DepartmentNameEn = "activityAndReward 1 - department-name-en",
                             Url = "activityAndReward 1 - url",
+                            WebLinks = new List<ProfileEditorWebLink_WithoutItemMeta>()
+                            {
+                                new ProfileEditorWebLink_WithoutItemMeta
+                                {
+                                    Url = "https://example.org/activityAndReward1/weblink1",
+                                    LinkLabel = "activityAndReward 1 - weblink1 - nameFi",
+                                    LinkType = "activityAndReward 1 - weblink1 - type"
+                                },
+                                new ProfileEditorWebLink_WithoutItemMeta
+                                {
+                                    Url = "https://example.org/activityAndReward1/weblink2",
+                                    LinkLabel = "activityAndReward 1 - weblink2 - nameFi",
+                                    LinkType = "activityAndReward 1 - weblink2 - type"
+                                }
+                            },
                             sector = new List<ProfileEditorSector> {
                                 new ProfileEditorSector
                                 {
@@ -807,6 +822,7 @@ private ProfileEditorDataResponse GetProfileEditorDataResponse()
                             DepartmentNameSv = "activityAndReward 3 - department-name-sv",
                             DepartmentNameEn = "activityAndReward 3 - department-name-en",
                             Url = "activityAndReward 3 - url",
+                            WebLinks = new List<ProfileEditorWebLink_WithoutItemMeta>(),
                             sector = new List<ProfileEditorSector> {
                                 new ProfileEditorSector
                                 {
@@ -971,12 +987,14 @@ private ElasticsearchPerson GetElasticsearchPerson()
                         new ElasticsearchWebLink {
                             Url = "https://example1.org",
                             LinkLabel = "Example 1",
+                            LinkType = "Type 1",
                             itemMeta = new ElasticsearchItemMeta { PrimaryValue = true },
                             DataSources = new List<ElasticsearchSource> { elasticsearchSource1 }
                         },
                         new ElasticsearchWebLink {
                             Url = "https://example3.org",
                             LinkLabel = "Example 3",
+                            LinkType = "Type 3",
                             itemMeta = new ElasticsearchItemMeta { PrimaryValue = false },
                             DataSources = new List<ElasticsearchSource> { elasticsearchSource3 }
                         }
@@ -1472,6 +1490,21 @@ private ElasticsearchPerson GetElasticsearchPerson()
                             DepartmentNameSv = "activityAndReward 1 - department-name-sv",
                             DepartmentNameEn = "activityAndReward 1 - department-name-en",
                             Url = "activityAndReward 1 - url",
+                            WebLinks = new List<ElasticsearchWebLink_WithoutItemMeta>()
+                            {
+                                new ElasticsearchWebLink_WithoutItemMeta
+                                {
+                                    Url = "https://example.org/activityAndReward1/weblink1",
+                                    LinkLabel = "activityAndReward 1 - weblink1 - nameFi",
+                                    LinkType = "activityAndReward 1 - weblink1 - type"
+                                },
+                                new ElasticsearchWebLink_WithoutItemMeta
+                                {
+                                    Url = "https://example.org/activityAndReward1/weblink2",
+                                    LinkLabel = "activityAndReward 1 - weblink2 - nameFi",
+                                    LinkType = "activityAndReward 1 - weblink2 - type"
+                                }
+                            },
                             sector = new List<ElasticsearchSector> {
                                 new ElasticsearchSector
                                 {
@@ -2113,6 +2146,12 @@ public void getCorrectDataSourceOrganizationName_ORCID()
             Assert.Equal(expectedObject.activity.activitiesAndRewards[0].DepartmentNameSv, actualObject.activity.activitiesAndRewards[0].DepartmentNameSv);
             Assert.Equal(expectedObject.activity.activitiesAndRewards[0].DepartmentNameEn, actualObject.activity.activitiesAndRewards[0].DepartmentNameEn);
             Assert.Equal(expectedObject.activity.activitiesAndRewards[0].Url, actualObject.activity.activitiesAndRewards[0].Url);
+            Assert.Equal(expectedObject.activity.activitiesAndRewards[0].WebLinks[0].Url, actualObject.activity.activitiesAndRewards[0].WebLinks[0].Url);
+            Assert.Equal(expectedObject.activity.activitiesAndRewards[0].WebLinks[0].LinkLabel, actualObject.activity.activitiesAndRewards[0].WebLinks[0].LinkLabel);
+            Assert.Equal(expectedObject.activity.activitiesAndRewards[0].WebLinks[0].LinkType, actualObject.activity.activitiesAndRewards[0].WebLinks[0].LinkType);
+            Assert.Equal(expectedObject.activity.activitiesAndRewards[0].WebLinks[1].Url, actualObject.activity.activitiesAndRewards[0].WebLinks[1].Url);
+            Assert.Equal(expectedObject.activity.activitiesAndRewards[0].WebLinks[1].LinkLabel, actualObject.activity.activitiesAndRewards[0].WebLinks[1].LinkLabel);
+            Assert.Equal(expectedObject.activity.activitiesAndRewards[0].WebLinks[1].LinkType, actualObject.activity.activitiesAndRewards[0].WebLinks[1].LinkType);
             Assert.Equal(expectedObject.activity.activitiesAndRewards[0].sector.Count, actualObject.activity.activitiesAndRewards[0].sector.Count);
             Assert.Equal(expectedObject.activity.activitiesAndRewards[0].sector[0].sectorId, actualObject.activity.activitiesAndRewards[0].sector[0].sectorId);
             Assert.Equal(expectedObject.activity.activitiesAndRewards[0].sector[0].nameFiSector, actualObject.activity.activitiesAndRewards[0].sector[0].nameFiSector);
@@ -2157,6 +2196,7 @@ public void getCorrectDataSourceOrganizationName_ORCID()
             Assert.Equal(expectedObject.activity.activitiesAndRewards[1].DepartmentNameSv, actualObject.activity.activitiesAndRewards[1].DepartmentNameSv);
             Assert.Equal(expectedObject.activity.activitiesAndRewards[1].DepartmentNameEn, actualObject.activity.activitiesAndRewards[1].DepartmentNameEn);
             Assert.Equal(expectedObject.activity.activitiesAndRewards[1].Url, actualObject.activity.activitiesAndRewards[1].Url);
+            Assert.Equal(expectedObject.activity.activitiesAndRewards[1].WebLinks.Count, actualObject.activity.activitiesAndRewards[1].WebLinks.Count);
             Assert.Equal(expectedObject.activity.activitiesAndRewards[1].sector.Count, actualObject.activity.activitiesAndRewards[1].sector.Count);
             Assert.Equal(expectedObject.activity.activitiesAndRewards[1].sector[0].sectorId, actualObject.activity.activitiesAndRewards[1].sector[0].sectorId);
             Assert.Equal(expectedObject.activity.activitiesAndRewards[1].sector[0].nameFiSector, actualObject.activity.activitiesAndRewards[1].sector[0].nameFiSector);
diff --git a/aspnetcore/src/api.Tests/Services_Tests/TtvSqlServiceTest.cs b/aspnetcore/src/api.Tests/Services_Tests/TtvSqlServiceTest.cs
@@ -1074,6 +1074,7 @@ public void GetSqlQuery_ProfileData_ProfileEditor()
                     dim_name.full_name AS 'DimName_FullName',
                     dim_web_link.url AS 'DimWebLink_Url',
                     dim_web_link.link_label AS 'DimWebLink_LinkLabel',
+                    dim_web_link.link_type AS 'DimWebLink_LinkType',
                     dim_researcher_description.research_description_fi AS 'DimResearcherDescription_ResearchDescriptionFi',
                     dim_researcher_description.research_description_en AS 'DimResearcherDescription_ResearchDescriptionEn',
                     dim_researcher_description.research_description_sv AS 'DimResearcherDescription_ResearchDescriptionSv',
@@ -1239,7 +1240,8 @@ public void GetSqlQuery_ProfileData_ProfileEditor()
                     research_activity_fact_contribution_researcher_name_activity_dim_referencedata_parent.code_value AS 'DimResearchActivity_ActivityType_From_Role_Parent_CodeValue',
 					research_activity_fact_contribution_researcher_name_activity_dim_referencedata_parent.name_fi AS 'DimResearchActivity_ActivityType_From_Role_Parent_NameFi',
 					research_activity_fact_contribution_researcher_name_activity_dim_referencedata_parent.name_en AS 'DimResearchActivity_ActivityType_From_Role_Parent_NameEn',
-                    research_activity_fact_contribution_researcher_name_activity_dim_referencedata_parent.name_sv AS 'DimResearchActivity_ActivityType_From_Role_Parent_NameSv',                   
+                    research_activity_fact_contribution_researcher_name_activity_dim_referencedata_parent.name_sv AS 'DimResearchActivity_ActivityType_From_Role_Parent_NameSv',
+                    dim_research_activity_web_link.url AS 'DimResearchActivity_DimWebLink_Url',                
 
                     dfd.acronym AS 'DimFundingDecision_Acronym',
                     dfd.funder_project_number AS 'DimFundingDecision_FunderProjectNumber',
@@ -1359,6 +1361,7 @@ FROM fact_field_values AS ffv
                 LEFT JOIN dim_sector AS research_activity_organization_broader_sector ON research_activity_organization_broader.dim_sectorid=research_activity_organization_broader_sector.id
                 LEFT JOIN dim_date AS research_activity_start_date ON dim_research_activity.dim_start_date=research_activity_start_date.id AND research_activity_start_date.id!=-1
                 LEFT JOIN dim_date AS research_activity_end_date ON dim_research_activity.dim_end_date=research_activity_end_date.id AND research_activity_end_date.id!=-1
+                LEFT JOIN dim_web_link AS dim_research_activity_web_link ON dim_research_activity_web_link.dim_research_activity_id=dim_research_activity.id AND dim_research_activity_web_link.dim_research_activity_id!=-1
 				
 				LEFT JOIN fact_contribution AS research_activity_fact_contribution_activity_type ON dim_research_activity.id=research_activity_fact_contribution_activity_type.dim_research_activity_id AND
 					dim_research_activity.id!=-1 AND
@@ -1472,6 +1475,7 @@ public void GetSqlQuery_ProfileData_Elasticsearch()
                     dim_name.full_name AS 'DimName_FullName',
                     dim_web_link.url AS 'DimWebLink_Url',
                     dim_web_link.link_label AS 'DimWebLink_LinkLabel',
+                    dim_web_link.link_type AS 'DimWebLink_LinkType',
                     dim_researcher_description.research_description_fi AS 'DimResearcherDescription_ResearchDescriptionFi',
                     dim_researcher_description.research_description_en AS 'DimResearcherDescription_ResearchDescriptionEn',
                     dim_researcher_description.research_description_sv AS 'DimResearcherDescription_ResearchDescriptionSv',
@@ -1638,6 +1642,7 @@ public void GetSqlQuery_ProfileData_Elasticsearch()
 					research_activity_fact_contribution_researcher_name_activity_dim_referencedata_parent.name_fi AS 'DimResearchActivity_ActivityType_From_Role_Parent_NameFi',
 					research_activity_fact_contribution_researcher_name_activity_dim_referencedata_parent.name_en AS 'DimResearchActivity_ActivityType_From_Role_Parent_NameEn',
                     research_activity_fact_contribution_researcher_name_activity_dim_referencedata_parent.name_sv AS 'DimResearchActivity_ActivityType_From_Role_Parent_NameSv',
+                    dim_research_activity_web_link.url AS 'DimResearchActivity_DimWebLink_Url',
 
                     dfd.acronym AS 'DimFundingDecision_Acronym',
                     dfd.funder_project_number AS 'DimFundingDecision_FunderProjectNumber',
@@ -1757,6 +1762,7 @@ FROM fact_field_values AS ffv
                 LEFT JOIN dim_sector AS research_activity_organization_broader_sector ON research_activity_organization_broader.dim_sectorid=research_activity_organization_broader_sector.id
                 LEFT JOIN dim_date AS research_activity_start_date ON dim_research_activity.dim_start_date=research_activity_start_date.id AND research_activity_start_date.id!=-1
                 LEFT JOIN dim_date AS research_activity_end_date ON dim_research_activity.dim_end_date=research_activity_end_date.id AND research_activity_end_date.id!=-1
+                LEFT JOIN dim_web_link AS dim_research_activity_web_link ON dim_research_activity_web_link.dim_research_activity_id=dim_research_activity.id AND dim_research_activity_web_link.dim_research_activity_id!=-1
 				
 				LEFT JOIN fact_contribution AS research_activity_fact_contribution_activity_type ON dim_research_activity.id=research_activity_fact_contribution_activity_type.dim_research_activity_id AND
 					dim_research_activity.id!=-1 AND
diff --git a/aspnetcore/src/api/ElasticsearchMapper/ElasticsearchMapper.cs b/aspnetcore/src/api/ElasticsearchMapper/ElasticsearchMapper.cs
@@ -376,6 +376,7 @@ public static List<ElasticsearchActivityAndReward> MapToElasticsearchActivity_Ac
                 DepartmentNameSv = ar.DepartmentNameSv,
                 DepartmentNameEn = ar.DepartmentNameEn,
                 Url = ar.Url,
+                WebLinks = MapToElasticsearchWebLink_WithoutItemMeta(ar.WebLinks),
                 sector = MapToElasticsearchSector(ar.sector),
                 itemMeta = MapToElasticsearchItemMeta(ar.itemMeta),
                 DataSources = MapToElasticsearchSource(ar.DataSources)
@@ -439,4 +440,15 @@ public static List<ElasticsearchPreferredIdentifier> MapToElasticsearchPreferred
             PidType = item.PidType
         }).ToList();
     }
+
+    public static List<ElasticsearchWebLink_WithoutItemMeta> MapToElasticsearchWebLink_WithoutItemMeta(List<ProfileEditorWebLink_WithoutItemMeta> src)
+    {
+        return src?
+            .Select(link => new ElasticsearchWebLink_WithoutItemMeta
+            {
+                Url = link.Url,
+                LinkLabel = link.LinkLabel,
+                LinkType = link.LinkType
+            }).ToList();
+    }
 }
diff --git a/aspnetcore/src/api/Models/Elasticsearch/ElasticsearchActivityAndReward.cs b/aspnetcore/src/api/Models/Elasticsearch/ElasticsearchActivityAndReward.cs
@@ -1,4 +1,4 @@
-﻿using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using api.Models.ProfileEditor;
 using api.Models.ProfileEditor.Items;
 using Nest;
@@ -34,6 +34,7 @@ public ElasticsearchActivityAndReward()
             DepartmentNameSv = "";
             DepartmentNameEn = "";
             Url = "";
+            WebLinks = new();
             sector = new List<ElasticsearchSector> { };
         }
 
@@ -61,6 +62,7 @@ public ElasticsearchActivityAndReward()
         public string DepartmentNameSv { get; set; }
         public string DepartmentNameEn { get; set; }
         public string Url { get; set; }
+        public List<ElasticsearchWebLink_WithoutItemMeta> WebLinks { get; set; }
 
         [Nested]
         [PropertyName("sector")]
diff --git a/aspnetcore/src/api/Models/Elasticsearch/ElasticsearchWebLink.cs b/aspnetcore/src/api/Models/Elasticsearch/ElasticsearchWebLink.cs
@@ -8,9 +8,11 @@ public ElasticsearchWebLink()
         {
             Url = "";
             LinkLabel = "";
+            LinkType = "";
         }
 
         public string Url { get; set; }
         public string LinkLabel { get; set; }
+        public string LinkType { get; set; }
     }
 }
diff --git a/aspnetcore/src/api/Models/Elasticsearch/ElasticsearchWebLink_WithoutItemMeta.cs b/aspnetcore/src/api/Models/Elasticsearch/ElasticsearchWebLink_WithoutItemMeta.cs
@@ -0,0 +1,18 @@
+﻿using System.Collections.Generic;
+
+namespace api.Models.Elasticsearch
+{
+    public partial class ElasticsearchWebLink_WithoutItemMeta
+    {
+        public ElasticsearchWebLink_WithoutItemMeta()
+        {
+            Url = "";
+            LinkLabel = "";
+            LinkType = "";
+        }
+
+        public string Url { get; set; }
+        public string LinkLabel { get; set; }
+        public string LinkType { get; set; }
+    }
+}
diff --git a/aspnetcore/src/api/Models/ProfileEditor/Items/ProfileEditorActivityAndReward.cs b/aspnetcore/src/api/Models/ProfileEditor/Items/ProfileEditorActivityAndReward.cs
@@ -30,6 +30,7 @@ public ProfileEditorActivityAndReward()
             DepartmentNameSv = "";
             DepartmentNameEn = "";
             Url = "";
+            WebLinks = new();
             sector = new List<ProfileEditorSector> { };
         }
 
@@ -57,6 +58,7 @@ public ProfileEditorActivityAndReward()
         public string DepartmentNameSv { get; set; }
         public string DepartmentNameEn { get; set; }
         public string Url { get; set; }
+        public List<ProfileEditorWebLink_WithoutItemMeta> WebLinks { get; set; }
 
         // Fields required in Elasticsearch person index. Elasticsearch model is mapped from ProfileEditor model.
         public List<ProfileEditorSector> sector { get; set; }
diff --git a/aspnetcore/src/api/Models/ProfileEditor/Items/ProfileEditorWebLink.cs b/aspnetcore/src/api/Models/ProfileEditor/Items/ProfileEditorWebLink.cs
@@ -6,9 +6,11 @@ public ProfileEditorWebLink()
         {
             Url = "";
             LinkLabel = "";
+            LinkType = "";
         }
 
         public string Url { get; set; }
         public string LinkLabel { get; set; }
+        public string LinkType { get; set; }
     }
 }
diff --git a/aspnetcore/src/api/Models/ProfileEditor/Items/ProfileEditorWebLink_WithoutItemMeta.cs b/aspnetcore/src/api/Models/ProfileEditor/Items/ProfileEditorWebLink_WithoutItemMeta.cs
@@ -0,0 +1,16 @@
+﻿namespace api.Models.ProfileEditor.Items
+{
+    public partial class ProfileEditorWebLink_WithoutItemMeta
+    {
+        public ProfileEditorWebLink_WithoutItemMeta()
+        {
+            Url = "";
+            LinkLabel = "";
+            LinkType = "";
+        }
+
+        public string Url { get; set; }
+        public string LinkLabel { get; set; }
+        public string LinkType { get; set; }
+    }
+}
diff --git a/aspnetcore/src/api/Models/ProfileEditor/ProfileDataFromSql.cs b/aspnetcore/src/api/Models/ProfileEditor/ProfileDataFromSql.cs
@@ -61,6 +61,7 @@ public ProfileDataFromSql()
         // DimWebLink
         public string DimWebLink_Url { get; set; }
         public string DimWebLink_LinkLabel { get; set; }
+        public string DimWebLink_LinkType { get; set; }
         // DimResearcherDescription
         public string DimResearcherDescription_ResearchDescriptionFi { get; set; }
         public string DimResearcherDescription_ResearchDescriptionEn { get; set; }
@@ -236,6 +237,7 @@ public ProfileDataFromSql()
         public string DimResearchActivity_ActivityType_From_Role_Parent_NameFi { get; set; }
         public string DimResearchActivity_ActivityType_From_Role_Parent_NameEn { get; set; }
         public string DimResearchActivity_ActivityType_From_Role_Parent_NameSv { get; set; }
+        public string DimResearchActivity_DimWebLink_Url { get; set; }
         // DimFundingDecision
         public string DimFundingDecision_Acronym { get; set; }
         public string DimFundingDecision_FunderProjectNumber { get; set; }
diff --git a/aspnetcore/src/api/Services/TtvSqlService.cs b/aspnetcore/src/api/Services/TtvSqlService.cs
diff --git a/aspnetcore/src/api/Services/UserProfileService.cs b/aspnetcore/src/api/Services/UserProfileService.cs

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,11 @@ public ElasticsearchWebLink()`
`8`	`8`	`{`
`9`	`9`	`Url = "";`
`10`	`10`	`LinkLabel = "";`
	`11`	`+ LinkType = "";`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`public string Url { get; set; }`
`14`	`15`	`public string LinkLabel { get; set; }`
	`16`	`+ public string LinkType { get; set; }`
`15`	`17`	`}`
`16`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,11 @@ public ProfileEditorWebLink()`
`6`	`6`	`{`
`7`	`7`	`Url = "";`
`8`	`8`	`LinkLabel = "";`
	`9`	`+ LinkType = "";`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`public string Url { get; set; }`
`12`	`13`	`public string LinkLabel { get; set; }`
	`14`	`+ public string LinkType { get; set; }`
`13`	`15`	`}`
`14`	`16`	`}`