[MODFQMMGR-1134] Add improvements for the new composite ET (#1298)

* [MODFQMMGR-1134] Add improvements for the new composite ET

* [MODFQMMGR-1134] Remove time from date fields

Author: Saba-Zedginidze-EPAM

src/main/resources/entity-types/agreements/composite_agreement_with_lines_and_order_invoice_analytics.json5

@@ -19,6 +19,7 @@
       targetField: 'pol_owner_fk',
       sourceField: 'agreement_with_lines.agreement_line.id',
       overrideJoinDirection: 'left',
+      useIdColumns: true,
       essentialOnly: true,
       order: 20,
     },
@@ -29,6 +30,7 @@
       targetField: 'pol.id',
       sourceField: 'agreement_line_to_order_line.pol_orders_fk',
       overrideJoinDirection: 'left',
+      cascadeJoinDirection: true,
       useIdColumns: true,
       essentialOnly: true,
       order: 30,

src/main/resources/entity-types/agreements/simple_agreements_agreement.json5

@@ -90,8 +90,7 @@
       essential: true,
       queryable: true,
       visibleByDefault: true,
-      valueGetter: ':sourceAlias.sa_start_date',
-      valueFunction: '(:value)::timestamp',
+      valueGetter: ':sourceAlias.sa_start_date::date::text',
     },
     {
       name: 'sa_end_date',
@@ -100,8 +99,7 @@
       essential: true,
       queryable: true,
       visibleByDefault: true,
-      valueGetter: ':sourceAlias.sa_end_date',
-      valueFunction: '(:value)::timestamp',
+      valueGetter: ':sourceAlias.sa_end_date::date::text',
     },
     {
       name: 'sa_cancellation_deadline',
@@ -110,8 +108,7 @@
       essential: true,
       queryable: true,
       visibleByDefault: false,
-      valueGetter: ':sourceAlias.sa_cancellation_deadline',
-      valueFunction: '(:value)::timestamp',
+      valueGetter: ':sourceAlias.sa_cancellation_deadline::date::text',
     },
     {
       name: 'sa_date_created',
@@ -120,7 +117,6 @@
       queryable: true,
       visibleByDefault: false,
       valueGetter: ':sourceAlias.sa_date_created',
-      valueFunction: '(:value)::timestamp',
     },
     {
       name: 'sa_last_updated',
@@ -129,7 +125,6 @@
       queryable: true,
       visibleByDefault: false,
       valueGetter: ':sourceAlias.sa_last_updated',
-      valueFunction: '(:value)::timestamp',
     },
     {
       name: 'sa_agreement_status',

src/main/resources/entity-types/agreements/simple_agreements_agreement_line.json5

@@ -151,8 +151,7 @@
       essential: true,
       queryable: true,
       visibleByDefault: true,
-      valueGetter: ':sourceAlias.ent_active_from',
-      valueFunction: '(:value)::timestamp',
+      valueGetter: ':sourceAlias.ent_active_from::date::text',
     },
     {
       name: 'ent_active_to',
@@ -161,8 +160,7 @@
       essential: true,
       queryable: true,
       visibleByDefault: true,
-      valueGetter: ':sourceAlias.ent_active_to',
-      valueFunction: '(:value)::timestamp',
+      valueGetter: ':sourceAlias.ent_active_to::date::text',
     },
     {
       name: 'ent_content_updated',
@@ -171,7 +169,6 @@
       queryable: true,
       visibleByDefault: false,
       valueGetter: ':sourceAlias.ent_content_updated',
-      valueFunction: '(:value)::timestamp',
     },
     {
       name: 'ent_date_created',
@@ -180,7 +177,6 @@
       queryable: true,
       visibleByDefault: false,
       valueGetter: ':sourceAlias.ent_date_created',
-      valueFunction: '(:value)::timestamp',
     },
     {
       name: 'ent_last_updated',
@@ -189,7 +185,6 @@
       queryable: true,
       visibleByDefault: false,
       valueGetter: ':sourceAlias.ent_last_updated',
-      valueFunction: '(:value)::timestamp',
     },
     {
       name: 'ent_res_name',

src/main/resources/entity-types/agreements/simple_agreements_period.json5

@@ -48,8 +48,7 @@
       essential: true,
       queryable: true,
       visibleByDefault: true,
-      valueGetter: ':sourceAlias.per_start_date',
-      valueFunction: '(:value)::timestamp',
+      valueGetter: ':sourceAlias.per_start_date::date::text',
     },
     {
       name: 'per_end_date',
@@ -58,17 +57,15 @@
       essential: true,
       queryable: true,
       visibleByDefault: true,
-      valueGetter: ':sourceAlias.per_end_date',
-      valueFunction: '(:value)::timestamp',
+      valueGetter: ':sourceAlias.per_end_date::date::text',
     },
     {
       name: 'per_cancellation_deadline',
       sourceAlias: 'per',
       dataType: { dataType: 'dateType' },
       queryable: true,
       visibleByDefault: false,
-      valueGetter: ':sourceAlias.per_cancellation_deadline',
-      valueFunction: '(:value)::timestamp',
+      valueGetter: ':sourceAlias.per_cancellation_deadline::date::text',
     },
     {
       name: 'per_note',

src/main/resources/entity-types/invoice/composite_invoice_line_fund_distribution.json5

@@ -21,15 +21,32 @@
   ],
   columns: [
     {
-      name: 'invoice_id',
+      name: 'invoice_line_id',
       sourceAlias: 'invoice_line_fund_distributions',
       dataType: {
         dataType: 'rangedUUIDType',
       },
       isIdColumn: true,
+      essential: true,
+      hidden: true,
+      valueGetter: ':sourceAlias.id',
+      joinsTo: [
+        {
+          targetId: '1373f063-8b86-48cc-832d-68b4d0dd44fc', // simple_invoice_line
+          targetField: 'id',
+          type: 'equality-simple',
+          direction: 'left',
+        },
+      ],
+    },
+    {
+      name: 'invoice_id',
+      sourceAlias: 'invoice_line_fund_distributions',
+      dataType: {
+        dataType: 'rangedUUIDType',
+      },
+      useIdColumns: true,
       valueGetter: ':sourceAlias.invoice_id',
-      filterValueGetter: 'lower(:sourceAlias.invoice_id)',
-      valueFunction: 'lower(:value)',
       joinsTo: [
         {
           targetId: '4d626ce1-1880-48d2-9d4c-81667fdc5dbb', // simple_invoice
@@ -45,15 +62,13 @@
       dataType: {
         dataType: 'rangedUUIDType',
       },
-      isIdColumn: true,
-      valueGetter: "(:sourceAlias.jsonb->>'poLineId')",
-      filterValueGetter: "lower(:sourceAlias.jsonb->>'poLineId')",
-      valueFunction: 'lower(:value)',
+      useIdColumns: true,
+      valueGetter: "(:sourceAlias.jsonb->>'poLineId')::uuid",
       joinsTo: [
         {
           targetId: '58148257-bfb0-4687-8c42-d2833d772f3e', // simple_purchase_order_line
           targetField: 'id',
-          type: 'equality-cast-uuid',
+          type: 'equality-simple',
           direction: 'left',
         },
       ],
@@ -65,14 +80,13 @@
         dataType: 'rangedUUIDType',
       },
       isIdColumn: true,
-      valueGetter: "(:sourceAlias.fund_distribution->>'fundId')",
-      filterValueGetter: "lower(:sourceAlias.fund_distribution->>'fundId')",
-      valueFunction: 'lower(:value)',
+      essential: true,
+      valueGetter: "(:sourceAlias.fund_distribution->>'fundId')::uuid",
       joinsTo: [
         {
           targetId: '4c63c7f5-1a28-4394-b401-98c02c31492d', // simple_fund
           targetField: 'id',
-          type: 'equality-cast-uuid',
+          type: 'equality-simple',
           direction: 'left',
         },
       ],
@@ -83,14 +97,12 @@
       dataType: {
         dataType: 'rangedUUIDType',
       },
-      valueGetter: "(:sourceAlias.fund_distribution->>'expenseClassId')",
-      filterValueGetter: "lower(:sourceAlias.fund_distribution->>'expenseClassId')",
-      valueFunction: 'lower(:value)',
+      valueGetter: "(:sourceAlias.fund_distribution->>'expenseClassId')::uuid",
       joinsTo: [
         {
           targetId: '6e11cd39-a34e-4afc-90db-957dd45d139e', // simple_expense_class
           targetField: 'id',
-          type: 'equality-cast-uuid',
+          type: 'equality-simple',
           direction: 'left',
         },
       ],

src/main/resources/entity-types/orders/composite_order_invoice_analytics.json5

@@ -40,6 +40,7 @@
       targetField: 'po_line_id',
       sourceField: 'pol.id',
       overrideJoinDirection: "left",
+      useIdColumns: true,
       essentialOnly: true,
       order: 40,
     },
@@ -199,6 +200,6 @@
         entityTypeId: 'e61f988a-1d47-4b16-b8be-220a1c38ca8a',
         columnName: 'name'
       },
-    }
+    },
   ]
 }