Move currency related display options to currency_details object in…

… `mathesar.api.serializers.shared_serializers.MoneyDisplayOptionSerializer`

mathesar/api/serializers/shared_serializers.py

@@ -116,26 +116,32 @@ def get_currency_details(currency_code):
         return currency_dict[currency_code]
 
 
+class CurrencyDisplayOptions(MathesarErrorMessageMixin, serializers.Serializer):
+    symbol = serializers.CharField()
+    symbol_location = serializers.ChoiceField(choices=[(1, 1), (-1, -1)])
+    decimal_symbol = serializers.ChoiceField(choices=[(".", "."), (",", ",")])
+    digit_grouping = serializers.ListField(child=serializers.IntegerField(), allow_empty=True, default=[])
+    digit_grouping_symbol = serializers.ChoiceField(choices=[(".", "."), (",", ","), (" ", " ")], allow_null=True)
+
+
 class MoneyDisplayOptionSerializer(MathesarErrorMessageMixin, OverrideRootPartialMixin, serializers.Serializer):
     currency_code = serializers.CharField(allow_null=True, required=False)
-    symbol = serializers.CharField(required=False)
-    symbol_location = serializers.CharField(required=False, allow_null=True)
-    decimal_symbol = serializers.CharField(required=False, allow_null=True)
-    digit_grouping = serializers.ListField(child=serializers.IntegerField(), required=False)
-    digit_grouping_symbol = serializers.CharField(required=False, allow_null=True)
+    currency_details = CurrencyDisplayOptions(required=False)
 
     def validate(self, attrs):
         currency_code = attrs.get('currency_code', None)
         if currency_code is not None:
-            if len(attrs.keys() - ['currency_code']) != 0:
+            if attrs.get('currency_details', None) is not None:
                 raise MoneyDisplayOptionValueConflictAPIException()
             else:
                 currency_details = get_currency_details(currency_code)
-                attrs['symbol'] = currency_details['currency_symbol']
-                attrs['symbol_location'] = 'Beginning' if currency_details['p_cs_precedes'] == 1 else "End"
-                attrs['decimal_symbol'] = currency_details['mon_decimal_point']
-                attrs['digit_grouping'] = currency_details['mon_grouping']
-                attrs['digit_grouping_symbol'] = currency_details['mon_thousands_sep']
+                attrs['currency_details'] = {
+                    'symbol': currency_details['currency_symbol'],
+                    'symbol_location': 1 if currency_details['p_cs_precedes'] == 1 else -1,
+                    'decimal_symbol': currency_details['mon_decimal_point'],
+                    'digit_grouping': currency_details['mon_grouping'],
+                    'digit_grouping_symbol': currency_details['mon_thousands_sep']
+                }
         return super().validate(attrs)
 
 

mathesar/tests/api/test_column_api.py

@@ -62,7 +62,7 @@ def column_test_table_with_service_layer_options(patent_schema):
     column_data_list = [{},
                         {'display_options': {'input': "dropdown", 'use_custom_labels': False}},
                         {'display_options': {'show_as_percentage': True, 'locale': "en_US"}},
-                        {'display_options': {'symbol': "HK $"}}]
+                        {'display_options': {'currency_details': {'symbol': "HK $"}}}]
     db_table = SATable(
         "anewtable",
         MetaData(bind=engine),
@@ -259,26 +259,32 @@ def test_column_create_invalid_default(column_test_table, client):
         'currency_code': 'en_US',
     }, {
         'currency_code': 'en_US',
-        'decimal_symbol': '.',
-        'digit_grouping': [3, 3, 0],
-        'digit_grouping_symbol': ',',
-        'symbol': '$',
-        'symbol_location': 'Beginning'
+        'currency_details': {
+            'decimal_symbol': '.',
+            'digit_grouping': [3, 3, 0],
+            'digit_grouping_symbol': ',',
+            'symbol': '$',
+            'symbol_location': 1
+        }
     }),
     ("MONEY", {
         'currency_code': None,
-        'symbol': '$',
-        'symbol_location': 'End',
-        'decimal_symbol': '.',
-        'digit_grouping': [3, 0],
-        'digit_grouping_symbol': ','
+        'currency_details': {
+            'symbol': '$',
+            'symbol_location': -1,
+            'decimal_symbol': '.',
+            'digit_grouping': [3, 0],
+            'digit_grouping_symbol': ','
+        }
     }, {
         'currency_code': None,
-        'symbol': '$',
-        'symbol_location': 'End',
-        'decimal_symbol': '.',
-        'digit_grouping': [3, 0],
-        'digit_grouping_symbol': ','
+        'currency_details': {
+            'symbol': '$',
+            'symbol_location': -1,
+            'decimal_symbol': '.',
+            'digit_grouping': [3, 0],
+            'digit_grouping_symbol': ','
+        }
     }),
     ("NUMERIC", {"show_as_percentage": True}, {"show_as_percentage": True}),
     ("NUMERIC", {"show_as_percentage": True, "locale": "en_US"}, {"show_as_percentage": True, "locale": "en_US"}),
@@ -315,11 +321,13 @@ def test_column_create_display_options(
     ("DATE", {'format': _too_long_string}),
     ("MONEY", {
         'currency_code': 'en_US',
-        'symbol': '$',
-        'symbol_location': 'End',
-        'decimal_symbol': '.',
-        'digit_grouping': [3, 0],
-        'digit_grouping_symbol': ','
+        'currency_details': {
+            'symbol': '$',
+            'symbol_location': -1,
+            'decimal_symbol': '.',
+            'digit_grouping': [3, 0],
+            'digit_grouping_symbol': ','
+        }
     }),
     ("NUMERIC", {"show_as_percentage": "wrong value type"}),
     ("TIMESTAMP WITH TIME ZONE", {'format': []}),
@@ -462,11 +470,13 @@ def test_column_update_mathesar_money_display_options(column_test_table_with_ser
     display_options = {"currency_code": "en_US.ISO8859-1"}
     expected_display_options = {
         'currency_code': 'en_US.ISO8859-1',
-        'decimal_symbol': '.',
-        'digit_grouping': [3, 3, 0],
-        'digit_grouping_symbol': ',',
-        'symbol': '$',
-        'symbol_location': 'Beginning'
+        'currency_details': {
+            'decimal_symbol': '.',
+            'digit_grouping': [3, 3, 0],
+            'digit_grouping_symbol': ',',
+            'symbol': '$',
+            'symbol_location': 1
+        }
     }
     display_options_data = {"display_options": display_options}
     response = client.patch(

mathesar/utils/display_options_inference.py

@@ -29,7 +29,14 @@ def infer_mathesar_money_display_options(table_oid, engine, column_attnum):
             if selected_currency_code is not None:
                 return {'currency_code': currency_code}
             else:
-                return {'decimal_symbol': money_array[2], 'digit_grouping_symbol': money_array[1], 'symbol': money_array[3], 'symbol_location': 'Beginning', 'digit_grouping': []}
+                # TODO Improve default values based on locale
+                return {
+                    'decimal_symbol': money_array[2] if money_array[2] is not None else ".",
+                    'digit_grouping_symbol': money_array[1] if money_array[1] is not None else ",",
+                    'symbol': money_array[3],
+                    'symbol_location': 1,
+                    'digit_grouping': []
+                }
 
 
 def infer_table_column_display_options(table, col_name_type_dict):