Feature/share biomarker

src/api_service/urls.py

@@ -78,12 +78,11 @@
     path('non-users/<int:experiment_id>/', views.UsersNonExperimentsSharedListView.as_view()),
     path('share-experiment-to-institution', views.AddInstitutionToExperimentView.as_view(), name='share-experiment-to-institution'),
     path('share-experiment-to-user', views.AddUserToExperimentView.as_view(), name='share-experiment-to-user'),
-    path('shared-institution', views.UsersExperimentsSharedListView.as_view(), name='shared-institution'),
     path('shared-users/<int:experiment_id>/', views.UsersExperimentsSharedListView.as_view(), ),
-    path('shared-users', views.InstitutionExperimentsSharedListView.as_view(), name='shared-users'),
+    path('shared-users', views.UsersExperimentsSharedListView.as_view(), name='shared-users'),
     path('shared-institution/<int:experiment_id>/', views.InstitutionExperimentsSharedListView.as_view(), ),
+    path('shared-institution', views.InstitutionExperimentsSharedListView.as_view(), name='shared-institution'),
     path('switch-institution-public-view', views.ToggleExperimentPublicView.as_view(), name='switch-experiment-public-view'),
     path('remove-institution', views.RemoveInstitutionFromExperimentView.as_view(), name='remove-institution'),
     path('remove-user', views.RemoveUserFromExperimentView.as_view(), name='remove-user')
-
 ]

src/api_service/views.py

@@ -204,9 +204,18 @@ class ExperimentResultCombinationsDetails(generics.ListAPIView):
 
     def get_queryset(self):
         experiment_id = self.request.GET.get('experiment_id')
+        user = self.request.user
+
         try:
             experiment: Experiment = Experiment.objects.get(
-                pk=experiment_id, user=self.request.user)
+                Q(pk=experiment_id) &
+                (
+                    Q(user=user) |
+                    Q(is_public=True) |
+                    Q(shared_institutions__institutionadministration__user=user) |
+                    Q(shared_users=user)
+                )
+            )
             combinations_queryset = experiment.combinations
 
             # Applies the filters
@@ -318,6 +327,7 @@ def post(self, request):
         return Response(
             {"message": f"Institution {institution.id} removed from experiment {experiment.id}."}
         )
+
 class RemoveUserFromExperimentView(APIView):
     """
     API endpoint to remove an user from an experiment.
@@ -418,7 +428,7 @@ def get_queryset(self):
 
 class UsersExperimentsSharedListView(generics.ListAPIView):
     """
