Merge branch 'master' into dm/sql-repeatrecord-pr3

dimagi · Jun 10, 2024 · a6b94f5 · a6b94f5
2 parents 4dff93b + 0c81cbd
commit a6b94f5
Show file tree

Hide file tree

Showing 742 changed files with 34,774 additions and 18,987 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -25,11 +25,12 @@
 /corehq/sql_proxy_standby_accessors/ @snopoke
 /corehq/tests/nose.py @millerdev
 /corehq/tests/noseplugins/ @millerdev
-/corehq/util/ @esoergel
+/corehq/util/couch.py @esoergel
 /corehq/util/couch_helpers.py @millerdev
 /corehq/util/datadog/lockmeter.py @millerdev
 /corehq/util/datadog/tests/test_lockmeter.py @millerdev
 /corehq/util/pagination.py @millerdev
+/corehq/util/timer.py @esoergel
 /corehq/warehouse/ @calellowitz
 /corehq/warnings.py @millerdev
 
@@ -40,7 +41,7 @@
 /corehq/apps/case_search/ @orangejenny @MartinRiese @esoergel @AddisonDunn @stephherbers @Robert-Costello @Jtang-1 @nospame
 /corehq/apps/change_feed/ @dannyroberts
 /corehq/apps/cleanup/management/commands/populate_sql_model_from_couch_model.py @millerdev
-/corehq/apps/cloudcare/ @orangejenny @MartinRiese @esoergel @AddisonDunn @stephherbers @Robert-Costello @Jtang-1 @nospame
+/corehq/apps/cloudcare/ @orangejenny @MartinRiese @AddisonDunn @stephherbers @Robert-Costello @Jtang-1 @nospame
 /corehq/apps/commtrack/ @esoergel
 /corehq/apps/data_dictionary/ @esoergel @orangejenny @zandre-eng
 /corehq/apps/domain/decorators.py @esoergel
@@ -52,9 +53,9 @@
 /corehq/apps/hqwebapp/two_factor_methods.py @gherceg
 /corehq/apps/linked_domain/ @gherceg
 /corehq/apps/locations/ @esoergel
-/corehq/apps/locations/adjacencylist.py @esoergel @millerdev
+/corehq/apps/locations/adjacencylist.py @millerdev
 /corehq/apps/locations/resources/v0_6.py @AddisonDunn
-/corehq/apps/ota/ @snopoke
+/corehq/apps/ota/ @snopoke @esoergel
 /corehq/apps/reports/models.py @AddisonDunn
 /corehq/apps/reports/standard/cases/ @esoergel
 /corehq/apps/reports/standard/tableau.py @AddisonDunn

