@7365admin1/core 3.77.1-staging.330 → 3.77.1-staging.331

package/.changeset/daily-occurrence-book-startup.md

@@ -32,3 +32,5 @@ A book now belongs to its SITE's local day. `siteBookDay` reads `sites.timezone`
 A newly created site gets today's book immediately instead of waiting for its next local midnight or a restart. The three site-creation paths (`site`, `customer` and `customer-site` services) call `startTodaysBookForSite` right after their transaction commits, so a rolled-back site never gets an orphan book. It is fire-and-forget and never throws, not even synchronously, so a book problem can never make an already-committed site look like it failed. It runs through `processCreateDOB({ siteIds })`, so the book gets the site's own timezone, day and No. 1, with the same duplicate protection as the midnight job.
 
 `startTodaysBookForSite` is also called after a site's timezone is edited (`PUT /api/sites/:id` with `timezone`), and it tells API-core the set of timezones may have changed through `onBookTimezonesChanged`, a listener API-core registers at start-up. So a zone no site used before gets its midnight job without any polling, and a site moved into a zone whose day has already begun gets that day's book. A server that misses the call re-reads the timezones on its next restart.
+
+A site's timezone can now be set from the Add / Edit Site form, which saves through `/api/customer-sites`. `TCustomerSite` and `schemaCustomerSite` accept `timezone` (validated as an IANA zone); it is passed through to `sites.timezone` on create and on update and never stored on the customer-site row. On update an unknown zone is refused with 400, and a CHANGED zone calls `startTodaysBookForSite` after the commit, so a new zone gets its midnight job and the site gets a book for its new day if that day has begun. The customer-sites list now returns each row's live `timezone` from its site, so the form opens on the zone the site actually has.

package/dist/index.d.ts

@@ -5617,6 +5617,14 @@ type TCustomerSite = {
     shareCapital?: string;
     temporaryOccupationPermit?: string;
     certificateOfStatutory?: string;
+    /**
+     * The SITE's IANA timezone, as picked on the Add / Edit Site form. Passed
+     * through to `sites.timezone` - it is never stored on the engagement row
+     * itself (`MCustomerSite` does not return it). It decides the site's local
+     * day: when its daily occurrence book starts, and "today" for visitors and
+     * ANPR.
+     */
+    timezone?: string;
     createdAt?: string | Date;
     updatedAt?: string | Date;
     deletedAt?: string | Date;
@@ -5646,6 +5654,7 @@ declare function MCustomerSite(value: TCustomerSite): {
     shareCapital?: string | undefined;
     temporaryOccupationPermit?: string | undefined;
     certificateOfStatutory?: string | undefined;
+    timezone?: string | undefined;
 };
 
 declare function useCustomerSiteRepo(): {

package/dist/index.js

@@ -8291,6 +8291,10 @@ var schemaCustomerSite = import_joi12.default.object({
   shareCapital: import_joi12.default.string().optional().allow("", null),
   temporaryOccupationPermit: import_joi12.default.string().optional().allow("", null),
   certificateOfStatutory: import_joi12.default.string().optional().allow("", null),
+  timezone: import_joi12.default.string().custom(
+    (value, helpers) => isValidTimezone(value) ? value : helpers.error("any.invalid"),
+    "IANA timezone"
+  ).optional().allow("", null),
   createdAt: import_joi12.default.string().optional().allow("", null),
   updatedAt: import_joi12.default.string().optional().allow("", null),
   deletedAt: import_joi12.default.string().optional().allow("", null)
@@ -8511,7 +8515,14 @@ function useCustomerSiteRepo() {
           }
         },
         { $unwind: { path: "$_liveSite", preserveNullAndEmptyArrays: true } },
-        { $set: { name: { $ifNull: ["$_liveSite.name", "$name"] } } },
+        {
+          $set: {
+            name: { $ifNull: ["$_liveSite.name", "$name"] },
+            // The site's own timezone, so the Edit Site form opens on the zone
+            // the site really has. Lives only on the site, never on this row.
+            timezone: "$_liveSite.timezone"
+          }
+        },
         { $unset: "_liveSite" },
         ...search ? [{ $match: { name: { $regex: search, $options: "i" } } }] : [],
         { $sort: sort }
@@ -41374,7 +41385,10 @@ function useCustomerSiteService() {
           name: value.name,
           orgId: value.siteOrg,
           address: value.address,
-          category: value.category
+          category: value.category,
+          // The zone picked on the Add Site form. Left out when absent, so the
+          // site model's own default (Singapore) applies exactly as before.
+          ...isValidTimezone(value.timezone) && { timezone: value.timezone }
         },
         session
       );
@@ -41505,12 +41519,18 @@ function useCustomerSiteService() {
         throw new import_node_server_utils127.NotFoundError("Customer site not found.");
       }
       const siteId = customerSite.site;
+      const timezone = typeof payload.timezone === "string" && payload.timezone.trim() !== "" ? payload.timezone.trim() : void 0;
+      if (timezone !== void 0 && !isValidTimezone(timezone)) {
+        throw new import_node_server_utils127.BadRequestError(`Unknown timezone "${timezone}".`);
+      }
+      const timezoneBefore = timezone !== void 0 ? (await getSiteById(siteId).catch(() => null))?.timezone : void 0;
       await updateSiteById(
         siteId,
         {
           ...payload.name !== void 0 && { name: payload.name },
           ...payload.address !== void 0 && { address: payload.address },
-          ...payload.category !== void 0 && { category: payload.category }
+          ...payload.category !== void 0 && { category: payload.category },
+          ...timezone !== void 0 && { timezone }
         },
         session
       );
@@ -41528,6 +41548,9 @@ function useCustomerSiteService() {
         session
       );
       await session?.commitTransaction();
+      if (timezone !== void 0 && timezone !== timezoneBefore) {
+        startTodaysBookForSite(siteId);
+      }
       return result;
     } catch (error) {
       await session?.abortTransaction();