Modify publication handling, include only the parent of co-publication.

Author: sarkikos

aspnetcore/src/api.Tests/Services_Tests/TtvSqlServiceTest.cs

@@ -1,14 +1,14 @@
-using Xunit;
-using api.Services;
-using api.Models.Common;
-using api.Models.Ttv;
+using Xunit;
+using api.Services;
+using api.Models.Common;
+using api.Models.Ttv;
 using api.Models.ProfileEditor.Items;
 using System;
 using System.Collections.Generic;
 
-namespace api.Tests
-{
-    [Collection("Get SQL query from TtvSqlService")]
+namespace api.Tests
+{
+    [Collection("Get SQL query from TtvSqlService")]
     public class TtvSqlServiceTests
     {
         public FactFieldValue GetFactFieldValueForTest()
@@ -489,10 +489,19 @@ public void Test_getSqlQuery_Select_FactContribution_01()
             TtvSqlService ttvSqlService = new();
             string expectedSqlString =
                 $@"SELECT DISTINCT
-                        dim_research_activity_id AS 'DimResearchActivityId',
-                        dim_research_dataset_id AS 'DimResearchDatasetId',
-                        dim_publication_id AS 'DimPublicationId'
-                      FROM fact_contribution WHERE dim_name_id = 1234 AND (dim_research_activity_id!=-1 OR dim_research_dataset_id!=-1 OR dim_publication_id!=-1)";
+                        fc.dim_research_activity_id AS 'DimResearchActivityId',
+                        fc.dim_research_dataset_id AS 'DimResearchDatasetId',
+                        fc.dim_publication_id AS 'DimPublicationId',
+                        COALESCE(dp.dim_publication_id, -1) AS 'CoPublication_Parent_DimPublicationId'
+                    FROM
+                        fact_contribution AS fc
+                    JOIN
+                        dim_publication AS dp ON fc.dim_publication_id=dp.id
+                    WHERE
+                        fc.dim_name_id = 1234 AND
+                        (
+                            fc.dim_research_activity_id!=-1 OR fc.dim_research_dataset_id!=-1 OR fc.dim_publication_id!=-1
+                        )";
             // Act
             string actualSqlString = ttvSqlService.GetSqlQuery_Select_FactContribution(1234);
             // Assert
@@ -898,5 +907,5 @@ public void GetSqlQuery_Select_GetHiddenInUserprofile()
             // Assert
             Assert.Equal(expectedSqlString, actualSqlString);
         }
-    }
+    }
 }

aspnetcore/src/api/Models/Common/FactContributionTableMinimalDTO.cs

@@ -5,5 +5,6 @@ public partial class FactContributionTableMinimalDTO
         public int DimResearchActivityId { get; set; }
         public int DimResearchDatasetId { get; set; }
         public int DimPublicationId { get; set; }
+        public int CoPublication_Parent_DimPublicationId { get; set; }
     }
 }

aspnetcore/src/api/Services/TtvSqlService.cs

@@ -704,10 +704,19 @@ FROM dim_education
         public string GetSqlQuery_Select_FactContribution(int dimNameId)
         {
             return $@"SELECT DISTINCT
-                        dim_research_activity_id AS 'DimResearchActivityId',
-                        dim_research_dataset_id AS 'DimResearchDatasetId',
-                        dim_publication_id AS 'DimPublicationId'
-                      FROM fact_contribution WHERE dim_name_id = {dimNameId} AND (dim_research_activity_id!=-1 OR dim_research_dataset_id!=-1 OR dim_publication_id!=-1)";
+                        fc.dim_research_activity_id AS 'DimResearchActivityId',
+                        fc.dim_research_dataset_id AS 'DimResearchDatasetId',
+                        fc.dim_publication_id AS 'DimPublicationId',
+                        COALESCE(dp.dim_publication_id, -1) AS 'CoPublication_Parent_DimPublicationId'
+                    FROM
+                        fact_contribution AS fc
+                    JOIN
+                        dim_publication AS dp ON fc.dim_publication_id=dp.id
+                    WHERE
+                        fc.dim_name_id = {dimNameId} AND
+                        (
+                            fc.dim_research_activity_id!=-1 OR fc.dim_research_dataset_id!=-1 OR fc.dim_publication_id!=-1
+                        )";
         }
 
         // Return SQL SELECT statement for br_participates_in_funding_group

aspnetcore/src/api/Services/UserProfileService.cs

@@ -836,16 +836,21 @@ public async Task AddTtvDataToUserProfile(DimKnownPerson dimKnownPerson, DimUser
                         foreach (FactContributionTableMinimalDTO fc in factContributions)
                         {
                             // publication
-                            if (fc.DimPublicationId != -1 && !existingPublicationIds.Contains(fc.DimPublicationId))
+                            //
+                            // Co-publications have multiple rows in table fact_contribution. Here only the "main" publication should be included.
+                            // If FactContributionTableMinimalDTO.CoPublication_Parent_DimPublicationId has value (other than -1), that must be used.
+                            // Otherwise FactContributionTableMinimalDTO.DimPublicationId must be used.
+                            int publicationId = fc.CoPublication_Parent_DimPublicationId > 0 ? fc.CoPublication_Parent_DimPublicationId : fc.DimPublicationId;
+                            if (publicationId != -1 && !existingPublicationIds.Contains(publicationId))
                             {
                                 FactFieldValue factFieldValuePublication = this.GetEmptyFactFieldValue();
                                 factFieldValuePublication.DimUserProfileId = dimUserProfile.Id;
                                 factFieldValuePublication.DimFieldDisplaySettingsId = dimFieldDisplaySetting_publication.Id;
-                                factFieldValuePublication.DimPublicationId = fc.DimPublicationId;
+                                factFieldValuePublication.DimPublicationId = publicationId;
                                 factFieldValuePublication.DimRegisteredDataSourceId = dimName.DimRegisteredDataSourceId;
                                 _ttvContext.FactFieldValues.Add(factFieldValuePublication);
                                 // Prevent duplicate key error with publications
-                                existingPublicationIds.Add(fc.DimPublicationId);
+                                existingPublicationIds.Add(publicationId);
                             }
 
                             // research activity