From 4ee51426ad4ac86609541718690035fb4f628d91 Mon Sep 17 00:00:00 2001
From: Andreas Braun <git@alcaeus.org>
Date: Wed, 16 Oct 2024 10:15:36 +0200
Subject: [PATCH] Support bucketMaxSpanSeconds and bucketRoundingSeconds in
 time series collections

---
 doctrine-mongo-mapping.xsd                    |  9 ++++++
 .../Mapping/Annotations/TimeSeries.php        |  2 ++
 lib/Doctrine/ODM/MongoDB/SchemaManager.php    |  2 ++
 .../Tests/Mapping/ClassMetadataTest.php       | 29 +++++++++++++++++++
 4 files changed, 42 insertions(+)

diff --git a/doctrine-mongo-mapping.xsd b/doctrine-mongo-mapping.xsd
index 5e7dd9f17..90d3c8fde 100644
--- a/doctrine-mongo-mapping.xsd
+++ b/doctrine-mongo-mapping.xsd
@@ -640,6 +640,8 @@
     <xs:attribute name="meta-field" type="xs:NMTOKEN" />
     <xs:attribute name="granularity" type="odm:time-series-granularity" />
     <xs:attribute name="expire-after-seconds" type="xs:integer" />
+    <xs:attribute name="bucket-max-span-seconds" type="odm:time-series-group-seconds" />
+    <xs:attribute name="bucket-rounding-seconds" type="odm:time-series-group-seconds" />
   </xs:complexType>
 
   <xs:simpleType name="time-series-granularity">
@@ -650,4 +652,11 @@
     </xs:restriction>
   </xs:simpleType>
 
+  <xs:simpleType name="time-series-group-seconds">
+    <xs:restriction base="xs:integer">
+      <xs:minInclusive value="1" />
+      <xs:maxInclusive value="31536000" />
+    </xs:restriction>
+  </xs:simpleType>
+
 </xs:schema>
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/TimeSeries.php b/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/TimeSeries.php
index 6133ff09f..e4fe593eb 100644
--- a/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/TimeSeries.php
+++ b/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/TimeSeries.php
@@ -22,6 +22,8 @@ public function __construct(
         public readonly ?string $metaField = null,
         public readonly ?Granularity $granularity = null,
         public readonly ?int $expireAfterSeconds = null,
+        public readonly ?int $bucketMaxSpanSeconds = null,
+        public readonly ?int $bucketRoundingSeconds = null,
     ) {
     }
 }
diff --git a/lib/Doctrine/ODM/MongoDB/SchemaManager.php b/lib/Doctrine/ODM/MongoDB/SchemaManager.php
index bd41c66a9..fb355705e 100644
--- a/lib/Doctrine/ODM/MongoDB/SchemaManager.php
+++ b/lib/Doctrine/ODM/MongoDB/SchemaManager.php
@@ -628,6 +628,8 @@ public function createDocumentCollection(string $documentName, ?int $maxTimeMs =
                     'metaField' => $class->timeSeriesOptions->metaField,
                     // ext-mongodb will automatically encode backed enums, so we can use the value directly here
                     'granularity' => $class->timeSeriesOptions->granularity,
+                    'bucketMaxSpanSeconds' => $class->timeSeriesOptions->bucketMaxSpanSeconds,
+                    'bucketRoundingSeconds' => $class->timeSeriesOptions->bucketRoundingSeconds,
                 ],
                 static fn (mixed $value): bool => $value !== null,
             );
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataTest.php
index e278241b1..d909619de 100644
--- a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataTest.php
+++ b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataTest.php
@@ -1027,6 +1027,35 @@ public function testTimeSeriesMappingWithExpireAfterSeconds(): void
 
         self::assertSame(10, $metadata->timeSeriesOptions->expireAfterSeconds);
     }
+
+    public function testTimeSeriesMappingWithBucketMaxSpanSeconds(): void
+    {
+        $metadata = $this->dm->getClassMetadata(TimeSeriesTestDocument::class);
+        $metadata->markAsTimeSeries(new ODM\TimeSeries('time', bucketMaxSpanSeconds: 10));
+
+        // We don't throw for invalid settings here, e.g. bucketMaxSpanSeconds not being equal to bucketRoundingSeconds
+        self::assertSame(10, $metadata->timeSeriesOptions->bucketMaxSpanSeconds);
+    }
+
+    public function testTimeSeriesMappingWithBucketRoundingSeconds(): void
+    {
+        $metadata = $this->dm->getClassMetadata(TimeSeriesTestDocument::class);
+        $metadata->markAsTimeSeries(new ODM\TimeSeries('time', bucketRoundingSeconds: 10));
+
+        // We don't throw for invalid settings here, e.g. bucketMaxSpanSeconds not being equal to bucketRoundingSeconds
+        self::assertSame(10, $metadata->timeSeriesOptions->bucketRoundingSeconds);
+    }
+
+    public function testTimeSeriesMappingWithGranularityAndBucketMaxSpanSeconds(): void
+    {
+        $metadata = $this->dm->getClassMetadata(TimeSeriesTestDocument::class);
+        $metadata->markAsTimeSeries(new ODM\TimeSeries('time', granularity: Granularity::Hours, bucketMaxSpanSeconds: 15, bucketRoundingSeconds: 20));
+
+        // We don't throw for invalid settings here, e.g. bucketMaxSpanSeconds not being equal to bucketRoundingSeconds
+        self::assertSame(Granularity::Hours, $metadata->timeSeriesOptions->granularity);
+        self::assertSame(15, $metadata->timeSeriesOptions->bucketMaxSpanSeconds);
+        self::assertSame(20, $metadata->timeSeriesOptions->bucketRoundingSeconds);
+    }
 }
 
 /** @template-extends DocumentRepository<self> */