diff --git a/corehq/apps/accounting/bootstrap/config/annual_plans_may_2024.py b/corehq/apps/accounting/bootstrap/config/annual_plans_may_2024.py
@@ -0,0 +1,30 @@
+from decimal import Decimal
+
+from corehq.apps.accounting.models import FeatureType, SoftwarePlanEdition
+
+BOOTSTRAP_CONFIG = {
+    (SoftwarePlanEdition.STANDARD, False, False, True): {
+        'role': 'standard_plan_v1',
+        'product_rate_monthly_fee': Decimal('250.00'),
+        'feature_rates': {
+            FeatureType.USER: dict(monthly_limit=125, per_excess_fee=Decimal('2.00')),
+            FeatureType.SMS: dict(monthly_limit=0),
+        },
+    },
+    (SoftwarePlanEdition.PRO, False, False, True): {
+        'role': 'pro_plan_v1',
+        'product_rate_monthly_fee': Decimal('500.00'),
+        'feature_rates': {
+            FeatureType.USER: dict(monthly_limit=250, per_excess_fee=Decimal('2.00')),
+            FeatureType.SMS: dict(monthly_limit=0),
+        },
+    },
+    (SoftwarePlanEdition.ADVANCED, False, False, True): {
+        'role': 'advanced_plan_v0',
+        'product_rate_monthly_fee': Decimal('1000.00'),
+        'feature_rates': {
+            FeatureType.USER: dict(monthly_limit=500, per_excess_fee=Decimal('2.00')),
+            FeatureType.SMS: dict(monthly_limit=0),
+        }
+    },
+}
diff --git a/corehq/apps/accounting/bootstrap/config/testing.py b/corehq/apps/accounting/bootstrap/config/testing.py
@@ -7,15 +7,15 @@
 )
 
 BOOTSTRAP_CONFIG_TESTING = {
-    (SoftwarePlanEdition.COMMUNITY, False, False): {
+    (SoftwarePlanEdition.COMMUNITY, False, False, False): {
         'role': 'community_plan_v1',
         'product_rate_monthly_fee': Decimal('0.00'),
         'feature_rates': {
             FeatureType.USER: dict(monthly_limit=2, per_excess_fee=Decimal('1.00')),
             FeatureType.SMS: dict(monthly_limit=0),
         }
     },
-    (SoftwarePlanEdition.STANDARD, False, False): {
+    (SoftwarePlanEdition.STANDARD, False, False, False): {
         'role': 'standard_plan_v0',
         'product_rate_monthly_fee': Decimal('300.00'),
         'feature_rates': {
@@ -24,36 +24,60 @@
             FeatureType.WEB_USER: dict(monthly_limit=10, per_excess_fee=Decimal('10.00')),
         }
     },
-    (SoftwarePlanEdition.PRO, False, False): {
+    (SoftwarePlanEdition.PRO, False, False, False): {
         'role': 'pro_plan_v1',
         'product_rate_monthly_fee': Decimal('600.00'),
         'feature_rates': {
             FeatureType.USER: dict(monthly_limit=6, per_excess_fee=Decimal('1.00')),
             FeatureType.SMS: dict(monthly_limit=5),
         }
     },
-    (SoftwarePlanEdition.ADVANCED, False, False): {
+    (SoftwarePlanEdition.ADVANCED, False, False, False): {
         'role': 'advanced_plan_v0',
         'product_rate_monthly_fee': Decimal('1200.00'),
         'feature_rates': {
             FeatureType.USER: dict(monthly_limit=8, per_excess_fee=Decimal('1.00')),
             FeatureType.SMS: dict(monthly_limit=7),
         }
     },
-    (SoftwarePlanEdition.ADVANCED, True, False): {
+    (SoftwarePlanEdition.ADVANCED, True, False, False): {
         'role': 'advanced_plan_v0',
         'product_rate_monthly_fee': Decimal('0.00'),
         'feature_rates': {
             FeatureType.USER: dict(monthly_limit=2, per_excess_fee=Decimal('1.00')),
             FeatureType.SMS: dict(monthly_limit=0),
         }
     },
-    (SoftwarePlanEdition.ENTERPRISE, False, False): {
+    (SoftwarePlanEdition.ENTERPRISE, False, False, False): {
         'role': 'enterprise_plan_v0',
         'product_rate_monthly_fee': Decimal('0.00'),
         'feature_rates': {
             FeatureType.USER: dict(monthly_limit=UNLIMITED_FEATURE_USAGE, per_excess_fee=Decimal('0.00')),
             FeatureType.SMS: dict(monthly_limit=UNLIMITED_FEATURE_USAGE),
         }
     },
+    (SoftwarePlanEdition.STANDARD, False, False, True): {
+        'role': 'standard_plan_v1',
+        'product_rate_monthly_fee': Decimal('250.00'),
+        'feature_rates': {
+            FeatureType.USER: dict(monthly_limit=125, per_excess_fee=Decimal('2.00')),
+            FeatureType.SMS: dict(monthly_limit=0),
+        },
+    },
+    (SoftwarePlanEdition.PRO, False, False, True): {
+        'role': 'pro_plan_v1',
+        'product_rate_monthly_fee': Decimal('500.00'),
+        'feature_rates': {
+            FeatureType.USER: dict(monthly_limit=250, per_excess_fee=Decimal('2.00')),
+            FeatureType.SMS: dict(monthly_limit=0),
+        },
+    },
+    (SoftwarePlanEdition.ADVANCED, False, False, True): {
+        'role': 'advanced_plan_v0',
+        'product_rate_monthly_fee': Decimal('1000.00'),
+        'feature_rates': {
+            FeatureType.USER: dict(monthly_limit=500, per_excess_fee=Decimal('2.00')),
+            FeatureType.SMS: dict(monthly_limit=0),
+        }
+    },
 }