fix for group collections

src/db/models/collection.rs

@@ -171,11 +171,16 @@ impl Collection {
                     users_organizations::user_uuid.eq(user_uuid)
                 )
             ))
-            .left_join(collection_groups::table.on(
-                collections::uuid.eq(collection_groups::collections_uuid)
-            ))
             .left_join(groups_users::table.on(
-                groups_users::groups_uuid.eq(collection_groups::groups_uuid)
+                groups_users::users_organizations_uuid.eq(users_organizations::uuid)
+            ))
+            .left_join(groups::table.on(
+                groups::uuid.eq(groups_users::groups_uuid)
+            ))
+            .left_join(collection_groups::table.on(
+                collection_groups::groups_uuid.eq(groups_users::groups_uuid).and(
+                    collection_groups::collections_uuid.eq(collections::uuid)
+                )
             ))
             .filter(
                 users_organizations::status.eq(UserOrgStatus::Confirmed as i32)
@@ -184,9 +189,15 @@ impl Collection {
                 users_collections::user_uuid.eq(user_uuid).or( // Directly accessed collection
                     users_organizations::access_all.eq(true) // access_all in Organization
                 ).or(
-                    groups_users::users_organizations_uuid.eq(users_organizations::uuid) // access via groups
+                    groups::access_all.eq(true) // access_all in groups
+                ).or( // access via groups
+                    groups_users::users_organizations_uuid.eq(users_organizations::uuid).and(
+                        collection_groups::collections_uuid.is_not_null()
                     )
-            ).select(collections::all_columns)
+                )
+            )
+            .select(collections::all_columns)
+            .distinct()
             .load::<CollectionDb>(conn).expect("Error loading collections").from_db()
         }}
     }