admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix microAmount (#2654)

Browse Source 
* Fix microAmount

* Code review returns

* Parse currency values as string

* Jeremy's returns

* fix: scalars not properly implemented

* fix: filters not working on big float scalar

---------

Co-authored-by: Jérémy Magrin <jeremy.magrin@gmail.com>
This commit is contained in:
martmull
2023-11-23 15:26:59 +01:00
committed by GitHub
parent 0194f30dd8
commit 59e53ba72d
16 changed files with 139 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/metadata/field-metadata/field-metadata.entity.ts
View File

@ -25,6 +25,7 @@ export enum FieldMetadataType {
DATE_TIME = 'DATE_TIME',
BOOLEAN = 'BOOLEAN',
NUMBER = 'NUMBER',
NUMERIC = 'NUMERIC',
PROBABILITY = 'PROBABILITY',
ENUM = 'ENUM',
LINK = 'LINK',

1
server/src/metadata/field-metadata/interfaces/field-metadata-default-value.interface.ts
View File

@ -53,6 +53,7 @@ type FieldMetadataDefaultValueMapping = {
[FieldMetadataType.DATE_TIME]: FieldMetadataDefaultValueDateTime;
[FieldMetadataType.BOOLEAN]: FieldMetadataDefaultValueBoolean;
[FieldMetadataType.NUMBER]: FieldMetadataDefaultValueNumber;
[FieldMetadataType.NUMERIC]: FieldMetadataDefaultValueString;
[FieldMetadataType.PROBABILITY]: FieldMetadataDefaultValueNumber;
[FieldMetadataType.ENUM]: FieldMetadataDefaultValueString;
[FieldMetadataType.LINK]: FieldMetadataDefaultValueLink;

16
server/src/metadata/field-metadata/utils/convert-field-metadata-to-column-action.util.ts
View File

@ -56,6 +56,19 @@ export function convertFieldMetadataToColumnActions(
},
];
}
case FieldMetadataType.NUMERIC: {
const defaultValue =
fieldMetadata.defaultValue as FieldMetadataDefaultValue<FieldMetadataType.NUMERIC>;
return [
{
action: WorkspaceMigrationColumnActionType.CREATE,
columnName: fieldMetadata.targetColumnMap.value,
columnType: 'numeric',
defaultValue: serializeDefaultValue(defaultValue?.value),
},
];
}
case FieldMetadataType.NUMBER:
case FieldMetadataType.PROBABILITY: {
const defaultValue =
@ -117,6 +130,7 @@ export function convertFieldMetadataToColumnActions(
},
];
}
case FieldMetadataType.CURRENCY: {
const defaultValue =
fieldMetadata.defaultValue as FieldMetadataDefaultValue<FieldMetadataType.CURRENCY>;
@ -125,7 +139,7 @@ export function convertFieldMetadataToColumnActions(
{
action: WorkspaceMigrationColumnActionType.CREATE,
columnName: fieldMetadata.targetColumnMap.amountMicros,
columnType: 'integer',
columnType: 'numeric',
defaultValue: serializeDefaultValue(defaultValue?.amountMicros),
},
{

1
server/src/metadata/field-metadata/utils/generate-target-column-map.util.ts
View File

@ -24,6 +24,7 @@ export function generateTargetColumnMap(
case FieldMetadataType.PHONE:
case FieldMetadataType.EMAIL:
case FieldMetadataType.NUMBER:
case FieldMetadataType.NUMERIC:
case FieldMetadataType.PROBABILITY:
case FieldMetadataType.BOOLEAN:
case FieldMetadataType.DATE_TIME:

1
server/src/metadata/field-metadata/utils/validate-default-value-based-on-type.util.ts
View File

@ -26,6 +26,7 @@ export const validateDefaultValueBasedOnType = (
case FieldMetadataType.PHONE:
case FieldMetadataType.EMAIL:
case FieldMetadataType.ENUM:
case FieldMetadataType.NUMERIC:
return (
typeof defaultValue === 'object' &&
'value' in defaultValue &&

2
server/src/metadata/workspace-migration/migrations/1697618009-addCompanyTable.ts
View File

@ -55,7 +55,7 @@ export const addCompanyTable: WorkspaceMigrationTableAction[] = [
},
{
columnName: 'annualRecurringRevenueAmountMicros',
columnType: 'integer',
columnType: 'numeric',
action: WorkspaceMigrationColumnActionType.CREATE,
},
{

2
server/src/metadata/workspace-migration/migrations/1697618021-addOpportunityTable.ts
View File

@ -14,7 +14,7 @@ export const addOpportunityTable: WorkspaceMigrationTableAction[] = [
columns: [
{
columnName: 'amountAmountMicros',
columnType: 'integer',
columnType: 'numeric',
action: WorkspaceMigrationColumnActionType.CREATE,
},
{