money field for licence price #3559

szymi- · 2020-09-08T06:40:56Z

No description provided.

romcheg

Could you please add a migration?

UPD: Sorry — did not notice it somehow.

szymi- · 2020-09-08T06:51:04Z

I added the migration while you were reviewing. Then I changed it again. Now it should be ok.

romcheg · 2020-09-08T06:52:06Z

src/ralph/licences/migrations/0006_auto_20200908_0847.py

+            name='price_currency',
+            field=djmoney.models.fields.CurrencyField(max_length=3, default='XXX', editable=False, choices=[('XXX', '---'), ('AED', 'AED'), ('AFN', 'AFN'), ('ALL', 'ALL'), ('AMD', 'AMD'), ('ANG', 'ANG'), ('AOA', 'AOA'), ('ARS', 'ARS'), ('AUD', 'AUD'), ('AWG', 'AWG'), ('AZN', 'AZN'), ('BAM', 'BAM'), ('BBD', 'BBD'), ('BDT', 'BDT'), ('BGN', 'BGN'), ('BHD', 'BHD'), ('BIF', 'BIF'), ('BMD', 'BMD'), ('BND', 'BND'), ('BOB', 'BOB'), ('BOV', 'BOV'), ('BRL', 'BRL'), ('BSD', 'BSD'), ('BTN', 'BTN'), ('BWP', 'BWP'), ('BYN', 'BYN'), ('BYR', 'BYR'), ('BZD', 'BZD'), ('CAD', 'CAD'), ('CDF', 'CDF'), ('CHE', 'CHE'), ('CHF', 'CHF'), ('CHW', 'CHW'), ('CLF', 'CLF'), ('CLP', 'CLP'), ('CNY', 'CNY'), ('COP', 'COP'), ('COU', 'COU'), ('CRC', 'CRC'), ('CUC', 'CUC'), ('CUP', 'CUP'), ('CVE', 'CVE'), ('CZK', 'CZK'), ('DJF', 'DJF'), ('DKK', 'DKK'), ('DOP', 'DOP'), ('DZD', 'DZD'), ('EGP', 'EGP'), ('ERN', 'ERN'), ('ETB', 'ETB'), ('EUR', 'EUR'), ('FJD', 'FJD'), ('FKP', 'FKP'), ('GBP', 'GBP'), ('GEL', 'GEL'), ('GHS', 'GHS'), ('GIP', 'GIP'), ('GMD', 'GMD'), ('GNF', 'GNF'), ('GTQ', 'GTQ'), ('GYD', 'GYD'), ('HKD', 'HKD'), ('HNL', 'HNL'), ('HRK', 'HRK'), ('HTG', 'HTG'), ('HUF', 'HUF'), ('IDR', 'IDR'), ('ILS', 'ILS'), ('IMP', 'IMP'), ('INR', 'INR'), ('IQD', 'IQD'), ('IRR', 'IRR'), ('ISK', 'ISK'), ('JMD', 'JMD'), ('JOD', 'JOD'), ('JPY', 'JPY'), ('KES', 'KES'), ('KGS', 'KGS'), ('KHR', 'KHR'), ('KMF', 'KMF'), ('KPW', 'KPW'), ('KRW', 'KRW'), ('KWD', 'KWD'), ('KYD', 'KYD'), ('KZT', 'KZT'), ('LAK', 'LAK'), ('LBP', 'LBP'), ('LKR', 'LKR'), ('LRD', 'LRD'), ('LSL', 'LSL'), ('LTL', 'LTL'), ('LVL', 'LVL'), ('LYD', 'LYD'), ('MAD', 'MAD'), ('MDL', 'MDL'), ('MGA', 'MGA'), ('MKD', 'MKD'), ('MMK', 'MMK'), ('MNT', 'MNT'), ('MOP', 'MOP'), ('MRO', 'MRO'), ('MUR', 'MUR'), ('MVR', 'MVR'), ('MWK', 'MWK'), ('MXN', 'MXN'), ('MXV', 'MXV'), ('MYR', 'MYR'), ('MZN', 'MZN'), ('NAD', 'NAD'), ('NGN', 'NGN'), ('NIO', 'NIO'), ('NOK', 'NOK'), ('NPR', 'NPR'), ('NZD', 'NZD'), ('OMR', 'OMR'), ('PAB', 'PAB'), ('PEN', 'PEN'), ('PGK', 'PGK'), ('PHP', 'PHP'), ('PKR', 'PKR'), ('PLN', 'PLN'), ('PYG', 'PYG'), ('QAR', 'QAR'), ('RON', 'RON'), ('RSD', 'RSD'), ('RUB', 'RUB'), ('RWF', 'RWF'), ('SAR', 'SAR'), ('SBD', 'SBD'), ('SCR', 'SCR'), ('SDG', 'SDG'), ('SEK', 'SEK'), ('SGD', 'SGD'), ('SHP', 'SHP'), ('SLL', 'SLL'), ('SOS', 'SOS'), ('SRD', 'SRD'), ('SSP', 'SSP'), ('STD', 'STD'), ('SVC', 'SVC'), ('SYP', 'SYP'), ('SZL', 'SZL'), ('THB', 'THB'), ('TJS', 'TJS'), ('TMM', 'TMM'), ('TMT', 'TMT'), ('TND', 'TND'), ('TOP', 'TOP'), ('TRY', 'TRY'), ('TTD', 'TTD'), ('TVD', 'TVD'), ('TWD', 'TWD'), ('TZS', 'TZS'), ('UAH', 'UAH'), ('UGX', 'UGX'), ('USD', 'USD'), ('USN', 'USN'), ('UYI', 'UYI'), ('UYU', 'UYU'), ('UZS', 'UZS'), ('VEF', 'VEF'), ('VND', 'VND'), ('VUV', 'VUV'), ('WST', 'WST'), ('XAF', 'XAF'), ('XAG', 'XAG'), ('XAU', 'XAU'), ('XBA', 'XBA'), ('XBB', 'XBB'), ('XBC', 'XBC'), ('XBD', 'XBD'), ('XCD', 'XCD'), ('XDR', 'XDR'), ('XFO', 'XFO'), ('XFU', 'XFU'), ('XOF', 'XOF'), ('XPD', 'XPD'), ('XPF', 'XPF'), ('XPT', 'XPT'), ('XSU', 'XSU'), ('XTS', 'XTS'), ('XUA', 'XUA'), ('XYZ', 'XYZ'), ('YER', 'YER'), ('ZAR', 'ZAR'), ('ZMK', 'ZMK'), ('ZMW', 'ZMW'), ('ZWD', 'ZWD'), ('ZWL', 'ZWL'), ('ZWN', 'ZWN')]),
+        ),
+        migrations.AlterField(


Will this convert existing values with no data loss?

Yes. MoneyField extends DecimalField. Precision and default value stay the same; field name (price) also remains the same. In the database, currency is stored in a separate field (price_currency). Also, in the REST API field price looks the same as before; currency is displayed in a separate price_currency fideld.

romcheg · 2020-09-08T07:20:29Z

src/ralph/licences/models.py

@@ -191,8 +192,8 @@ class Licence(Regionalizable, AdminAbsoluteUrlMixin, BaseObject):
        help_text="Leave blank if this licence is perpetual",
    )
    order_no = models.CharField(max_length=50, null=True, blank=True)
