[Chore] Add blocked to friends routes

zakarm · May 8, 2024 · d54ed23 · d54ed23
1 parent cf0de8d
commit d54ed23
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/back-end/dashboards/serializer.py b/app/back-end/dashboards/serializer.py
@@ -105,7 +105,9 @@ class Meta:
         fields = ('id', 'username', 'image_url', 'friends')
 
     def get_friends(self, obj):
-        friends_data = Friendship.objects.filter(Q(user_from = obj)| Q(user_to= obj))
+        friends_data = Friendship.objects.filter(Q(user_from = obj)| Q(user_to= obj) |
+                                                 Q(u_one_is_blocked_u_two = False)|
+                                                 Q(u_two_is_blocked_u_one = False))
         serializer = FriendshipSerializer(friends_data, many=True, context = {'id': obj.id})
         return serializer.data
 

diff --git a/app/front-end/Dockerfile b/app/front-end/Dockerfile
@@ -12,4 +12,4 @@ RUN npm run build
 
 EXPOSE 3000
 
-CMD ["npm", "run", "dev"]
+CMD ["npm", "start"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,4 @@ RUN npm run build

		EXPOSE 3000

		CMD ["npm", "run", "dev"]
		CMD ["npm", "start"]