Filter channelsetlist by user

contentcuration/contentcuration/frontend/channelList/vuex/channelSet/__tests__/module.spec.js

@@ -3,14 +3,15 @@ import { ChannelSet } from 'shared/data/resources';
 import storeFactory from 'shared/vuex/baseStore';
 
 jest.mock('shared/vuex/connectionPlugin');
-const userId = 'testId';
+const userId = 1;
 
 describe('channelSet actions', () => {
  let store;
  let id;
  const channelSetDatum = {
  name: 'test',
  channels: { '11111111111111111111111111111111': true },
+ edit: true,
  };
  beforeEach(() => {
  return ChannelSet.put(channelSetDatum).then(newId => {
@@ -30,7 +31,7 @@ describe('channelSet actions', () => {
  it('should call ChannelSet.where', () => {
  const whereSpy = jest.spyOn(ChannelSet, 'where');
  return store.dispatch('channelSet/loadChannelSetList').then(() => {
- expect(whereSpy).toHaveBeenCalledWith();
+ expect(whereSpy).toHaveBeenCalledWith({ edit: true });
  whereSpy.mockRestore();
  });
  });

contentcuration/contentcuration/frontend/channelList/vuex/channelSet/actions.js

@@ -3,7 +3,7 @@ import { ChannelSet } from 'shared/data/resources';
 
 /* CHANNEL SET ACTIONS */
 export function loadChannelSetList(context) {
- return ChannelSet.where().then(channelSets => {
+ return ChannelSet.where({ edit: true }).then(channelSets => {
  context.commit('SET_CHANNELSET_LIST', channelSets);
  return channelSets;
  });

contentcuration/contentcuration/models.py

@@ -993,7 +993,9 @@ class ChannelSet(models.Model):
  def filter_edit_queryset(cls, queryset, user):
  if user.is_anonymous():
  return queryset.none()
- return queryset.filter(editors=user)
+ user_id = not user.is_anonymous() and user.id
+ edit = Exists(User.channel_sets.through.objects.filter(user_id=user_id, channelset_id=OuterRef("id")))
+ return queryset.annotate(edit=edit).filter(edit=True)
 
  @classmethod
  def filter_view_queryset(cls, queryset, user):

contentcuration/contentcuration/viewsets/channelset.py

@@ -1,12 +1,18 @@
 from django.db.models import CharField
+from django.db.models import Exists
+from django.db.models import OuterRef
 from django.db.models import Q
+from django_filters.rest_framework import BooleanFilter
+from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework import serializers
 from rest_framework.permissions import IsAuthenticated
 
 from contentcuration.models import Channel
 from contentcuration.models import ChannelSet
+from contentcuration.models import User
 from contentcuration.viewsets.base import BulkListSerializer
 from contentcuration.viewsets.base import BulkModelSerializer
+from contentcuration.viewsets.base import FilterSet
 from contentcuration.viewsets.base import ValuesViewset
 from contentcuration.viewsets.common import NotNullMapArrayAgg
 from contentcuration.viewsets.common import UserFilteredPrimaryKeyRelatedField
@@ -50,14 +56,33 @@ class Meta:
  list_serializer_class = BulkListSerializer
 
 
+class ChannelSetFilter(FilterSet):
+ edit = BooleanFilter(method="filter_edit")
+
+ def filter_edit(self, queryset, name, value):
+ return queryset.filter(edit=True)
+
+ class Meta:
+ model = ChannelSet
+ fields = ("edit",)
+
+
 class ChannelSetViewSet(ValuesViewset):
  queryset = ChannelSet.objects.all()
  serializer_class = ChannelSetSerializer
+ filter_backends = (DjangoFilterBackend,)
+ filter_class = ChannelSetFilter
  permission_classes = [IsAuthenticated]
- values = ("id", "name", "description", "channels", "secret_token__token")
+ values = ("id", "name", "description", "channels", "secret_token__token", "edit")
 
  field_map = {"secret_token": "secret_token__token"}
 
+ def get_queryset(self):
+ queryset = super(ChannelSetViewSet, self).get_queryset()
+ user_id = not self.request.user.is_anonymous() and self.request.user.id
+ edit = Exists(User.channel_sets.through.objects.filter(user_id=user_id, channelset_id=OuterRef("id")))
+ return queryset.annotate(edit=edit)
+
  def annotate_queryset(self, queryset):
  return queryset.annotate(
  channels=NotNullMapArrayAgg(