-    price = models.DecimalField(
-        max_digits=10, decimal_places=2, default=0, null=True, blank=True,
+    price = MoneyField(


Shouldn't the price_currency field be also reflected on the model?

The field price_currency is automatically created by the library. MoneyField combines the two fields (price and price_currency) into one model.

romcheg · 2020-09-08T07:23:47Z

@szymi- I've commented in a few places I'm concerned about since I'm not aware how this django-money works. If those concerns are invalid and the CI is happy I'll be happy to approve.

szymi-

@szymi- I've commented in a few places I'm concerned about since I'm not aware how this django-money works. If those concerns are invalid and the CI is happy I'll be happy to approve.

Thanks. I considered creating a separate field for currency while keeping the original price field, however this library does exactly the same in the background with some additional bonuses (most importantly, admin form and REST API presentation are dealt with by the library). I verified the library with exactly the issues you rose in mind - and came to the conclusion that it does the job well.

szymi- · 2020-09-08T07:21:36Z

src/ralph/licences/migrations/0006_auto_20200908_0847.py

+            name='price_currency',
+            field=djmoney.models.fields.CurrencyField(max_length=3, default='XXX', editable=False, choices=[('XXX', '---'), ('AED', 'AED'), ('AFN', 'AFN'), ('ALL', 'ALL'), ('AMD', 'AMD'), ('ANG', 'ANG'), ('AOA', 'AOA'), ('ARS', 'ARS'), ('AUD', 'AUD'), ('AWG', 'AWG'), ('AZN', 'AZN'), ('BAM', 'BAM'), ('BBD', 'BBD'), ('BDT', 'BDT'), ('BGN', 'BGN'), ('BHD', 'BHD'), ('BIF', 'BIF'), ('BMD', 'BMD'), ('BND', 'BND'), ('BOB', 'BOB'), ('BOV', 'BOV'), ('BRL', 'BRL'), ('BSD', 'BSD'), ('BTN', 'BTN'), ('BWP', 'BWP'), ('BYN', 'BYN'), ('BYR', 'BYR'), ('BZD', 'BZD'), ('CAD', 'CAD'), ('CDF', 'CDF'), ('CHE', 'CHE'), ('CHF', 'CHF'), ('CHW', 'CHW'), ('CLF', 'CLF'), ('CLP', 'CLP'), ('CNY', 'CNY'), ('COP', 'COP'), ('COU', 'COU'), ('CRC', 'CRC'), ('CUC', 'CUC'), ('CUP', 'CUP'), ('CVE', 'CVE'), ('CZK', 'CZK'), ('DJF', 'DJF'), ('DKK', 'DKK'), ('DOP', 'DOP'), ('DZD', 'DZD'), ('EGP', 'EGP'), ('ERN', 'ERN'), ('ETB', 'ETB'), ('EUR', 'EUR'), ('FJD', 'FJD'), ('FKP', 'FKP'), ('GBP', 'GBP'), ('GEL', 'GEL'), ('GHS', 'GHS'), ('GIP', 'GIP'), ('GMD', 'GMD'), ('GNF', 'GNF'), ('GTQ', 'GTQ'), ('GYD', 'GYD'), ('HKD', 'HKD'), ('HNL', 'HNL'), ('HRK', 'HRK'), ('HTG', 'HTG'), ('HUF', 'HUF'), ('IDR', 'IDR'), ('ILS', 'ILS'), ('IMP', 'IMP'), ('INR', 'INR'), ('IQD', 'IQD'), ('IRR', 'IRR'), ('ISK', 'ISK'), ('JMD', 'JMD'), ('JOD', 'JOD'), ('JPY', 'JPY'), ('KES', 'KES'), ('KGS', 'KGS'), ('KHR', 'KHR'), ('KMF', 'KMF'), ('KPW', 'KPW'), ('KRW', 'KRW'), ('KWD', 'KWD'), ('KYD', 'KYD'), ('KZT', 'KZT'), ('LAK', 'LAK'), ('LBP', 'LBP'), ('LKR', 'LKR'), ('LRD', 'LRD'), ('LSL', 'LSL'), ('LTL', 'LTL'), ('LVL', 'LVL'), ('LYD', 'LYD'), ('MAD', 'MAD'), ('MDL', 'MDL'), ('MGA', 'MGA'), ('MKD', 'MKD'), ('MMK', 'MMK'), ('MNT', 'MNT'), ('MOP', 'MOP'), ('MRO', 'MRO'), ('MUR', 'MUR'), ('MVR', 'MVR'), ('MWK', 'MWK'), ('MXN', 'MXN'), ('MXV', 'MXV'), ('MYR', 'MYR'), ('MZN', 'MZN'), ('NAD', 'NAD'), ('NGN', 'NGN'), ('NIO', 'NIO'), ('NOK', 'NOK'), ('NPR', 'NPR'), ('NZD', 'NZD'), ('OMR', 'OMR'), ('PAB', 'PAB'), ('PEN', 'PEN'), ('PGK', 'PGK'), ('PHP', 'PHP'), ('PKR', 'PKR'), ('PLN', 'PLN'), ('PYG', 'PYG'), ('QAR', 'QAR'), ('RON', 'RON'), ('RSD', 'RSD'), ('RUB', 'RUB'), ('RWF', 'RWF'), ('SAR', 'SAR'), ('SBD', 'SBD'), ('SCR', 'SCR'), ('SDG', 'SDG'), ('SEK', 'SEK'), ('SGD', 'SGD'), ('SHP', 'SHP'), ('SLL', 'SLL'), ('SOS', 'SOS'), ('SRD', 'SRD'), ('SSP', 'SSP'), ('STD', 'STD'), ('SVC', 'SVC'), ('SYP', 'SYP'), ('SZL', 'SZL'), ('THB', 'THB'), ('TJS', 'TJS'), ('TMM', 'TMM'), ('TMT', 'TMT'), ('TND', 'TND'), ('TOP', 'TOP'), ('TRY', 'TRY'), ('TTD', 'TTD'), ('TVD', 'TVD'), ('TWD', 'TWD'), ('TZS', 'TZS'), ('UAH', 'UAH'), ('UGX', 'UGX'), ('USD', 'USD'), ('USN', 'USN'), ('UYI', 'UYI'), ('UYU', 'UYU'), ('UZS', 'UZS'), ('VEF', 'VEF'), ('VND', 'VND'), ('VUV', 'VUV'), ('WST', 'WST'), ('XAF', 'XAF'), ('XAG', 'XAG'), ('XAU', 'XAU'), ('XBA', 'XBA'), ('XBB', 'XBB'), ('XBC', 'XBC'), ('XBD', 'XBD'), ('XCD', 'XCD'), ('XDR', 'XDR'), ('XFO', 'XFO'), ('XFU', 'XFU'), ('XOF', 'XOF'), ('XPD', 'XPD'), ('XPF', 'XPF'), ('XPT', 'XPT'), ('XSU', 'XSU'), ('XTS', 'XTS'), ('XUA', 'XUA'), ('XYZ', 'XYZ'), ('YER', 'YER'), ('ZAR', 'ZAR'), ('ZMK', 'ZMK'), ('ZMW', 'ZMW'), ('ZWD', 'ZWD'), ('ZWL', 'ZWL'), ('ZWN', 'ZWN')]),
+        ),
+        migrations.AlterField(


Yes. MoneyField extends DecimalField. Precision and default value stay the same; field name (price) also remains the same. In the database, currency is stored in a separate field (price_currency). Also, in the REST API field price looks the same as before; currency is displayed in a separate price_currency fideld.

szymi- · 2020-09-08T07:24:56Z

src/ralph/licences/models.py

@@ -191,8 +192,8 @@ class Licence(Regionalizable, AdminAbsoluteUrlMixin, BaseObject):
        help_text="Leave blank if this licence is perpetual",
    )
    order_no = models.CharField(max_length=50, null=True, blank=True)
-    price = models.DecimalField(
-        max_digits=10, decimal_places=2, default=0, null=True, blank=True,
+    price = MoneyField(


The field price_currency is automatically created by the library. MoneyField combines the two fields (price and price_currency) into one model.

romcheg

Thanks for resolving my concerns. LGTM

romcheg · 2020-09-09T07:53:26Z

@szymi- I've just got one more concern -- does this change the format of an existing object field that Ralph returns via the API?

szymi- · 2020-09-09T07:55:01Z

@szymi- I've just got one more concern -- does this change the format of an existing object field that Ralph returns via the API?

Field price remains the same. New field price_currency is added.

szymi- · 2020-09-09T07:57:39Z

@romcheg @MarekBleschke I am considering unifying price field in all models across the entire project, possibly via a PriceMixin. I have two reasons for that: to unify the way reports are generated (at the moment reports mixing Licence price with prices of other models will not work). The second reason is to unify the approach for price in Ralph. Please let me know what you think about that.

MarekBleschke · 2020-09-10T05:50:36Z

@romcheg @MarekBleschke I am considering unifying price field in all models across the entire project, possibly via a PriceMixin. I have two reasons for that: to unify the way reports are generated (at the moment reports mixing Licence price with prices of other models will not work). The second reason is to unify the approach for price in Ralph. Please let me know what you think about that.

Yes, unifying price field in all models IMO is the way to go.

coveralls · 2020-09-10T13:33:57Z

Coverage increased (+0.01%) to 84.573% when pulling 7d103ca on szymi-:licence_price_currency into 7515640 on allegro:ng.

MarekBleschke · 2020-09-11T05:58:54Z

src/ralph/licences/tests/factories.py

 from factory.django import DjangoModelFactory
-from factory.fuzzy import FuzzyText
+from factory.fuzzy import FuzzyDecimal, FuzzyText


FuzzyDecimal looks unused

szymi- added 2 commits September 8, 2020 08:39

money field for licence price

480caf4

migration for licence money field

7ee6d61

romcheg suggested changes Sep 8, 2020

View reviewed changes

update choices in migration

5b901f6

romcheg reviewed Sep 8, 2020

View reviewed changes

szymi- commented Sep 8, 2020

View reviewed changes

romcheg previously approved these changes Sep 8, 2020

View reviewed changes

fix tests

534cdd9

szymi- dismissed romcheg’s stale review via 534cdd9 September 9, 2020 07:49

remove pdb

1adb22e

MarekBleschke previously approved these changes Sep 10, 2020

View reviewed changes

move price to separate mixins

2a8fab0

szymi- dismissed MarekBleschke’s stale review via 2a8fab0 September 10, 2020 06:45

szymi- added 3 commits September 10, 2020 11:23

fix imports, add export warning

10a615a

invoice report fix

54fa2a4

isort and flake8

53b7003

MarekBleschke reviewed Sep 11, 2020

View reviewed changes

szymi- added 2 commits September 11, 2020 10:36

set default currency if not set

8e099b8

remove unused imports

7d103ca

MarekBleschke approved these changes Sep 11, 2020

View reviewed changes

szymi- merged commit 0e117a8 into allegro:ng Sep 11, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

money field for licence price #3559

money field for licence price #3559

szymi- commented Sep 8, 2020

romcheg left a comment •

edited

Loading

szymi- commented Sep 8, 2020

romcheg Sep 8, 2020

szymi- Sep 8, 2020

romcheg Sep 8, 2020

szymi- Sep 8, 2020

romcheg commented Sep 8, 2020

szymi- left a comment

szymi- Sep 8, 2020

szymi- Sep 8, 2020

romcheg left a comment

romcheg commented Sep 9, 2020

szymi- commented Sep 9, 2020

szymi- commented Sep 9, 2020 •

edited

Loading

MarekBleschke commented Sep 10, 2020

coveralls commented Sep 10, 2020 •

edited

Loading

MarekBleschke Sep 11, 2020

money field for licence price #3559

money field for licence price #3559

Conversation

szymi- commented Sep 8, 2020

romcheg left a comment • edited Loading

Choose a reason for hiding this comment

szymi- commented Sep 8, 2020

romcheg Sep 8, 2020

Choose a reason for hiding this comment

szymi- Sep 8, 2020

Choose a reason for hiding this comment

romcheg Sep 8, 2020

Choose a reason for hiding this comment

szymi- Sep 8, 2020

Choose a reason for hiding this comment

romcheg commented Sep 8, 2020

szymi- left a comment

Choose a reason for hiding this comment

szymi- Sep 8, 2020

Choose a reason for hiding this comment

szymi- Sep 8, 2020

Choose a reason for hiding this comment

romcheg left a comment

Choose a reason for hiding this comment

romcheg commented Sep 9, 2020

szymi- commented Sep 9, 2020

szymi- commented Sep 9, 2020 • edited Loading

MarekBleschke commented Sep 10, 2020

coveralls commented Sep 10, 2020 • edited Loading

MarekBleschke Sep 11, 2020

Choose a reason for hiding this comment

romcheg left a comment •

edited

Loading

szymi- commented Sep 9, 2020 •

edited

Loading

coveralls commented Sep 10, 2020 •

edited

Loading