Deploy history report

.gitignore

@@ -16,7 +16,6 @@ xforms/
 submissions/
 /formplayer_build
 /export/
-/bower_components
 bad/
 *.log*
 /CommCare.ja*
@@ -66,4 +65,5 @@ node_modules/
 /sharedfiles/
 docker/data
 *.lock
+!yarn.lock
 fab/config.py

DEV_SETUP.md

@@ -232,41 +232,33 @@ names to the aliases.
 
     $ ./manage.py ptop_es_manage --flip_all_aliases
 
-### Installing Bower
+### Installing Yarn
 
-We use Bower to manage our JavaScript dependencies. In order to download the required JavaScript packages,
-you'll need to install `bower` and run `bower install`. Follow these steps to install:
+We use Yarn to manage our JavaScript dependencies. It is able to install older `bower` dependencies/repositories that we still need 
+and `npm` repositories. Eventually we will move fully to `npm`, but for now you will need `yarn` to manage `js` repositories.
 
-1. If you do not already have npm:
+In order to download the required JavaScript packages, you'll need to install `yarn` and run `yarn install`. Follow these steps to install:
 
-    For Ubuntu: In Ubuntu this is now bundled with NodeJS. An up-to-date version is available on the NodeSource
-    repository. Run the following commands:
+1. Follow [these steps](https://classic.yarnpkg.com/en/docs/install#mac-stable) to install Yarn.
 
-        $ curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -
-        $ sudo apt-get install -y nodejs
+2. Install dependencies with:
 
-    For macOS: Install with Homebrew:
-
-        $ brew install node
-
-    For others: install [npm](https://www.npmjs.com/)
-
-2. Install Bower:
-
-        $ sudo npm -g install bower
-
-3. Run Bower with:
+```
+yarn install --frozen-lockfile
+```
 
-        $ bower install
+NOTE: if you are making changes to `package.json`, please run `yarn install` without the `--frozen-lockfile` flag so that `yarn.lock` will get updated.
 
 
-### Install JS-XPATH
+#### Troubleshooting Javascript dependency installation
 
-This is required for the server side xpath validation. See [package.json](package.json) for exact version.
+Depending on your operating system, and what version of `nodejs` and `npm` you have locally, 
+you might run into issues. Here are minimum version requirements for these packages. 
 
-```
-npm install dimagi/js-xpath#v0.0.2-rc1
-```
+    $ npm --version
+    $ 6.14.4
+    $ node --version
+    $ v12.18.1
 
 ### Using LESS: 2 Options
 
@@ -457,14 +449,13 @@ See https://github.com/nose-devs/nose/blob/master/nose/plugins/testid.py
 
 ### Setup
 
-In order to run the JavaScript tests you'll need to install the required npm packages:
-
-    $ npm install
+Make sure javascript packages are installed with the following. Please see the section on 
+installing `yarn` above for more details.
 
-It's recommended to install grunt globally in order to use grunt from the command line:
+It's recommended to install grunt globally (with `yarn`) in order to use grunt from the command line:
 
-    $ npm install -g grunt
-    $ npm install -g grunt-cli
+    $ yarn install global grunt
+    $ yarn install global grunt-cli
 
 In order for the tests to run the __development server needs to be running on port 8000__.
 

Dockerfile

@@ -44,10 +44,8 @@ RUN npm -g install \
     bower \
     grunt-cli \
     uglify-js \
- && npm -g install \
     puppeteer \
     mocha-headless-chrome \
- && echo '{ "allow_root": true }' > /root/.bowerrc \
  && cd /vendor \
  && npm shrinkwrap \
  && yarn global add phantomjs-prebuilt \

corehq/apps/accounting/invoicing.py

@@ -48,6 +48,7 @@
     log_accounting_info,
     months_from_date,
 )
+from corehq.apps.domain.dbaccessors import domain_exists, deleted_domain_exists
 from corehq.apps.smsbillables.models import SmsBillable
 from corehq.util.dates import (
     get_first_last_days,
@@ -427,6 +428,9 @@ def _email_invoice(self):
 
 
 def should_create_invoice(subscription, domain, invoice_start, invoice_end):
+    if not domain_exists(domain) and deleted_domain_exists(domain):
+        # domain has been deleted, ignore
+        return False
     if subscription.is_trial:
         log_accounting_info("Skipping invoicing for Subscription %s because it's a trial." % subscription.pk)
         return False
@@ -718,7 +722,11 @@ def quantity(self):
                     history = DomainUserHistory.objects.get(domain=domain, record_date=date)
                     total_users += history.num_users
                 except DomainUserHistory.DoesNotExist:
-                    raise
+                    if not deleted_domain_exists(domain):
+                        # this checks to see if the domain still exists
+                        # before raising an error. If it was deleted the
+                        # loop will continue
+                        raise
             excess_users += max(total_users - self.rate.monthly_limit, 0)
         return excess_users
 

corehq/apps/accounting/tests/test_customer_invoicing.py

@@ -132,7 +132,7 @@ class TestCustomerInvoice(BaseCustomerInvoiceCase):
 
     def test_multiple_subscription_invoice(self):
         invoice_date = utils.months_from_date(self.subscription.date_start,
-                                              random.randint(2, self.subscription_length))
+                                              random.randint(3, self.subscription_length))
         calculate_users_in_all_domains(invoice_date)
         tasks.generate_invoices(invoice_date)
 
@@ -185,6 +185,28 @@ def test_no_invoice_after_end(self):
         tasks.generate_invoices(invoice_date)
         self.assertEqual(CustomerInvoice.objects.count(), 0)
 
+    def test_deleted_domain_in_multiple_subscription_invoice(self):
+        invoice_date = utils.months_from_date(self.subscription.date_start, 2)
+
+        domain_to_be_deleted = generator.arbitrary_domain()
+        generator.generate_domain_subscription(
+            self.account,
+            domain_to_be_deleted,
+            date_start=self.sub2.date_start,
+            date_end=self.sub2.date_end,
+            plan_version=self.advanced_plan
+        )
+        domain_to_be_deleted.delete(leave_tombstone=True)
+
+        calculate_users_in_all_domains(invoice_date)
+        tasks.generate_invoices(invoice_date)
+
+        self.assertEqual(CustomerInvoice.objects.count(), 1)
+        invoice = CustomerInvoice.objects.first()
+
+        num_product_line_items = invoice.lineitem_set.get_products().count()
+        self.assertEqual(num_product_line_items, 2)
+
 
 class TestProductLineItem(BaseCustomerInvoiceCase):
     """

corehq/apps/analytics/README.md

@@ -11,7 +11,7 @@ This varies depending on the service; see details on individual services below.
 
 ### Client Side
 
-For passing data from the server to the client, which is mostly API keys, analytics uses a variation on [initial_page_data](https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/blob/master/integration-patterns.md): same general idea, but with better namespacing and accessed via [initial.js](https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/analytics/static/analytix/js/initial.js). Most of the analytics templates just contain this initial data, while a few contain the actual third-party scripts (for the services that don't interact with any other HQ JavaScript).
+For passing data from the server to the client, which is mostly API keys, analytics uses a variation on [initial_page_data](https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/integration-patterns.md): same general idea, but with better namespacing and accessed via [initial.js](https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/analytics/static/analytix/js/initial.js). Most of the analytics templates just contain this initial data, while a few contain the actual third-party scripts (for the services that don't interact with any other HQ JavaScript).
 
 Analytics has its own logging infrastructure, is set up in [logging.js](https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/analytics/static/analytix/js/logging.js) and prints to the browser console. The logging level can be controlled via `settings.ANALYTICS_CONFIG['LOG_LEVEL']` (see "Debugging" below).