Skip to content

Commit ea352a6

Browse files
committed
Merge branch 'master' into uv-migration
# Conflicts: # .github/workflows/build-and-deploy.yaml # backend/Pipfile # backend/Pipfile.lock
2 parents efa9f26 + 16e16ec commit ea352a6

16 files changed

+852
-993
lines changed

.github/workflows/build-and-deploy.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on: push
66
jobs:
77
backend-check:
88
name: "Backend Check"
9-
uses: pennlabs/shared-actions/.github/workflows/django.yaml@b227580b1791e5812e58c1244595452fc848eff5
9+
uses: pennlabs/shared-actions/.github/workflows/django.yaml@v0.1.9
1010
secrets: inherit
1111
with:
1212
projectName: pennmobile
@@ -19,7 +19,7 @@ jobs:
1919

2020
frontend-check:
2121
name: "Frontend Check"
22-
uses: pennlabs/shared-actions/.github/workflows/react.yaml@b227580b1791e5812e58c1244595452fc848eff5
22+
uses: pennlabs/shared-actions/.github/workflows/react.yaml@v0.1.9
2323
with:
2424
path: frontend
2525
imageName: penn-mobile-frontend
@@ -130,4 +130,4 @@ jobs:
130130
GH_AWS_SECRET_ACCESS_KEY: ${{ secrets.GH_AWS_SECRET_ACCESS_KEY }}
131131

132132
needs:
133-
- publish
133+
- publish

backend/market/views.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ def create(self, request, *args, **kwargs):
251251
item_id = int(self.kwargs["item_id"])
252252
queryset = self.get_queryset()
253253
if queryset.filter(id=item_id).exists():
254-
raise exceptions.NotAcceptable("Favorite already exists")
254+
raise exceptions.ValidationError("Favorite already exists")
255255
item = get_object_or_404(Item, id=item_id)
256256
self.get_queryset().add(item)
257257
return Response(status=status.HTTP_201_CREATED)
@@ -289,7 +289,7 @@ def create(self, request, *args, **kwargs):
289289
data = request.data
290290
request.POST._mutable = True
291291
if self.get_queryset().filter(user=self.request.user).exists():
292-
raise exceptions.NotAcceptable("Offer already exists")
292+
raise exceptions.ValidationError("Offer already exists")
293293
data["item"] = int(self.kwargs["item_id"])
294294
data["user"] = self.request.user.id
295295
serializer = self.get_serializer(data=request.data)
@@ -299,7 +299,10 @@ def create(self, request, *args, **kwargs):
299299

300300
def destroy(self, request, *args, **kwargs):
301301
queryset = self.get_queryset()
302-
filter = {"user": self.request.user, "item": int(self.kwargs["item_id"])}
302+
filter = {
303+
"user": self.request.user,
304+
"item": int(self.kwargs["item_id"]),
305+
}
303306
obj = get_object_or_404(queryset, **filter)
304307
self.check_object_permissions(self.request, obj)
305308
self.perform_destroy(obj)

backend/tests/market/mock_items.json

Lines changed: 0 additions & 46 deletions
This file was deleted.

backend/tests/market/mock_sublets.json

Lines changed: 0 additions & 42 deletions
This file was deleted.

backend/tests/market/self_user_items.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
"price": 20.0,
99
"negotiable": true,
1010
"created_at": "2024-11-13T20:14:34.604238-05:00",
11-
"expires_at": "2025-12-12T00:00:00-05:00"
11+
"expires_at": "3000-12-12T00:00:00-05:00"
1212
}
1313
]

backend/tests/market/self_user_sublets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
"price": 1350.0,
1212
"negotiable": false,
1313
"created_at": "2024-11-13T20:14:34.604238-05:00",
14-
"expires_at": "2025-12-12T00:00:00-05:00"
14+
"expires_at": "3000-12-12T00:00:00-05:00"
1515
},
1616
"address": "Cira Green, Philadelphia, PA",
1717
"beds": 3.0,
1818
"baths": 1.0,
1919
"start_date": "2024-01-01T00:00:00-05:00",
20-
"end_date": "2025-05-31T00:00:00-04:00"
20+
"end_date": "3000-05-31T00:00:00-04:00"
2121
}
2222
]

0 commit comments

Comments
 (0)