Changeset d76b7ee for resTools_backend/backend/Services

Timestamp:

05/12/22 16:36:14 (3 years ago)

Author:

Danilo <danilo.najkov@…>

Branches:

master

Children:

cc4db18

Parents:

7a983b0

Message:

prototype final

Location:

resTools_backend/backend/Services

Files:

• ReservationService.cs (modified) (2 diffs)
• RestaurantService.cs (modified) (2 diffs)

resTools_backend/backend/Services/ReservationService.cs

@@ -10 +10 @@
         public Task CreateReservation(CreateReservationRequest req);
         public Task ChangeReservationStatus(int resId, ReservationStatus status);
+        public Task<List<ReservationResponse>> GetReservatins(DateTime from, DateTime to);
     }
     public class ReservationService : IReservationService
@@ -48 +49 @@
             await _context.SaveChangesAsync();
         }
+
+        public async Task<List<ReservationResponse>> GetReservatins(DateTime from, DateTime to)
+        {
+            Restaurant res = await _context.Restoraunts
+                .Include(x => x.Reservations
+                    .Where(x => x.StartDate.CompareTo(from)>0 && x.StartDate.CompareTo(to)<=0))
+                .FirstOrDefaultAsync();
+            var reservations = res.Reservations.Select(t => new ReservationResponse()
+            {
+                ContactName = t.ContactName,
+                ContactNumber = t.ContactNumber,
+                Persons = t.Persons,
+                StartDate = t.StartDate,
+                ReservationStatus = t.ReservationStatus,
+                Id = t.Id,
+                ReservationPlace = t.ReservationPlace,
+                ReservationType = t.ReservationType
+            }).OrderByDescending(x => x.ReservationStatus == ReservationStatus.New).ToList();
+            return reservations;
+        }
     }
 }

resTools_backend/backend/Services/RestaurantService.cs

@@ -30 +30 @@
         {
             RestaurantResponse res = await _context.Restoraunts
-                .Include(x => x.Reservations)
                 .Select(x => new RestaurantResponse()
                 {
@@ -36 +35 @@
                     Name = x.Name,
                     OwnerId = x.OwnerFk,
-                    Reservations = x.Reservations.Select(t => new ReservationResponse()
-                    {
-                        ContactName = t.ContactName,
-                        ContactNumber = t.ContactNumber,
-                        Persons = t.Persons,
-                        StartDate = t.StartDate,
-                        ReservationStatus = t.ReservationStatus,
-                        Id = t.Id,
-                        ReservationPlace = t.ReservationPlace,
-                        ReservationType = t.ReservationType
-                    }).ToList()
                 })
                 .FirstOrDefaultAsync();