Merge branch 'devel'

Author: ehrenfeu

CHANGELOG.md

@@ -4,6 +4,15 @@
 
 NOTE: potentially breaking changes are flagged with a 🧨 symbol.
 
+## 3.2.1
+
+### Fixed
+
+- `pyppms.booking.PpmsBooking.endtime_fromstr()` contained a bug where the
+  end time of a booking finishing at midnight got wrongly assigning it to the
+  *start* of the given day instead of the end. This is now fixed by setting the
+  end time to the start of the following day.
+
 ## 3.2.0
 
 ### Added

src/pyppms/booking.py

@@ -1,6 +1,6 @@
 """Module representing bookings / reservations in PPMS."""
 
-from datetime import datetime
+from datetime import datetime, timedelta
 
 from loguru import logger as log
 
@@ -100,6 +100,7 @@ def from_runningsheet(cls, entry, system_id, username, date):
             )
             raise
 
+        log.trace(f"Created booking from runningsheet: {booking}")
         return booking
 
     def starttime_fromstr(self, time_str, date=None):
@@ -143,6 +144,9 @@ def endtime_fromstr(self, time_str, date=None):
             second=0,
             microsecond=0,
         )
+        if end.hour == 0 and end.minute == 0:
+            end = end + timedelta(days=1)
+            log.debug(f"Booking end is midnight, adjust date to {end}")
         self.endtime = end
         log.trace("New endtime: {}", self)
 

src/pyppms/ppms.py

@@ -40,7 +40,7 @@ class PpmsConnection:
     cache_users_only : bool
         Flag indicating that only PPMS user details will be stored in the
         on-disk cache, nothing else.
-    last_served_from_cache
+    last_served_from_cache : bool
         Indicates if the last request was served from the cache or on-line.
     users : dict
         A dict with usernames as keys, mapping to the related
@@ -171,7 +171,7 @@ def __authenticate(self):
             log.error(msg)
             raise requests.exceptions.ConnectionError(msg)
 
-        log.debug(
+        log.trace(
             "Authentication succeeded, response=[{}], http_status=[{}]",
             response.text,
             response.status_code,
@@ -614,18 +614,18 @@ def get_running_sheet(self, core_facility_ref, date, ignore_uncached_users=False
             full = entry["User"]
             if full not in self.fullname_mapping:
                 if ignore_uncached_users:
-                    log.debug("Ignoring booking for uncached user [{}]", full)
+                    log.debug(f"Ignoring booking for uncached / unknown user [{full}]")
                     continue
 
-                log.debug("Booking for an uncached user ({}) found!", full)
+                log.debug(f"Booking refers an uncached user ({full}), updating users!")
                 self.update_users()
 
             if full not in self.fullname_mapping:
                 log.error("PPMS doesn't seem to know user [{}], skipping", full)
                 continue
 
             log.trace(
-                "Booking for user '{}' ({}) found", self.fullname_mapping[full], full
+                f"Booking for user '{self.fullname_mapping[full]}' ({full}) found"
             )
             system_name = entry["Object"]
             system_ids = self.get_systems_matching("", [system_name])