fixed some errors

booking/models.py

@@ -34,9 +34,9 @@ class Booking(models.Model):
     container_number = ContainerNumberField(max_length=11, blank=True, null=True)
     vehicles_left = models.CharField(blank=True, null=True)
     created_on = models.DateTimeField(auto_now_add=True)
-    created_by = models.ForeignKey(DepotUser, related_name='booking_user', on_delete=models.CASCADE)
+    created_by = models.ForeignKey(DepotUser, related_name='booking_created_user', on_delete=models.CASCADE)
     updated_on = models.DateTimeField(auto_now=True)
-    updated_by = models.ForeignKey(DepotUser, related_name='booking_user', on_delete=models.CASCADE)
+    updated_by = models.ForeignKey(DepotUser, related_name='booking_updated_user', on_delete=models.CASCADE)
     status = models.CharField(
         max_length=10,
         choices=STATUS_CHOICES,

booking/tests.py

@@ -43,11 +43,10 @@ class BookingViewsTestCase(TestCase):
             container_type=self.container_type,
             container_count=10,
             line=self.line,
-            created_by=self.user_employee_all_rights.id,
-            updated_by=self.user_employee_all_rights.id,
+            created_by=self.user_client_all_rights,
+            updated_by=self.user_client_all_rights,
             vehicles='K1,J2,K3',
             vehicles_left='K1,J2,K3',
-
         )
 
     def test_employee_booking_list_view__anonymouse_user__expect_redirect_302(self):
@@ -87,7 +86,7 @@ class BookingViewsTestCase(TestCase):
         self.assertEqual(response.status_code, 302)
         self.assertTrue(Booking.objects.filter(number='BOOK456').exists())
 
-    def test_booking_update_view(self):
+    def test_booking_update_view__expect_redirect_and_booking_updated_in_db(self):
         self.client.login(username=self.user_client_all_rights.username, password=self.user_password)
         response = self.client.post(reverse('client_booking_update', args=[self.booking.id]), {
             'number': 'BOOK123-updated',
@@ -97,4 +96,4 @@ class BookingViewsTestCase(TestCase):
         })
         self.assertEqual(response.status_code, 302)
         self.booking.refresh_from_db()
-        self.assertEqual(self.booking.number, 'BOOK123-updated')
+        self.assertEqual(self.booking.number, 'BOOK123-UPDATED')

booking/views/client_views.py

@@ -1,6 +1,6 @@
 from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
 from django.urls import reverse_lazy
-from django.views.generic import CreateView, ListView
+from django.views.generic import CreateView, ListView, UpdateView
 
 from DepoT.mixins.LineFiltweFormMixin import LineFilterFormMixin
 from booking.forms import BookingCreateForm, BookingUpdateForm
@@ -38,8 +38,8 @@ class CreateBookingView(LoginRequiredMixin, UserPassesTestMixin, LineFilterFormM
 
     def form_valid(self, form):
         # todo more validation
-        form.instance.created_by = self.request.user.id
-        form.instance.updated_by = self.request.user.id
+        form.instance.created_by = self.request.user
+        form.instance.updated_by = self.request.user
         form.instance.vehicles_left = form.cleaned_data.get('vehicles')
         return super().form_valid(form)
 
@@ -47,7 +47,7 @@ class CreateBookingView(LoginRequiredMixin, UserPassesTestMixin, LineFilterFormM
         return self.request.user.has_company_perm('can_manage_booking') or self.request.user.user_type == 'CA'
 
 
-class ClientBookingUpdateView(LoginRequiredMixin, UserPassesTestMixin, LineFilterFormMixin, CreateView):
+class ClientBookingUpdateView(LoginRequiredMixin, UserPassesTestMixin, LineFilterFormMixin, UpdateView):
     template_name = 'client/booking-edit.html'
     model = Booking
     form_class = BookingUpdateForm
@@ -55,7 +55,7 @@ class ClientBookingUpdateView(LoginRequiredMixin, UserPassesTestMixin, LineFilte
 
     def form_valid(self, form):
         # todo more validation
-        form.instance.updated_by = self.request.user.id
+        form.instance.updated_by = self.request.user
         return super().form_valid(form)
 
     def test_func(self):