Merge pull request #10480 from opf/fix/avoid_duplicate_project_ancestors

avoid left joining visiblity check as it leads to duplicate entries

lib/api/v3/projects/project_sql_representer.rb

@@ -35,12 +35,17 @@ module API
         class << self
           def ctes(walker_result)
             {
+              visible_projects: visible_projects_sql,
               ancestors: ancestors_sql(walker_result)
             }
           end
 
           protected
 
+          def visible_projects_sql
+            Project.visible.to_sql
+          end
+
           def ancestors_sql(walker_result)
             <<-SQL.squish
               SELECT id, CASE WHEN count(link) = 0 THEN '[]' ELSE json_agg(link) END ancestors
@@ -52,7 +57,6 @@ module API
                   FROM projects origin
                   LEFT OUTER JOIN projects ancestors
                   ON ancestors.lft < origin.lft AND ancestors.rgt > origin.rgt
-                  #{visibility_join}
                   WHERE origin.id IN (#{origin_subselect(walker_result).select(:id).to_sql})
                   ORDER by origin.id, ancestors.lft
                 ) ancestors
@@ -80,26 +84,15 @@ module API
             else
               <<-SQL.squish
                 CASE
-                  WHEN ancestors.id IS NOT NULL AND visible_ancestors.id IS NOT NULL
+                  WHEN ancestors.id IS NOT NULL AND ancestors.id IN (SELECT id FROM visible_projects)
                     THEN json_build_object('href', format('/api/v3/projects/%s', ancestors.id), 'title', ancestors.name)
-                  WHEN ancestors.id IS NOT NULL AND visible_ancestors.id IS NULL
+                  WHEN ancestors.id IS NOT NULL AND ancestors.id NOT IN (SELECT id FROM visible_projects)
                     THEN json_build_object('href', '#{API::V3::URN_UNDISCLOSED}', 'title', '#{I18n.t(:'api_v3.undisclosed.ancestor')}')
                   ELSE NULL
                 END
               SQL
             end
           end
-
-          def visibility_join
-            if User.current.admin?
-              ''
-            else
-              <<-SQL.squish
-                LEFT OUTER JOIN (#{Project.visible.to_sql}) visible_ancestors
-                ON visible_ancestors.id = ancestors.id
-              SQL
-            end
-          end
         end
 
         link :self,