-    REST endpoint: Get all users associated with a specific experiment.
+    REST endpoint: Get all institution associated with a specific experiment.
     """
     serializer_class = LimitedUserSerializer
     permission_classes = [permissions.IsAuthenticated]

src/biomarkers/migrations/0021_biomarker_shared_users_and_more.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.2.15 on 2025-04-10 20:03
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('institutions', '0005_alter_institution_options_and_more'),
+        ('biomarkers', '0020_biomarker_shared_institutions'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='biomarker',
+            name='shared_users',
+            field=models.ManyToManyField(blank=True, related_name='shared_biomarkers', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='biomarker',
+            name='shared_institutions',
+            field=models.ManyToManyField(blank=True, related_name='shared_biomarkers', to='institutions.institution'),
+        ),
+    ]

src/biomarkers/migrations/0022_alter_biomarker_shared_users.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.15 on 2025-04-25 11:45
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('biomarkers', '0021_biomarker_shared_users_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='biomarker',
+            name='shared_users',
+            field=models.ManyToManyField(blank=True, related_name='shared_users_biomarkers', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

src/biomarkers/models.py

@@ -2,6 +2,8 @@
 from django.contrib.auth import get_user_model
 from django.db import models
 from django.db.models import QuerySet
+from django.contrib.auth.models import User
+
 from queryset_sequence import QuerySetSequence
 
 from institutions.models import Institution
@@ -71,8 +73,9 @@ class Biomarker(models.Model):
     origin: int = models.IntegerField(choices=BiomarkerOrigin.choices)
     state: int = models.IntegerField(choices=BiomarkerState.choices)
     user = models.ForeignKey(get_user_model(), on_delete=models.CASCADE)
-    shared_institutions = models.ManyToManyField(Institution, related_name='biomarkers', blank=True)
-
+    shared_institutions = models.ManyToManyField(Institution, related_name='shared_biomarkers', blank=True)
+    shared_users = models.ManyToManyField(User, blank=True,
+                                                 related_name='shared_users_biomarkers')
     def __str__(self) -> str:
         return self.name
 

src/biomarkers/serializers.py

@@ -4,6 +4,8 @@
 from .models import Biomarker, MRNAIdentifier, MethylationIdentifier, CNAIdentifier, MiRNAIdentifier, MoleculeIdentifier
 from tags.serializers import TagSerializer
 from drf_writable_nested import WritableNestedModelSerializer
+from django.contrib.auth import get_user_model
+from api_service.serializers import LimitedUserSerializer
 
 
 class MoleculeIdentifierSerializer(serializers.Serializer):
@@ -65,15 +67,15 @@ class BiomarkerSimpleSerializer(WritableNestedModelSerializer):
     number_of_cnas = serializers.SerializerMethodField(method_name='get_number_of_cnas')
     number_of_methylations = serializers.SerializerMethodField(method_name='get_number_of_methylations')
     has_fs_experiment = serializers.SerializerMethodField(method_name='get_has_fs_experiment')
-
+    user = LimitedUserSerializer()
     origin = serializers.IntegerField(required=False)
     state = serializers.IntegerField(required=False)
 
     tag = TagSerializer(required=False)
 
     class Meta:
         model = Biomarker
-        exclude = ['user']
+        fields = '__all__'
 
     @staticmethod
     def get_number_of_mrnas(ins: Biomarker) -> int:
@@ -174,5 +176,3 @@ class BiomarkerFromCorrelationAnalysisSerializer(serializers.Serializer):
     correlation_analysis_id = serializers.IntegerField()
     gene_gem_list = GeneGEMWithType(many=True, required=False)
     correlation_threshold = serializers.IntegerField(required=False)
-
-

src/biomarkers/urls.py

@@ -19,4 +19,17 @@
     path('methylation-sites-finder', views.MethylationSites.as_view(), name='methylation_sites_finder'),
     path('biomarker-molecules', views.BiomarkerMolecules.as_view(), name='biomarker_molecules'),
     path('biomarker-correlation-api', views.BiomarkerCorrelationAPIView.as_view(), name='biomarker_correlation_api'),
+    path('non-institutions-biomarker/<int:biomarker_id>/', views.InstitutionNonExperimentsSharedBiomarkerListView.as_view()),
+    path('non-institutions-biomarker', views.InstitutionNonExperimentsSharedBiomarkerListView.as_view(), name='institution-non-experiments-list-biomarker'),
+    path('share-biomarker-to-institution', views.AddInstitutionToBiomarkerView.as_view(), name='share-biomarker-to-institution'),
+    path('shared-institution-biomarker/<int:biomarker_id>/', views.InstitutionBiomarkersSharedListView.as_view()),
+    path('shared-institution-biomarker', views.InstitutionBiomarkersSharedListView.as_view(), name='shared-institution-biomarker'),
+    path('remove-institution-biomarker', views.RemoveInstitutionFromBiomarkerView.as_view(), name='remove-institution-biomarker'),
+    path('shared-users-biomarker/<int:biomarker_id>/', views.UsersSharedBiomarkerListView.as_view(), ),
+    path('shared-users-biomarker', views.UsersSharedBiomarkerListView.as_view(), name='shared-users-biomarker'),
+    path('remove-user-biomarker', views.RemoveUserFromBiomarkerView.as_view(), name='remove-user-biomarker'),
+    path('non-users', views.UsersNonBiomarkersSharedListView.as_view(), name='user-non-biomarker-list'),
+    path('non-users/<int:biomarker_id>/', views.UsersNonBiomarkersSharedListView.as_view()),
+    path('share-biomarker-to-user', views.AddUserToBiomarkerView.as_view(), name='share-biomarker-to-user'),
+    path('switch-biomarker-public-view', views.ToggleBiomarkerPublicView.as_view(), name='switch-biomarker-public-view'),
 ]