refactor: add label to obr-sync

Author: ohrstrom

README.md

@@ -32,7 +32,7 @@ sudo dnf install \
 
 ### Tooling
 
-#### Ptyhon
+#### Python
 
 ```shell
 pyenv install 2.7.18
@@ -79,11 +79,17 @@ make build
 ```
 
 
-## Deploy
+## Deploy (DEPRECIATED)
 
 Deployment is handled via ansible: [obp-infrastructure](https://github.com/digris/obp-infrastructure)
 
 ```shell
 cd obp-infrastructure/ansible
 ./deploy.sh
 ```
+
+
+## Deploy (HACK)
+
+Due to the situation of a completely outdated environment ansible cannot be used anymore.
+For now deployment has to be done "manually" directly on the server(s).

docker/docker-compose.yml

@@ -1,19 +1,5 @@
 version: "3"
 services:
-#  rabbitmq:
-#    image: rabbitmq:3.9-management
-#    ports:
-#      - "5672:5672"
-#      - "15672:15672"
-#    environment:
-#      - RABBITMQ_DEFAULT_USER=admin
-#      - RABBITMQ_DEFAULT_PASS=admin
-#    volumes:
-#      - ${PWD}/docker/rabbitmq/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf
-#      - ${PWD}/docker/rabbitmq/definitions.json:/etc/rabbitmq/definitions.json
-#    restart: always
-#    networks:
-#      - obp
   nginx:
     container_name: nginx
     build:
@@ -70,7 +56,6 @@ services:
       - discovery.type=single-node
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
     volumes:
-#      - ${PWD}/data/elasticsearch:/usr/share/elasticsearch/data
       - obp-elasticsearch:/usr/share/elasticsearch/data
     ports:
       - "9200:9200"

website/apps/alibrary/models/labelmodels.py

@@ -203,6 +203,10 @@ def get_root(self):
             return None
 
         parent = self.parent
+
+        if parent == self:
+            return None
+
         last_parent = None
         i = 0
         while parent and i < 10:

website/apps/obr_sync_api/serializers.py

@@ -9,6 +9,7 @@
     Artist,
     Media,
     Release,
+    Label,
     Relation,
     Playlist,
     PlaylistItemPlaylist,
@@ -177,6 +178,52 @@ class Meta:
         ]
 
 
+class LabelSerializer(serializers.HyperlinkedModelSerializer):
+
+    url = serializers.HyperlinkedIdentityField(
+        view_name="api:obr-sync:label-detail",
+        lookup_field="uuid",
+    )
+
+    ct = serializers.CharField(source="get_ct")
+
+    type = serializers.CharField()
+    description = serializers.CharField()
+    image = ImageSerializer(source="main_image")
+    tags = TagSerializer(many=True)
+    relations = RelationSerializer(many=True)
+
+    date_start = ApproximateDateSerializer()
+    date_end = ApproximateDateSerializer()
+
+    root_uuid = serializers.SerializerMethodField()
+
+    def get_root_uuid(self, obj):
+        root_label = obj.get_root()
+        return root_label.uuid if root_label else None
+
+
+    class Meta:
+        model = Label
+        fields = [
+            "url",
+            "ct",
+            "uuid",
+            "updated",
+            #
+            "type",
+            "name",
+            "date_start",
+            "date_end",
+            "description",
+            "image",
+            "tags",
+            "relations",
+            #
+            "root_uuid",
+        ]
+
+
 class ReleaseSerializer(serializers.HyperlinkedModelSerializer):
 
     url = serializers.HyperlinkedIdentityField(
@@ -185,14 +232,14 @@ class ReleaseSerializer(serializers.HyperlinkedModelSerializer):
     )
 
     ct = serializers.CharField(source="get_ct")
-
     type = serializers.CharField(source="releasetype")
     description = serializers.CharField()
     image = ImageSerializer(source="main_image")
     tags = TagSerializer(many=True)
     relations = RelationSerializer(many=True)
-
     releasedate = ApproximateDateSerializer()
+    label = LabelSerializer()
+
 
     class Meta:
         model = Release
@@ -209,6 +256,7 @@ class Meta:
             "image",
             "tags",
             "relations",
+            "label",
         ]
 
 

website/apps/obr_sync_api/urls.py

@@ -6,24 +6,29 @@
 
 from . import views
 
+app_name = "obr-sync"
+
 router = routers.DefaultRouter(schema_title="OBR Sync API")
+
 # alibrary
 router.register(r"media", views.MediaViewSet)
 router.register(r"artists", views.ArtistViewSet)
 router.register(r"releases", views.ReleaseViewSet)
 router.register(r"playlists", views.PlaylistViewSet)
+router.register(r"labels", views.LabelViewSet)
+
 # accounts / user / profiles
 router.register(r"accounts", views.AccountViewSet)
 router.register(r"profiles", views.ProfileViewSet)
+
 # abcast
 router.register(r"emissions", views.EmissionViewSet)
+
 # arating
 router.register(r"votes", views.VoteViewSet)
+
 # tagging
 router.register(r"tags", views.TagViewSet)
-
-
-app_name = "obr-sync"
 urlpatterns = [
     url(r"^", include(router.urls)),
     url(

website/apps/obr_sync_api/views.py

@@ -8,7 +8,7 @@
 from django.contrib.auth import get_user_model
 
 from . import serializers
-from alibrary.models import Media, Artist, Release, Playlist
+from alibrary.models import Media, Artist, Release, Label, Playlist
 from profiles.models import Profile
 from abcast.models import Emission
 from arating.models import Vote
@@ -112,6 +112,29 @@ def get_object(self):
         )
 
 
+class LabelViewSet(
+    mixins.ListModelMixin,
+    mixins.RetrieveModelMixin,
+    viewsets.GenericViewSet,
+):
+    queryset = Label.objects.all().order_by("-updated")
+    permission_classes = (SyncPermissions,)
+    serializer_class = serializers.LabelSerializer
+    lookup_field = "uuid"
+
+    def get_queryset(self):
+        qs = self.queryset.prefetch_related("relations",).select_related(
+            "parent",
+        )
+        return qs
+
+    def get_object(self):
+        return get_object_or_404(
+            self.get_queryset(),
+            uuid=self.kwargs["uuid"],
+        )
+
+
 class PlaylistViewSet(
     mixins.ListModelMixin,
     mixins.RetrieveModelMixin,