progress till now

SAP · Jan 14, 2025 · e34eee9 · e34eee9
1 parent f0a657d
commit e34eee9
Show file tree

Hide file tree

Showing 16 changed files with 93 additions and 49 deletions.
diff --git a/packages/generator/src/edmx-to-vdm/common/entity.ts b/packages/generator/src/edmx-to-vdm/common/entity.ts
@@ -105,8 +105,6 @@ function properties(
       isEnum
     );
 
-    console.log("properties: " + p.Precision);
-
     return {
       originalName: p.Name,
       instancePropertyName,

diff --git a/packages/generator/src/entity/namespace.ts b/packages/generator/src/entity/namespace.ts
@@ -101,7 +101,9 @@ export function createPropertyFieldInitializerForEntity(
 
   return `${fieldBuilderName}.buildEdmTypeField('${prop.originalName}', '${
     prop.edmType
-  }', ${prop.nullable}${prop.precision ? `, ${prop.precision}` :''})`;
+  }', ${prop.nullable}${
+    prop.precision !== undefined ? `, ${prop.precision}` : ''
+  })`;
 }
 
 /**

diff --git a/packages/generator/src/typedoc.ts b/packages/generator/src/typedoc.ts
@@ -174,7 +174,6 @@ function addConstraints(
     description += `${unixEOL}@nullable`;
   }
   if (constraints.precision !== undefined) {
-    console.log(constraints.precision);
     description += `${unixEOL}Precision: ${constraints.precision}.`;
   }
 

diff --git a/packages/odata-common/src/de-serializers/de-serializers.ts b/packages/odata-common/src/de-serializers/de-serializers.ts
@@ -152,9 +152,13 @@ export function createValueDeserializer<DeSerializersT extends DeSerializers>(
  */
 export function createValueSerializer<DeSerializersT extends DeSerializers>(
   deSerializers: DeSerializersT
-): <EdmT>(value: any, edmType: EdmT) => any {
-  return (value, edmType) => {
+): <EdmT>(value: any, edmType: EdmT, precision?: number) => any {
+  return (value, edmType, precision) => {
     const serialize = deSerializers[edmType as any]?.serialize;
+    // Check if the edmType is specifically Edm.DateTimeOffset as we can have precision, scale property defined
+    if (edmType === 'Edm.DateTimeOffset' && precision) {
+      return serialize(value, precision);
+    }
     return serialize ? serialize(value) : value;
   };
 }
diff --git a/packages/odata-common/src/entity-serializer.ts b/packages/odata-common/src/entity-serializer.ts
@@ -6,7 +6,8 @@ import {
   Link,
   ComplexTypeField,
   CollectionField,
-  EnumField
+  EnumField,
+  getFieldOptions
 } from './selectable';
 import { isEdmType } from './edm-types';
 import { createValueSerializer } from './de-serializers';
@@ -84,7 +85,7 @@ export function entitySerializer(
       return null;
     }
     if (field instanceof EdmTypeField) {
-      return tsToEdm(fieldValue, field.edmType);
+      return tsToEdm(fieldValue, field.edmType, getFieldOptions().precision);
     }
     if (field instanceof OneToOneLink) {
       return serializeEntity(fieldValue, field._linkedEntityApi);

diff --git a/packages/odata-common/src/selectable/edm-type-field.ts b/packages/odata-common/src/selectable/edm-type-field.ts
@@ -49,9 +49,10 @@ export class EdmTypeField<
     DeSerializersT extends DeSerializers,
     EdmT extends EdmTypeShared<'any'>,
     NullableT extends boolean = false,
-    SelectableT extends boolean = false
+    SelectableT extends boolean = false,
+    PrecisionT extends number = number
   >
-  extends Field<EntityT, NullableT, SelectableT>
+  extends Field<EntityT, NullableT, SelectableT, PrecisionT>
   implements EntityIdentifiable<EntityT, DeSerializersT>
 {
   readonly _entity: EntityT;
@@ -70,7 +71,7 @@ export class EdmTypeField<
     readonly _fieldOf: ConstructorOrField<EntityT>,
     readonly edmType: EdmT,
     public _deSerializers: DeSerializersT, // Only necessary for the type, unused otherwise
-    fieldOptions?: FieldOptions<NullableT, SelectableT>
+    fieldOptions?: FieldOptions<NullableT, SelectableT, PrecisionT>
   ) {
     super(fieldName, getEntityConstructor(_fieldOf), fieldOptions);
     this.precision = fieldOptions?.precision;

diff --git a/packages/odata-common/src/selectable/field-builder.ts b/packages/odata-common/src/selectable/field-builder.ts
@@ -75,32 +75,39 @@ export class FieldBuilder<
     private deSerializers: DeSerializersT
   ) {}
 
-  buildEdmTypeField<EdmT extends OrderableEdmType, NullableT extends boolean>(
+  buildEdmTypeField<
+    EdmT extends OrderableEdmType,
+    NullableT extends boolean,
+    PrecisionT extends number = number
+  >(
     fieldName: string,
     edmType: EdmT,
     isNullable: NullableT,
-    precision?: number
+    precision?: PrecisionT
   ): OrderableEdmTypeField<
     EntityTypeFromFieldOf<FieldOfT>,
     DeSerializersT,
     EdmT,
     NullableT,
-    IsSelectableField<FieldOfT>
+    IsSelectableField<FieldOfT>,
+    PrecisionT
   >;
   buildEdmTypeField<
     EdmT extends Exclude<EdmTypeShared<'any'>, OrderableEdmType>,
-    NullableT extends boolean
+    NullableT extends boolean,
+    PrecisionT extends number = number
   >(
     fieldName: string,
     edmType: EdmT,
     isNullable: NullableT,
-    precision?: number
+    precision?: PrecisionT
   ): EdmTypeField<
     EntityTypeFromFieldOf<FieldOfT>,
     DeSerializersT,
     EdmT,
     NullableT,
-    IsSelectableField<FieldOfT>
+    IsSelectableField<FieldOfT>,
+    PrecisionT
   >;
   /**
    * Build a field for a property with an EDM type.
@@ -115,26 +122,29 @@ export class FieldBuilder<
    */
   buildEdmTypeField<
     EdmT extends EdmTypeShared<'any'>,
-    NullableT extends boolean
+    NullableT extends boolean,
+    PrecisionT extends number = number
   >(
     fieldName: string,
     edmType: EdmT,
     isNullable: NullableT,
-    precision?: number
+    precision?: PrecisionT
   ):
     | OrderableEdmTypeField<
         EntityTypeFromFieldOf<FieldOfT>,
         DeSerializersT,
         EdmT,
         NullableT,
-        IsSelectableField<FieldOfT>
+        IsSelectableField<FieldOfT>,
+        PrecisionT
       >
     | EdmTypeField<
         EntityTypeFromFieldOf<FieldOfT>,
         DeSerializersT,
         EdmT,
         NullableT,
-        IsSelectableField<FieldOfT>
+        IsSelectableField<FieldOfT>,
+        PrecisionT
       > {
     const isSelectable = (this.fieldOf instanceof
       ComplexTypeField) as IsSelectableField<FieldOfT>;

diff --git a/packages/odata-common/src/selectable/field.ts b/packages/odata-common/src/selectable/field.ts
@@ -5,7 +5,8 @@ import type { EntityBase, Constructable } from '../entity-base';
  */
 export interface FieldOptions<
   NullableT extends boolean = false,
-  SelectableT extends boolean = false
+  SelectableT extends boolean = false,
+  PrecisionT extends number = number
 > {
   /**
    * Whether the value of the field can be `null`.
@@ -18,7 +19,7 @@ export interface FieldOptions<
   /**
    * Precision associated with field.
    */
-  precision?: number;
+  precision?: PrecisionT;
 }
 
 /**
@@ -30,19 +31,20 @@ export interface FieldOptions<
  */
 export function getFieldOptions<
   NullableT extends boolean = false,
-  SelectableT extends boolean = false
+  SelectableT extends boolean = false,
+  PrecisionT extends number = number
 >(
-  fieldOptions?: FieldOptions<NullableT, SelectableT>
-): Required<FieldOptions<NullableT, SelectableT>> {
+  fieldOptions?: FieldOptions<NullableT, SelectableT, PrecisionT>
+): Required<FieldOptions<NullableT, SelectableT, PrecisionT>> {
   return { ...defaultFieldOptions, ...fieldOptions } as Required<
-    FieldOptions<NullableT, SelectableT>
+    FieldOptions<NullableT, SelectableT, PrecisionT>
   >;
 }
 
 const defaultFieldOptions: Required<FieldOptions> = {
   isNullable: false,
   isSelectable: false,
-  precision : 0
+  precision: 0
 };
 
 /**
@@ -60,9 +62,12 @@ const defaultFieldOptions: Required<FieldOptions> = {
 export class Field<
   EntityT extends EntityBase,
   NullableT extends boolean = false,
-  SelectableT extends boolean = false
+  SelectableT extends boolean = false,
+  PrecisionT extends number = number
 > {
-  readonly _fieldOptions: Required<FieldOptions<NullableT, SelectableT>>;
+  readonly _fieldOptions: Required<
+    FieldOptions<NullableT, SelectableT, PrecisionT>
+  >;
   /**
    * Creates an instance of Field.
    * @param _fieldName - Actual name of the field used in the OData request.
@@ -72,7 +77,7 @@ export class Field<
   constructor(
     readonly _fieldName: string,
     readonly _entityConstructor: Constructable<EntityT>,
-    fieldOptions?: FieldOptions<NullableT, SelectableT>
+    fieldOptions?: FieldOptions<NullableT, SelectableT, PrecisionT>
   ) {
     this._fieldOptions = getFieldOptions(fieldOptions);
   }

diff --git a/packages/odata-common/src/selectable/orderable-edm-type-field.ts b/packages/odata-common/src/selectable/orderable-edm-type-field.ts
@@ -17,8 +17,16 @@ export class OrderableEdmTypeField<
   DeSerializersT extends DeSerializers,
   EdmT extends EdmTypeShared<'any'>,
   NullableT extends boolean = false,
-  SelectableT extends boolean = false
-> extends EdmTypeField<EntityT, DeSerializersT, EdmT, NullableT, SelectableT> {
+  SelectableT extends boolean = false,
+  PrecisionT extends number = number
+> extends EdmTypeField<
+  EntityT,
+  DeSerializersT,
+  EdmT,
+  NullableT,
+  SelectableT,
+  PrecisionT
+> {
   /**
    * Creates an instance of Filter for this field and the given value using the operator 'gt', i.e. `>`.
    * @param value - Value to be used in the filter.

diff --git a/packages/odata-v4/src/de-serializers/converters.ts b/packages/odata-v4/src/de-serializers/converters.ts
@@ -42,8 +42,17 @@ export function deserializeDateTimeOffsetToMoment(
 /**
  * @internal
  */
-export function serializeToDateTimeOffset(value: moment.Moment): string {
-  return value.utc().format('YYYY-MM-DDTHH:mm:ss.SSS') + 'Z';
+export function serializeToDateTimeOffset(
+  value: moment.Moment,
+  precision?: number
+): string {
+  // If precision is defined, create a format with decimal places
+  if (precision !== undefined && precision !== null) {
+    const precisionFormat = new Array(precision).fill('S').join('');
+    return value.utc().format(`YYYY-MM-DDTHH:mm:ss.${precisionFormat}`) + 'Z';
+  }
+  // If no precision, return without decimal places
+  return value.utc().format('YYYY-MM-DDTHH:mm:ss') + 'Z';
 }
 
 /**

diff --git a/packages/odata-v4/src/de-serializers/default-de-serializers.ts b/packages/odata-v4/src/de-serializers/default-de-serializers.ts
@@ -14,6 +14,7 @@ import {
   serializeToTime,
   deserializeDateToMoment
 } from './converters';
+import type { Moment } from 'moment';
 import type BigNumber from 'bignumber.js';
 import type { Time } from '@sap-cloud-sdk/odata-common/internal';
 import type { DeSerializers } from './de-serializers';
@@ -55,7 +56,8 @@ const defaultDeSerializersRaw: DefaultDeSerializers = {
   },
   'Edm.DateTimeOffset': {
     deserialize: deserializeDateTimeOffsetToMoment,
-    serialize: serializeToDateTimeOffset,
+    serialize: (value: Moment, precision?: number) =>
+      serializeToDateTimeOffset(value, precision),
     serializeToUri: (value, serialize) => serialize(value)
   },
   'Edm.Duration': {

diff --git a/packages/odata-v4/src/request-builder/update-request-builder.spec.ts b/packages/odata-v4/src/request-builder/update-request-builder.spec.ts
@@ -19,7 +19,7 @@ function createTestEntity() {
     .keyPropertyGuid(keyPropGuid)
     .keyPropertyString(keyPropString)
     .keyDateProperty(keyPropDate)
-    .dateTimeOffSetProperty(keyPropDate)
+    .dateTimeOffSetProperty(moment())
     .int32Property(int32Prop)
     .build();
 }

diff --git a/test-packages/test-services-odata-v4/test-service/TestEntityApi.js b/test-packages/test-services-odata-v4/test-service/TestEntityApi.js