push

BeHub/Hub/views.py

@@ -73,18 +73,29 @@ class UuidBeaconViewSet(APIView):
                 category = Category.objects.get(name=category_name)
             except ObjectDoesNotExist:
                 return Response(status=rest_framework.status.HTTP_400_BAD_REQUEST, data={"This category is not exist"})
-            try:
-                site = beacon_manager.sites.get(category=category)
-            except ObjectDoesNotExist:
-                return Response(status=rest_framework.status.HTTP_400_BAD_REQUEST, data={"Any link do not have this category"})
+            # try:
+            #     site = beacon_manager.sites.get(category=category)
+            # except ObjectDoesNotExist:
+            #     return Response(status=rest_framework.status.HTTP_400_BAD_REQUEST, data={"Any link do not have this category"})
+            #serializer_sites= SiteSerializer(site, context={'request': request})
+        #else:
+
+        sites = []
+        sites_objects = beacon_manager.sites.all()
+        for site in sites_objects:
             serializer_sites = SiteSerializer(site, context={'request': request})
-        else:
-            serializer_sites = SiteSerializer(beacon_manager.sites, many=True, context={'request': request})
+            sites_data = serializer_sites.data
+
+            category_serializer = CategorySerializer(site.category, many=True, context={'request': request})
+            sites_data['category'] =[category['name'] for category in  category_serializer.data]
+
+            sites.append(sites_data)
 
         serializer = BeaconManagerSerializer(beacon_manager, context={'request': request})
         serializer_data = serializer.data
         serializer_beacon = BeaconSerializer(beacon_manager.beacon, context={'request': request})
-        serializer_data['sites'] = serializer_sites.data
+        serializer_data['sites'] = sites
+
         serializer_data['beacon'] = serializer_beacon.data
         return Response(serializer_data)
 
@@ -130,7 +141,6 @@ def project(request, project_id):
     user_project_serializer = UserProjectSerializer(user_project, context={'request': request})
     data['project_data'] = user_project_serializer.data
     data['project_id'] = project_id
-    #beacons_data
     data['beacon_display']  = []
     beacon_managers =  user_project.beacon_managers.all()
     for beacon_manager in beacon_managers: