Fix wrong aggregation field's `base_type` (#28741) (#28835)

* Fix wrong aggregation field's `base_type`

It should be the same as the underlying field, not a hard-coded number
typ (`type/Integer` or `type/Float`)

* Add unit tests

Co-authored-by: Mahatthana (Kelvin) Nomsawadi <me@bboykelvin.dev>

e2e/test/scenarios/filters/reproductions/25994-between-after-summarize-not-working.cy.spec.js

@@ -23,7 +23,7 @@ const questionDetails = {
   },
 };
 
-describe.skip("issue 25994", () => {
+describe("issue 25994", () => {
   beforeEach(() => {
     restore();
     cy.signInAsAdmin();

frontend/src/metabase-lib/queries/structured/Aggregation.ts

@@ -12,7 +12,10 @@ import Metric from "metabase-lib/metadata/Metric";
 import StructuredQuery from "../StructuredQuery";
 import Dimension, { AggregationDimension } from "../../Dimension";
 import MBQLClause from "./MBQLClause";
+
 const INTEGER_AGGREGATIONS = new Set(["count", "cum-count", "distinct"]);
+const ORIGINAL_FIELD_TYPE_AGGREGATIONS = new Set(["min", "max"]);
+
 export default class Aggregation extends MBQLClause {
   /**
    * Replaces the aggregation in the parent query and returns the new StructuredQuery
@@ -134,7 +137,16 @@ export default class Aggregation extends MBQLClause {
 
   baseType() {
     const short = this.short();
-    return INTEGER_AGGREGATIONS.has(short) ? TYPE.Integer : TYPE.Float;
+    if (INTEGER_AGGREGATIONS.has(short)) {
+      return TYPE.Integer;
+    }
+
+    const field = this.dimension()?.field();
+    if (ORIGINAL_FIELD_TYPE_AGGREGATIONS.has(short) && field) {
+      return field.base_type;
+    }
+
+    return TYPE.Float;
   }
 
   /**

frontend/test/metabase-lib/lib/Dimension.unit.spec.js

@@ -801,6 +801,62 @@ describe("Dimension", () => {
           expect(base_type).toBe("type/Integer");
         });
 
+        it.each([
+          {
+            field: ["field", PRODUCTS.CATEGORY.id, null],
+            fieldName: "category",
+            expectedType: "type/Text",
+          },
+          {
+            field: ["field", PRODUCTS.PRICE.id, null],
+            fieldName: "price",
+            expectedType: "type/Float",
+          },
+          {
+            field: [
+              "field",
+              PRODUCTS.CREATED_AT.id,
+              { "temporal-unit": "day" },
+            ],
+            fieldName: "created_at",
+            expectedType: "type/DateTime",
+          },
+        ])(
+          "should return $expectedType for min of $fieldName",
+          ({ field, expectedType }) => {
+            const { base_type } = aggregation(["min", field]).field();
+            expect(base_type).toBe(expectedType);
+          },
+        );
+
+        it.each([
+          {
+            field: ["field", PRODUCTS.CATEGORY.id, null],
+            fieldName: "category",
+            expectedType: "type/Text",
+          },
+          {
+            field: ["field", PRODUCTS.PRICE.id, null],
+            fieldName: "price",
+            expectedType: "type/Float",
+          },
+          {
+            field: [
+              "field",
+              PRODUCTS.CREATED_AT.id,
+              { "temporal-unit": "day" },
+            ],
+            fieldName: "created_at",
+            expectedType: "type/DateTime",
+          },
+        ])(
+          "should return $expectedType for max of $fieldName",
+          ({ field, expectedType }) => {
+            const { base_type } = aggregation(["max", field]).field();
+            expect(base_type).toBe(expectedType);
+          },
+        );
+
         it("should return an int field for count", () => {
           const { base_type } = aggregation(["count"]).field();
           expect(base_type).toBe("type/Integer");