Release Zulip Server 1.9.1.

With significant rearrangement by tabbott to have more common text
between different proxy implementations.

.browserslistrc

@@ -1,6 +0,0 @@
-> 0.2%
-> 0.2% in US
-last 2 versions
-Firefox ESR
-not dead
-Chrome 26  # similar to PhantomJS

.circleci/config.yml

@@ -1,91 +1,92 @@
-# See https://zulip.readthedocs.io/en/latest/testing/continuous-integration.html for
-#   high-level documentation on our CircleCI setup.
 # See CircleCI upstream's docs on this config format:
 #   https://circleci.com/docs/2.0/language-python/
 #
-version: 2.0
-aliases:
-  - &create_cache_directories
-    run:
-      name: create cache directories
-      command: |
-          dirs=(/srv/zulip-{npm,venv}-cache)
-          sudo mkdir -p "${dirs[@]}"
-          sudo chown -R circleci "${dirs[@]}"
-
-  - &restore_cache_package_json
-    restore_cache:
-      keys:
-      - v1-npm-base.{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }}
-
-  - &restore_cache_requirements
-    restore_cache:
-      keys:
-      - v1-venv-base.{{ .Environment.CIRCLE_JOB }}-{{ checksum "requirements/thumbor.txt" }}-{{ checksum "requirements/dev.txt" }}
-
-  - &install_dependencies
-    run:
-      name: install dependencies
-      command: |
-        sudo apt-get update
-        # Install moreutils so we can use `ts` and `mispipe` in the following.
-        sudo apt-get install -y moreutils
-
-        # CircleCI sets the following in Git config at clone time:
-        #   url.ssh://git@github.com.insteadOf https://github.com
-        # This breaks the Git clones in the NVM `install.sh` we run
-        # in `install-node`.
-        # TODO: figure out why that breaks, and whether we want it.
-        #   (Is it an optimization?)
-        rm -f /home/circleci/.gitconfig
-
-        # This is the main setup job for the test suite
-        mispipe "tools/ci/setup-backend" ts
-
-        # Cleaning caches is mostly unnecessary in Circle, because
-        # most builds don't get to write to the cache.
-        # mispipe "scripts/lib/clean-unused-caches --verbose --threshold 0" ts
-
-  - &save_cache_package_json
-    save_cache:
-      paths:
-        - /srv/zulip-npm-cache
-      key: v1-npm-base.{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }}
-
-  - &save_cache_requirements
-    save_cache:
-      paths:
-        - /srv/zulip-venv-cache
-      key: v1-venv-base.{{ .Environment.CIRCLE_JOB }}-{{ checksum "requirements/thumbor.txt" }}-{{ checksum "requirements/dev.txt" }}
-    # TODO: in Travis we also cache ~/zulip-emoji-cache, ~/node, ~/misc
-
-  - &run_backend_tests
-    run:
-      name: run backend tests
-      command: |
-        . /srv/zulip-py3-venv/bin/activate
-        mispipe ./tools/ci/backend ts
-
-  - &run_frontend_tests
-    run:
-      name: run frontend tests
-      command: |
-        . /srv/zulip-py3-venv/bin/activate
-        mispipe ./tools/ci/frontend ts
-
-  - &upload_coverage_report
-    run:
-     name: upload coverage report
-     command: |
-       . /srv/zulip-py3-venv/bin/activate
-       pip install codecov && codecov \
-         || echo "Error in uploading coverage reports to codecov.io."
-
+version: 2
 jobs:
-  "xenial-backend-frontend-python3.5":
+  "trusty-python-3.4":
+    docker:
+      # This is built from tools/circleci/images/trusty/Dockerfile .
+      - image: gregprice/circleci:trusty-python-5.test
+
+    working_directory: ~/zulip
+
+    steps:
+      - checkout
+
+      - run:
+          name: create cache directories
+          command: |
+              dirs=(/srv/zulip-{npm,venv}-cache)
+              sudo mkdir -p "${dirs[@]}"
+              sudo chown -R circleci "${dirs[@]}"
+
+      - restore_cache:
+          keys:
+          - v1-npm-base.trusty-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }}
+      - restore_cache:
+          keys:
+          - v1-venv-base.trusty-{{ checksum "requirements/thumbor.txt" }}-{{ checksum "requirements/dev.txt" }}
+
+      - run:
+          name: install dependencies
+          command: |
+            # Install moreutils so we can use `ts` and `mispipe` in the following.
+            sudo apt-get install -y moreutils
+
+            # CircleCI sets the following in Git config at clone time:
+            #   url.ssh://git@github.com.insteadOf https://github.com
+            # This breaks the Git clones in the NVM `install.sh` we run
+            # in `install-node`.
+            # TODO: figure out why that breaks, and whether we want it.
+            #   (Is it an optimization?)
+            rm -f /home/circleci/.gitconfig
+
+            # This is the main setup job for the test suite
+            mispipe "tools/travis/setup-backend" ts
+
+            # Cleaning caches is mostly unnecessary in Circle, because
+            # most builds don't get to write to the cache.
+            # mispipe "scripts/lib/clean-unused-caches --verbose --threshold 0" ts
+
+      - save_cache:
+          paths:
+            - /srv/zulip-npm-cache
+          key: v1-npm-base.trusty-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }}
+      - save_cache:
+          paths:
+            - /srv/zulip-venv-cache
+          key: v1-venv-base.trusty-{{ checksum "requirements/thumbor.txt" }}-{{ checksum "requirements/dev.txt" }}
+      # TODO: in Travis we also cache ~/zulip-emoji-cache, ~/node, ~/misc
+
+      # The moment of truth!  Run the tests.
+
+      - run:
+          name: run backend tests
+          command: |
+            . /srv/zulip-py3-venv/bin/activate
+            mispipe ./tools/travis/backend ts
+
+      - run:
+          name: run frontend tests
+          command: |
+            . /srv/zulip-py3-venv/bin/activate
+            mispipe ./tools/travis/frontend ts
+
+      -  run:
+          name: upload coverage report
+          command: |
+            . /srv/zulip-py3-venv/bin/activate
+            pip install codecov && codecov \
+              || echo "Error in uploading coverage reports to codecov.io."
+
+      # - store_artifacts:  # TODO
+      #     path: var/casper/
+      #     # also /tmp/zulip-test-event-log/
+      #     destination: test-reports
+
+  "xenial-python-3.5":
     docker:
       # This is built from tools/circleci/images/xenial/Dockerfile .
-      # Xenial ships with Python 3.5.
       - image: gregprice/circleci:xenial-python-4.test
 
     working_directory: ~/zulip
@@ -93,33 +94,53 @@ jobs:
     steps:
       - checkout
 
-      - *create_cache_directories
-      - *restore_cache_package_json
-      - *restore_cache_requirements
-      - *install_dependencies
-      - *save_cache_package_json
-      - *save_cache_requirements
-      - *run_backend_tests
-      - *run_frontend_tests
-      # We only need to upload coverage reports on whichever platform
-      # runs the frontend tests.
-      - *upload_coverage_report
+      - run:
+          name: create cache directories
+          command: |
+              dirs=(/srv/zulip-{npm,venv}-cache)
+              sudo mkdir -p "${dirs[@]}"
+              sudo chown -R circleci "${dirs[@]}"
 
-      - store_artifacts:
-          path: ./var/casper/
-          destination: casper
+      - restore_cache:
+          keys:
+          - v1-npm-base.xenial-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }}
+      - restore_cache:
+          keys:
+          - v1-venv-base.xenial-{{ checksum "requirements/thumbor.txt" }}-{{ checksum "requirements/dev.txt" }}
 
-      - store_artifacts:    
-          path: ../../../tmp/zulip-test-event-log/
-          destination: test-reports
+      - run:
+          name: install dependencies
+          command: |
+            sudo apt-get update
+            sudo apt-get install -y moreutils
+            rm -f /home/circleci/.gitconfig
+            mispipe "tools/travis/setup-backend" ts
 
-      - store_test_results:
-            path: ./var/xunit-test-results/casper/
+      - save_cache:
+          paths:
+            - /srv/zulip-npm-cache
+          key: v1-npm-base.xenial-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }}
+      - save_cache:
+          paths:
+            - /srv/zulip-venv-cache
+          key: v1-venv-base.xenial-{{ checksum "requirements/thumbor.txt" }}-{{ checksum "requirements/dev.txt" }}
 
-  "bionic-backend-python3.6":
+      - run:
+          name: run backend tests
+          command: |
+            . /srv/zulip-py3-venv/bin/activate
+            mispipe ./tools/travis/backend ts
+
+      -  run:
+          name: upload coverage report
+          command: |
+            . /srv/zulip-py3-venv/bin/activate
+            pip install codecov && codecov \
+              || echo "Error in uploading coverage reports to codecov.io."
+
+  "bionic-python-3.6":
     docker:
       # This is built from tools/circleci/images/bionic/Dockerfile .
-      # Bionic ships with Python 3.6.
       - image: gregprice/circleci:bionic-python-1.test
 
     working_directory: ~/zulip
@@ -127,25 +148,58 @@ jobs:
     steps:
       - checkout
 
-      - *create_cache_directories
-
       - run:
-          name: do Bionic hack
+          name: create cache directories
           command: |
+              dirs=(/srv/zulip-{npm,venv}-cache)
+              sudo mkdir -p "${dirs[@]}"
+              sudo chown -R circleci "${dirs[@]}"
               # Temporary hack till `sudo service redis-server start` gets fixes in Bionic. See
               # https://chat.zulip.org/#narrow/stream/3-backend/topic/Ubuntu.20bionic.20CircleCI
-              sudo sed -i '/^bind/s/bind.*/bind 0.0.0.0/' /etc/redis/redis.conf
+              redis-server --daemonize yes
+
+      - restore_cache:
+          keys:
+          - v1-npm-base.bionic-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }}
+      - restore_cache:
+          keys:
+          - v1-venv-base.bionic-{{ checksum "requirements/thumbor.txt" }}-{{ checksum "requirements/dev.txt" }}
+
+      - run:
+          name: install dependencies
+          command: |
+            sudo apt-get update
+            sudo apt-get install -y moreutils
+            rm -f /home/circleci/.gitconfig
+            mispipe "tools/travis/setup-backend" ts
+
+      - save_cache:
+          paths:
+            - /srv/zulip-npm-cache
+          key: v1-npm-base.bionic-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }}
+      - save_cache:
+          paths:
+            - /srv/zulip-venv-cache
+          key: v1-venv-base.bionic-{{ checksum "requirements/thumbor.txt" }}-{{ checksum "requirements/dev.txt" }}
+
+      - run:
+          name: run backend tests
+          command: |
+            . /srv/zulip-py3-venv/bin/activate
+            mispipe ./tools/travis/backend ts
+
+      -  run:
+          name: upload coverage report
+          command: |
+            . /srv/zulip-py3-venv/bin/activate
+            pip install codecov && codecov \
+              || echo "Error in uploading coverage reports to codecov.io."
 
-      - *restore_cache_package_json
-      - *restore_cache_requirements
-      - *install_dependencies
-      - *save_cache_package_json
-      - *save_cache_requirements
-      - *run_backend_tests
 
 workflows:
   version: 2
   build:
     jobs:
-      - "xenial-backend-frontend-python3.5"
-      - "bionic-backend-python3.6"
+      - "trusty-python-3.4"
+      - "xenial-python-3.5"
+      - "bionic-python-3.6"

.codecov.yml

@@ -5,8 +5,6 @@ coverage:
     project:
       default:
         target: auto
-        # Codecov has the tendency to report a lot of false negatives,
-        # so we basically suppress comments completely.
-        threshold: 50%
+        threshold: 0.50
         base: auto
     patch: off

.editorconfig

@@ -6,20 +6,20 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.{sh,py,pyi,js,ts,json,yml,xml,css,md,markdown,handlebars,html}]
+[*.{sh,py,pyi,js,json,yml,xml,css,md,markdown,handlebars,html}]
 indent_style = space
 indent_size = 4
 
-[*.py]
+[*.{py}]
 max_line_length = 110
 
-[*.{js,ts}]
-max_line_length = 100
+[*.{js}]
+max_line_length = 120
 
 [*.{svg,rb,pp,pl}]
 indent_style = space
 indent_size = 2
 
-[*.cfg]
+[*.{cfg}]
 indent_style = space
 indent_size = 8

.eslintignore

@@ -1,10 +1,2 @@
-# This is intended for generated files and vendored third-party files.
-# For our source code, instead of adding files here, consider using
-# specific eslint-disable comments in the files themselves.
-
-/docs/_build
-/static/generated
-/static/third
-/static/webpack-bundles
-/var
-/zulip-py3-venv
+static/js/blueslip.js
+static/webpack-bundles

.eslintrc.json

@@ -4,8 +4,6 @@
         "es6": true
     },
     "parserOptions": {
-        "ecmaVersion": 2019,
-        "warnOnUnsupportedTypeScriptVersion": false,
         "sourceType": "module"
     },
     "globals": {
@@ -18,6 +16,7 @@
         "LightboxCanvas": false,
         "MessageListData": false,
         "MessageListView": false,
+        "PerfectScrollbar": false,
         "Plotly": false,
         "SockJS": false,
         "Socket": false,
@@ -27,11 +26,11 @@
         "_": false,
         "activity": false,
         "admin": false,
+        "admin_sections": false,
         "alert_words": false,
         "alert_words_ui": false,
         "attachments_ui": false,
         "avatar": false,
-        "billing": false,
         "blueslip": false,
         "bot_data": false,
         "bridge": false,
@@ -39,7 +38,6 @@
         "buddy_list": false,
         "channel": false,
         "click_handlers": false,
-        "color_data": false,
         "colorspace": false,
         "common": false,
         "components": false,
@@ -62,15 +60,12 @@
         "emoji_picker": false,
         "favicon": false,
         "feature_flags": false,
-        "feedback_widget": false,
         "fenced_code": false,
         "flatpickr": false,
         "floating_recipient_bar": false,
         "gear_menu": false,
         "hash_util": false,
         "hashchange": false,
-        "helpers": false,
-        "history": false,
         "home_msg_list": false,
         "hotspots": false,
         "i18n": false,
@@ -88,7 +83,6 @@
         "localStorage": false,
         "local_message": false,
         "localstorage": false,
-        "location": false,
         "markdown": false,
         "marked": false,
         "md5": false,
@@ -123,8 +117,6 @@
         "pygments_data": false,
         "reactions": false,
         "realm_icon": false,
-        "realm_logo": false,
-        "realm_night_logo": false,
         "recent_senders": false,
         "reload": false,
         "reload_state": false,
@@ -149,8 +141,7 @@
         "settings_bots": false,
         "settings_display": false,
         "settings_emoji": false,
-        "settings_exports": false,
-        "settings_linkifiers": false,
+        "settings_filters": false,
         "settings_invites": false,
         "settings_muting": false,
         "settings_notifications": false,
@@ -173,14 +164,13 @@
         "stream_muting": false,
         "stream_popover": false,
         "stream_sort": false,
-        "stream_ui_updates": false,
-        "StripeCheckout": false,
         "submessage": false,
         "subs": false,
         "tab_bar": false,
         "templates": false,
         "tictactoe_widget": false,
         "timerender": false,
+        "toMarkdown": false,
         "todo_widget": false,
         "top_left_corner": false,
         "topic_data": false,
@@ -193,24 +183,21 @@
         "typing": false,
         "typing_data": false,
         "typing_events": false,
+        "typing_status": false,
         "ui": false,
-        "ui_init": false,
         "ui_report": false,
         "ui_util": false,
         "unread": false,
         "unread_ops": false,
         "unread_ui": false,
-        "upgrade": false,
         "upload": false,
         "upload_widget": false,
         "user_events": false,
         "user_groups": false,
         "user_pill": false,
         "user_search": false,
-        "user_status": false,
-        "user_status_ui": false,
         "util": false,
-        "poll_widget": false,
+        "voting_widget": false,
         "widgetize": false,
         "zcommand": false,
         "zform": false,
@@ -223,9 +210,9 @@
         "array-callback-return": "error",
         "array-bracket-spacing": "error",
         "arrow-spacing": [ "error", { "before": true, "after": true } ],
-        "block-scoped-var": "error",
+        "block-scoped-var": 2,
         "brace-style": [ "error", "1tbs", { "allowSingleLine": true } ],
-        "camelcase": "off",
+        "camelcase": 0,
         "comma-dangle": [ "error",
             {
                 "arrays": "always-multiline",
@@ -235,34 +222,23 @@
                 "functions": "never"
             }
         ],
-        "comma-spacing": [ "error",
-            {
-                "before": false,
-                "after": true
-            }
-        ],
-        "complexity": [ "off", 4 ],
-        "curly": "error",
+        "complexity": [ 0, 4 ],
+        "curly": 2,
         "dot-notation": [ "error", { "allowKeywords": true } ],
         "empty-returns/main": "error",
         "eol-last": [ "error", "always" ],
-        "eqeqeq": "error",
+        "eqeqeq": 2,
         "func-style": [ "off", "expression" ],
-        "guard-for-in": "error",
+        "guard-for-in": 2,
         "indent": ["error", 4, {
             "ArrayExpression": "first",
+            "outerIIFEBody": 0,
             "ObjectExpression": "first",
             "SwitchCase": 0,
             "CallExpression": {"arguments": "first"},
             "FunctionExpression": {"parameters": "first"},
             "FunctionDeclaration": {"parameters": "first"}
         }],
-        "key-spacing": [ "error",
-            {
-                "beforeColon": false,
-                "afterColon": true
-            }
-        ],
         "keyword-spacing": [ "error",
             {
                 "before": true,
@@ -274,7 +250,7 @@
                 }
             }
         ],
-        "max-depth": [ "off", 4 ],
+        "max-depth": [ 0, 4 ],
         "max-len": [ "error", 100, 2,
             {
                 "ignoreUrls": true,
@@ -284,76 +260,76 @@
                 "ignoreTemplateLiterals": true
             }
         ],
-        "max-params": [ "off", 3 ],
-        "max-statements": [ "off", 10 ],
+        "max-params": [ 0, 3 ],
+        "max-statements": [ 0, 10 ],
         "new-cap": [ "error",
             {
                 "newIsCap": true,
                 "capIsNew": false
             }
         ],
-        "new-parens": "error",
-        "newline-per-chained-call": "off",
-        "no-alert": "error",
+        "new-parens": 2,
+        "newline-per-chained-call": 0,
+        "no-alert": 2,
         "no-array-constructor": "error",
-        "no-bitwise": "error",
-        "no-caller": "error",
+        "no-bitwise": 2,
+        "no-caller": 2,
         "no-case-declarations": "error",
-        "no-catch-shadow": "error",
-        "no-console": "off",
+        "no-catch-shadow": 2,
+        "no-console": 0,
         "no-const-assign": "error",
-        "no-control-regex": "error",
-        "no-debugger": "error",
-        "no-delete-var": "error",
-        "no-div-regex": "error",
+        "no-control-regex": 2,
+        "no-debugger": 2,
+        "no-delete-var": 2,
+        "no-div-regex": 2,
         "no-dupe-class-members": "error",
-        "no-dupe-keys": "error",
+        "no-dupe-keys": 2,
         "no-duplicate-imports": "error",
-        "no-else-return": "error",
-        "no-empty": "error",
-        "no-empty-character-class": "error",
-        "no-eq-null": "error",
-        "no-eval": "error",
-        "no-ex-assign": "error",
+        "no-else-return": 2,
+        "no-empty": 2,
+        "no-empty-character-class": 2,
+        "no-eq-null": 2,
+        "no-eval": 2,
+        "no-ex-assign": 2,
         "no-extra-parens": ["error", "all"],
-        "no-extra-semi": "error",
-        "no-fallthrough": "error",
-        "no-floating-decimal": "error",
-        "no-func-assign": "error",
-        "no-implied-eval": "error",
+        "no-extra-semi": 2,
+        "no-fallthrough": 2,
+        "no-floating-decimal": 2,
+        "no-func-assign": 2,
+        "no-implied-eval": 2,
         "no-iterator": "error",
-        "no-label-var": "error",
-        "no-labels": "error",
-        "no-loop-func": "error",
-        "no-mixed-requires": [ "off", false ],
-        "no-multi-str": "error",
-        "no-native-reassign": "error",
-        "no-nested-ternary": "off",
+        "no-label-var": 2,
+        "no-labels": 2,
+        "no-loop-func": 2,
+        "no-mixed-requires": [ 0, false ],
+        "no-multi-str": 2,
+        "no-native-reassign": 2,
+        "no-nested-ternary": 0,
         "no-new-func": "error",
-        "no-new-object": "error",
-        "no-new-wrappers": "error",
-        "no-obj-calls": "error",
-        "no-octal": "error",
-        "no-octal-escape": "error",
-        "no-param-reassign": "off",
-        "no-plusplus": "error",
-        "no-proto": "error",
-        "no-redeclare": "error",
-        "no-regex-spaces": "error",
-        "no-restricted-syntax": "off",
-        "no-return-assign": "error",
-        "no-script-url": "error",
-        "no-self-compare": "error",
-        "no-shadow": "off",
-        "no-sync": "error",
-        "no-ternary": "off",
-        "no-trailing-spaces": "error",
+        "no-new-object": 2,
+        "no-new-wrappers": 2,
+        "no-obj-calls": 2,
+        "no-octal": 2,
+        "no-octal-escape": 2,
+        "no-param-reassign": 0,
+        "no-plusplus": 2,
+        "no-proto": 2,
+        "no-redeclare": 2,
+        "no-regex-spaces": 2,
+        "no-restricted-syntax": 0,
+        "no-return-assign": 2,
+        "no-script-url": 2,
+        "no-self-compare": 2,
+        "no-shadow": 0,
+        "no-sync": 2,
+        "no-ternary": 0,
+        "no-trailing-spaces": 2,
         "no-undef": "error",
-        "no-undef-init": "error",
-        "no-underscore-dangle": "off",
+        "no-undef-init": 2,
+        "no-underscore-dangle": 0,
         "no-unneeded-ternary": [ "error", { "defaultAssignment": false } ],
-        "no-unreachable": "error",
-        "no-unused-expressions": "error",
+        "no-unreachable": 2,
+        "no-unused-expressions": 2,
         "no-unused-vars": [ "error",
             {
                 "vars": "local",
@@ -361,19 +337,18 @@
                 "varsIgnorePattern": "print_elapsed_time|check_duplicate_ids"
             }
         ],
-        "no-use-before-define": "error",
+        "no-use-before-define": 2,
         "no-useless-constructor": "error",
         // The Zulip codebase complies partially with the "no-useless-escape"
         // rule; only regex expressions haven't been updated yet.
         // Updated regex expressions are currently being tested in casper
         // files and will decide about a potential future enforcement of this rule.
-        "no-useless-escape": "off",
-        "no-var": "error",
-        "space-unary-ops": "error",
-        "no-whitespace-before-property": "error",
-        "no-with": "error",
+        "no-useless-escape": 0,
+        "space-unary-ops": 2,
+        "no-whitespace-before-property": 2,
+        "no-with": 2,
         "one-var": [ "error", "never" ],
-        "padded-blocks": "off",
+        "padded-blocks": 0,
         "prefer-const": [ "error",
             {
                 "destructuring": "any",
@@ -387,12 +362,10 @@
                 "numbers": false
             }
         ],
-        "quotes": [ "off", "single" ],
-        "radix": "error",
-        "semi": "error",
-        "semi-spacing": ["error", {"before": false, "after": true}],
-        "sort-imports": "error",
-        "space-before-blocks": "error",
+        "quotes": [ 0, "single" ],
+        "radix": 2,
+        "semi": 2,
+        "space-before-blocks": 2,
         "space-before-function-paren": [ "error",
             {
                 "anonymous": "always",
@@ -400,97 +373,16 @@
                 "asyncArrow": "always"
             }
         ],
-        "space-in-parens": "error",
-        "space-infix-ops": "error",
-        "spaced-comment": "off",
-        "strict": "off",
+        "space-in-parens": 2,
+        "space-infix-ops": 2,
+        "spaced-comment": 0,
+        "strict": 0,
         "template-curly-spacing": "error",
-        "unnecessary-strict": "off",
-        "use-isnan": "error",
+        "unnecessary-strict": 0,
+        "use-isnan": 2,
         "valid-typeof": [ "error", { "requireStringLiterals": true } ],
         "wrap-iife": [ "error", "outside", { "functionPrototypeMethods": false } ],
-        "wrap-regex": "off",
-        "yoda": "error"
-    },
-    "overrides": [
-        {
-            "files": [
-                "frontend_tests/casper_tests/*.js",
-                "frontend_tests/casper_lib/*.js"
-            ],
-            "rules": {
-                "no-var": "off" // PhantomJS doesn’t support let, const
-            }
-        },
-        {
-            "files": ["**/*.ts"],
-            "parser": "@typescript-eslint/parser",
-            "parserOptions": {
-                "project": "tsconfig.json"
-            },
-            "plugins": ["@typescript-eslint"],
-            "rules": {
-                // Disable base rule to avoid conflict
-                "empty-returns/main": "off",
-                "indent": "off",
-                "func-call-spacing": "off",
-                "no-magic-numbers": "off",
-                "semi": "off",
-                "no-unused-vars": "off",
-                "no-useless-constructor": "off",
-
-                "@typescript-eslint/adjacent-overload-signatures": "error",
-                "@typescript-eslint/array-type": "error",
-                "@typescript-eslint/await-thenable": "error",
-                "@typescript-eslint/ban-types": "error",
-                "@typescript-eslint/ban-ts-ignore": "off",
-                "@typescript-eslint/camelcase": "off",
-                "@typescript-eslint/class-name-casing": "error",
-                "@typescript-eslint/consistent-type-assertions": "error",
-                "@typescript-eslint/explicit-function-return-type": ["error", { "allowExpressions": true }],
-                "@typescript-eslint/explicit-member-accessibility": "off",
-                "@typescript-eslint/func-call-spacing": "error",
-                "@typescript-eslint/generic-type-naming": "off",
-                "@typescript-eslint/indent": "error",
-                "@typescript-eslint/interface-name-prefix": "off",
-                "@typescript-eslint/member-delimiter-style": "error",
-                "@typescript-eslint/member-naming": ["error", { "private": "^_" } ],
-                "@typescript-eslint/member-ordering": "error",
-                "@typescript-eslint/no-array-constructor": "error",
-                "@typescript-eslint/no-empty-interface": "error",
-                "@typescript-eslint/no-explicit-any": "off",
-                "@typescript-eslint/no-extraneous-class": "error",
-                "@typescript-eslint/no-for-in-array": "off",
-                "@typescript-eslint/no-inferrable-types": "error",
-                "@typescript-eslint/no-magic-numbers": "off",
-                "@typescript-eslint/no-misused-new": "error",
-                "@typescript-eslint/no-namespace": "error",
-                "@typescript-eslint/no-non-null-assertion": "off",
-                "@typescript-eslint/no-parameter-properties": "error",
-                "@typescript-eslint/no-require-imports": "off",
-                "@typescript-eslint/no-this-alias": "off",
-                "@typescript-eslint/no-type-alias": "off",
-                "@typescript-eslint/no-unnecessary-qualifier": "error",
-                "@typescript-eslint/no-unnecessary-type-assertion": "error",
-                "@typescript-eslint/no-unused-vars": ["error", { "varsIgnorePattern": "^_" } ],
-                "@typescript-eslint/no-use-before-define": "error",
-                "@typescript-eslint/no-useless-constructor": "error",
-                "@typescript-eslint/no-var-requires": "off",
-                "@typescript-eslint/prefer-for-of": "off",
-                "@typescript-eslint/prefer-function-type": "off",
-                "@typescript-eslint/prefer-includes": "error",
-                "@typescript-eslint/prefer-interface": "off",
-                "@typescript-eslint/prefer-namespace-keyword": "error",
-                "@typescript-eslint/prefer-regexp-exec": "error",
-                "@typescript-eslint/prefer-string-starts-ends-with": "error",
-                "@typescript-eslint/promise-function-async": "error",
-                "@typescript-eslint/restrict-plus-operands": "off",
-                "@typescript-eslint/semi": "error",
-                "@typescript-eslint/triple-slash-reference": "error",
-                "@typescript-eslint/type-annotation-spacing": "error",
-                "@typescript-eslint/unbound-method": "off",
-                "@typescript-eslint/unified-signatures": "error"
-            }
-        }
-    ]
+        "wrap-regex": 0,
+        "yoda": 2
+    }
 }

.gitattributes

@@ -11,3 +11,4 @@
 *.otf binary
 *.tif binary
 *.ogg binary
+yarn.lock binary

.gitignore

@@ -34,12 +34,6 @@ package-lock.json
 # Dockerfiles generated for CircleCI
 /tools/circleci/images
 
-# Generated i18n data
-/locale/en
-/locale/language_options.json
-/locale/language_name_map.json
-/locale/*/mobile.json
-
 # Static build
 *.mo
 npm-debug.log
@@ -48,7 +42,6 @@ npm-debug.log
 /staticfiles.json
 /webpack-stats-production.json
 /yarn-error.log
-zulip-git-version
 
 # Test / analysis tools
 .coverage

.stylelintrc

@@ -62,6 +62,5 @@
         
         # Limit language features
         "color-no-hex": true,
-        "color-named": "never",
     }
 }

.travis.yml

@@ -1,6 +1,7 @@
-# See https://zulip.readthedocs.io/en/latest/testing/continuous-integration.html for
+# See https://zulip.readthedocs.io/en/latest/testing/travis.html for
 # high-level documentation on our Travis CI setup.
-dist: xenial
+dist: trusty
+group: deprecated-2017Q4
 install:
   # Disable sometimes-broken sources.list in Travis base images
   - sudo rm -vf /etc/apt/sources.list.d/*
@@ -14,7 +15,7 @@ install:
   - mispipe "pip install codecov" ts || mispipe "pip install codecov" ts
 
   # This is the main setup job for the test suite
-  - mispipe "tools/ci/setup-$TEST_SUITE" ts
+  - mispipe "tools/travis/setup-$TEST_SUITE" ts
 
   # Clean any caches that are not in use to avoid our cache
   # becoming huge.
@@ -25,7 +26,7 @@ script:
   # broken running their system puppet with Ruby.  See
   # https://travis-ci.org/zulip/zulip/jobs/240120991 for an example traceback.
   - unset GEM_PATH
-  - mispipe "./tools/ci/$TEST_SUITE" ts
+  - mispipe "./tools/travis/$TEST_SUITE" ts
 cache:
   yarn: true
   apt: false
@@ -37,17 +38,17 @@ cache:
     - $HOME/misc
 env:
   global:
-    - BOTO_CONFIG=/nonexistent
+    - BOTO_CONFIG=/tmp/nowhere
 language: python
-# Our test suites generally run on Python 3.5, the version in
-# Ubuntu 16.04 xenial, which is the oldest OS release we support.
+# Our test suites generally run on Python 3.4, the version in
+# Ubuntu 14.04 trusty, which is the oldest OS release we support.
 matrix:
   include:
     # Travis will actually run the jobs in the order they're listed here;
     # that doesn't seem to be documented, but it's what we see empirically.
     # We only get 4 jobs running at a time, so we try to make the first few
     # the most likely to break.
-    - python: "3.5"
+    - python: "3.4"
       env: TEST_SUITE=production
     # Other suites moved to CircleCI -- see .circleci/.
 sudo: required
@@ -58,7 +59,7 @@ addons:
       # debugging test flakes.
       - $(ls var/casper/* | tr "\n" ":")
       - $(ls /tmp/zulip-test-event-log/* | tr "\n" ":")
-  postgresql: "9.5"
+  postgresql: "9.3"
   apt:
     packages:
       - moreutils

.tx/config

@@ -3,31 +3,31 @@ host = https://www.transifex.com
 lang_map = zh-Hans: zh_Hans, zh-Hant: zh_Hant
 
 [zulip.djangopo]
-file_filter = locale/<lang>/LC_MESSAGES/django.po
-source_file = locale/en/LC_MESSAGES/django.po
+source_file = static/locale/en/LC_MESSAGES/django.po
 source_lang = en
 type = PO
+file_filter = static/locale/<lang>/LC_MESSAGES/django.po
 
 [zulip.translationsjson]
-file_filter = locale/<lang>/translations.json
-source_file = locale/en/translations.json
+source_file = static/locale/en/translations.json
 source_lang = en
 type = KEYVALUEJSON
+file_filter = static/locale/<lang>/translations.json
 
 [zulip.mobile]
-file_filter = locale/<lang>/mobile.json
-source_file = locale/en/mobile.json
+source_file = static/locale/en/mobile.json
 source_lang = en
 type = KEYVALUEJSON
+file_filter = static/locale/<lang>/mobile.json
 
 [zulip-test.djangopo]
-file_filter = locale/<lang>/LC_MESSAGES/django.po
-source_file = locale/en/LC_MESSAGES/django.po
+source_file = static/locale/en/LC_MESSAGES/django.po
 source_lang = en
 type = PO
+file_filter = static/locale/<lang>/LC_MESSAGES/django.po
 
 [zulip-test.translationsjson]
-file_filter = locale/<lang>/translations.json
-source_file = locale/en/translations.json
+source_file = static/locale/en/translations.json
 source_lang = en
 type = KEYVALUEJSON
+file_filter = static/locale/<lang>/translations.json

.yarnrc

@@ -1 +0,0 @@
-ignore-scripts true

CODE_OF_CONDUCT.md

@@ -78,7 +78,7 @@ something you can do while a violation is happening, do it. A lot of the
 harms of harassment and other violations can be mitigated by the victim
 knowing that the other people present are on their side.
 
-All reports will be kept confidential. In some cases, we may determine that a
+All reports will be kept confidential. In some cases we may determine that a
 public statement will need to be made. In such cases, the identities of all
 victims and reporters will remain confidential unless those individuals
 instruct us otherwise.

CONTRIBUTING.md

@@ -13,8 +13,7 @@ user, or anything else. Make sure to read the
 before posting. The Zulip community is also governed by a
 [code of conduct](https://zulip.readthedocs.io/en/latest/code-of-conduct.html).
 
-You can subscribe to zulip-devel-announce@googlegroups.com or our
-[Twitter](https://twitter.com/zulip) account for a lower traffic (~1
+You can subscribe to zulip-devel@googlegroups.com for a lower traffic (~1
 email/month) way to hear about things like mentorship opportunities with Google
 Code-in, in-person sprints at conferences, and other opportunities to
 contribute.
@@ -29,7 +28,7 @@ needs doing:
   [backend](https://github.com/zulip/zulip), web
   [frontend](https://github.com/zulip/zulip), React Native
   [mobile app](https://github.com/zulip/zulip-mobile), or Electron
-  [desktop app](https://github.com/zulip/zulip-desktop).
+  [desktop app](https://github.com/zulip/zulip-electron).
 * Building out our
   [Python API and bots](https://github.com/zulip/python-zulip-api) framework.
 * [Writing an integration](https://zulipchat.com/api/integrations-overview).
@@ -70,11 +69,10 @@ to help.
   if you run into any troubles.
 * Read the
   [Zulip guide to Git](https://zulip.readthedocs.io/en/latest/git/index.html)
-  and do the Git tutorial (coming soon) if you are unfamiliar with
-  Git, getting help in
-  [#git help](https://chat.zulip.org/#narrow/stream/44-git-help) if
-  you run into any troubles.  Be sure to check out the
-  [extremely useful Zulip-specific tools page](https://zulip.readthedocs.io/en/latest/git/zulip-tools.html).
+  and do the Git tutorial (coming soon) if you are unfamiliar with Git,
+  getting help in
+  [#git help](https://chat.zulip.org/#narrow/stream/44-git-help) if you run
+  into any troubles.
 * Sign the
   [Dropbox Contributor License Agreement](https://opensource.dropbox.com/cla/).
 
@@ -86,19 +84,17 @@ on.
 
 * If you're interested in
   [mobile](https://github.com/zulip/zulip-mobile/issues?q=is%3Aopen+is%3Aissue),
-  [desktop](https://github.com/zulip/zulip-desktop/issues?q=is%3Aopen+is%3Aissue),
+  [desktop](https://github.com/zulip/zulip-electron/issues?q=is%3Aopen+is%3Aissue),
   or
   [bots](https://github.com/zulip/python-zulip-api/issues?q=is%3Aopen+is%3Aissue)
   development, check the respective links for open issues, or post in
   [#mobile](https://chat.zulip.org/#narrow/stream/48-mobile),
   [#desktop](https://chat.zulip.org/#narrow/stream/16-desktop), or
   [#integration](https://chat.zulip.org/#narrow/stream/127-integrations).
-* For the main server and web repository, we recommend browsing
-  recently opened issues to look for issues you are confident you can
-  fix correctly in a way that clearly communicates why your changes
-  are the correct fix.  Our GitHub workflow bot, zulipbot, limits
-  users who have 0 commits merged to claiming a single issue labeled
-  with "good first issue" or "help wanted".
+* For the main server and web repository, start by looking through issues
+  with the label
+  [good first issue](https://github.com/zulip/zulip/issues?q=is%3Aopen+is%3Aissue+label%3A"good+first+issue").
+  These are smaller projects particularly suitable for a first contribution.
 * We also partition all of our issues in the main repo into areas like
   admin, compose, emoji, hotkeys, i18n, onboarding, search, etc. Look
   through our [list of labels](https://github.com/zulip/zulip/labels), and
@@ -108,8 +104,8 @@ on.
   [#new members](https://chat.zulip.org/#narrow/stream/95-new-members) with a
   bit about your background and interests, and we'll help you out. The most
   important thing to say is whether you're looking for a backend (Python),
-  frontend (JavaScript and TypeScript), mobile (React Native), desktop (Electron),
-  documentation (English) or visual design (JavaScript/TypeScript + CSS) issue, and a
+  frontend (JavaScript), mobile (React Native), desktop (Electron),
+  documentation (English) or visual design (JavaScript + CSS) issue, and a
   bit about your programming experience and available time.
 
 We also welcome suggestions of features that you feel would be valuable or
@@ -122,17 +118,11 @@ Other notes:
 * For a first pull request, it's better to aim for a smaller contribution
   than a bigger one. Many first contributions have fewer than 10 lines of
   changes (not counting changes to tests).
-* The full list of issues explicitly looking for a contributor can be
-  found with the
+* The full list of issues looking for a contributor can be found with the
   [good first issue](https://github.com/zulip/zulip/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)
   and
   [help wanted](https://github.com/zulip/zulip/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)
-  labels.  Avoid issues with the "difficult" label unless you
-  understand why it is difficult and are confident you can resolve the
-  issue correctly and completely.  Issues without one of these labels
-  are fair game if Tim has written a clear technical design proposal
-  in the issue, or it is a bug that you can reproduce and you are
-  confident you can fix the issue correctly.
+  labels.
 * For most new contributors, there's a lot to learn while making your first
   pull request. It's OK if it takes you a while; that's normal! You'll be
   able to work a lot faster as you build experience.
@@ -278,10 +268,10 @@ quickly become core team members. We hope you apply!
 
 ### Google Summer of Code
 
-GSoC is by far the largest of our internship programs (14 students in
-2017; 11 in 2018; 17 in 2019).  While we don't control how many slots
+GSoC is by far the largest of our internship programs (we had 14 GSoC
+students in summer 2017).  While we don't control how many slots
 Google allocates to Zulip, we hope to mentor a similar number of
-students in future summers.
+students in 2018.
 
 If you're reading this well before the application deadline and want
 to make your application strong, we recommend getting involved in the
@@ -319,7 +309,7 @@ list typically takes about 15 minutes.
 * Star us on GitHub. There are four main repositories:
   [server/web](https://github.com/zulip/zulip),
   [mobile](https://github.com/zulip/zulip-mobile),
-  [desktop](https://github.com/zulip/zulip-desktop), and
+  [desktop](https://github.com/zulip/zulip-electron), and
   [Python API](https://github.com/zulip/python-zulip-api).
 * [Follow us](https://twitter.com/zulip) on Twitter.
 

Dockerfile-dev

@@ -0,0 +1,17 @@
+FROM ubuntu:trusty
+
+EXPOSE 9991
+
+RUN apt-get update && apt-get install -y wget
+
+RUN localedef -i en_US -f UTF-8 en_US.UTF-8
+
+RUN useradd -d /home/zulip -m zulip && echo 'zulip ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+USER zulip
+
+RUN ln -nsf /srv/zulip ~/zulip
+
+RUN echo 'export LC_ALL="en_US.UTF-8" LANG="en_US.UTF-8" LANGUAGE="en_US.UTF-8"' >> ~zulip/.bashrc
+
+WORKDIR /srv/zulip

Dockerfile-postgresql

@@ -1,16 +1,33 @@
 # To build run `docker build -f Dockerfile-postgresql .` from the root of the
 # zulip repo.
 
-# Currently the postgres images do not support automatic upgrading of
+# Install build tools and build tsearch_extras for the current postgres
+# version. Currently the postgres images do not support automatic upgrading of
 # the on-disk data in volumes. So the base image can not currently be upgraded
 # without users needing a manual pgdump and restore.
+FROM postgres:10
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+        postgresql-server-dev-$PG_MAJOR \
+        postgresql-server-dev-all \
+        git \
+        build-essential \
+        fakeroot \
+        devscripts
+RUN git clone https://github.com/zulip/tsearch_extras.git \
+    && cd tsearch_extras \
+    && echo $PG_MAJOR > debian/pgversions \
+    && pg_buildext updatecontrol \
+    && debuild -b -uc -us
 
-# Install hunspell, zulip stop words, and run zulip database
+# Install tsearch_extras, hunspell, zulip stop words, and run zulip database
 # init.
 FROM postgres:10
+ENV TSEARCH_EXTRAS_VERSION=0.4
+ENV TSEARCH_EXTRAS_DEB=postgresql-${PG_MAJOR}-tsearch-extras_${TSEARCH_EXTRAS_VERSION}_amd64.deb
+COPY --from=0 /${TSEARCH_EXTRAS_DEB} /tmp
 COPY puppet/zulip/files/postgresql/zulip_english.stop /usr/share/postgresql/$PG_MAJOR/tsearch_data/zulip_english.stop
-COPY scripts/setup/create-db.sql /docker-entrypoint-initdb.d/zulip-create-db.sql
-COPY scripts/setup/create-pgroonga.sql /docker-entrypoint-initdb.d/zulip-create-pgroonga.sql
+COPY scripts/setup/postgres-create-db /docker-entrypoint-initdb.d/postgres-create-db.sh
 COPY scripts/setup/pgroonga-debian.asc /tmp
 RUN apt-key add /tmp/pgroonga-debian.asc \
     && echo "deb http://packages.groonga.org/debian/ stretch main" > /etc/apt/sources.list.d/zulip.list \
@@ -18,6 +35,8 @@ RUN apt-key add /tmp/pgroonga-debian.asc \
     && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
        hunspell-en-us \
        postgresql-${PG_MAJOR}-pgroonga \
+    && DEBIAN_FRONTEND=noninteractive dpkg -i /tmp/${TSEARCH_EXTRAS_DEB} \
+    && rm /tmp/${TSEARCH_EXTRAS_DEB} \
     && ln -sf /var/cache/postgresql/dicts/en_us.dict "/usr/share/postgresql/$PG_MAJOR/tsearch_data/en_us.dict" \
     && ln -sf /var/cache/postgresql/dicts/en_us.affix "/usr/share/postgresql/$PG_MAJOR/tsearch_data/en_us.affix" \
     && rm -rf /var/lib/apt/lists/*

README.md

@@ -5,13 +5,13 @@ immediacy of real-time chat with the productivity benefits of threaded
 conversations. Zulip is used by open source projects, Fortune 500 companies,
 large standards bodies, and others who need a real-time chat system that
 allows users to easily process hundreds or thousands of messages a day. With
-over 500 contributors merging over 500 commits a month, Zulip is also the
+over 300 contributors merging over 500 commits a month, Zulip is also the
 largest and fastest growing open source group chat project.
 
-[![CircleCI branch](https://img.shields.io/circleci/project/github/zulip/zulip/master.svg)](https://circleci.com/gh/zulip/zulip/tree/master)
-[![Coverage Status](https://img.shields.io/codecov/c/github/zulip/zulip/master.svg)](https://codecov.io/gh/zulip/zulip/branch/master)
+[![CircleCI Build Status](https://circleci.com/gh/zulip/zulip.svg?style=svg)](https://circleci.com/gh/zulip/zulip)
+[![Travis Build Status](https://travis-ci.org/zulip/zulip.svg?branch=master)](https://travis-ci.org/zulip/zulip)
+[![Coverage Status](https://img.shields.io/codecov/c/github/zulip/zulip.svg)](https://codecov.io/gh/zulip/zulip)
 [![Mypy coverage](https://img.shields.io/badge/mypy-100%25-green.svg)][mypy-coverage]
-[![GitHub release](https://img.shields.io/github/release/zulip/zulip.svg)](https://github.com/zulip/zulip/releases/latest)
 [![docs](https://readthedocs.org/projects/zulip/badge/?version=latest)](https://zulip.readthedocs.io/en/latest/)
 [![Zulip chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://chat.zulip.org)
 [![Twitter](https://img.shields.io/badge/twitter-@zulip-blue.svg?style=flat)](https://twitter.com/zulip)
@@ -55,11 +55,12 @@ You might be interested in:
   [companies](https://zulipchat.com/for/companies/), or Zulip for
   [working groups and part time communities](https://zulipchat.com/for/working-groups-and-communities/).
 
-* **Running a Zulip server**. Use a preconfigured [Digital Ocean droplet](https://marketplace.digitalocean.com/apps/zulip),
-  [install Zulip](https://zulip.readthedocs.io/en/stable/production/install.html)
-  directly, or use Zulip's
-  experimental [Docker image](https://zulip.readthedocs.io/en/latest/production/deployment.html#zulip-in-docker).
-  Commercial support is available; see <https://zulipchat.com/plans> for details.
+* **Running a Zulip server**. Setting up a server takes just a couple
+  of minutes. Zulip runs on Ubuntu 18.04 Bionic, Ubuntu 16.04 Xenial,
+  Ubuntu 14.04 Trusty, and Debian 9 Stretch. The installation process is
+  [documented here](https://zulip.readthedocs.io/en/stable/prod.html).
+  Commercial support is available; see <https://zulipchat.com/plans>
+  for details.
 
 * **Using Zulip without setting up a server**. <https://zulipchat.com> offers
   free and commercial hosting.

Vagrantfile

@@ -19,6 +19,43 @@ if Vagrant::VERSION == "1.8.7" then
     end
 end
 
+# Workaround: the lxc-config in vagrant-lxc is incompatible with changes in
+# LXC 2.1.0, found in Ubuntu 17.10 artful.  LXC 2.1.1 (in 18.04 LTS bionic)
+# ignores the old config key, so this will only be needed for artful.
+#
+# vagrant-lxc upstream has an attempted fix:
+#   https://github.com/fgrehm/vagrant-lxc/issues/445
+# but it didn't work in our testing.  This is a temporary issue, so we just
+# hack in a fix: we patch the skeleton `lxc-config` file right in the
+# distribution of the vagrant-lxc "box" we use.  If the user doesn't yet
+# have the box (e.g. on first setup), Vagrant would download it but too
+# late for us to patch it like this; so we prompt them to explicitly add it
+# first and then rerun.
+if ['up', 'provision'].include? ARGV[0]
+  if command? "lxc-ls"
+    LXC_VERSION = `lxc-ls --version`.strip unless defined? LXC_VERSION
+    if LXC_VERSION == "2.1.0"
+      lxc_config_file = ENV['HOME'] + "/.vagrant.d/boxes/fgrehm-VAGRANTSLASH-trusty64-lxc/1.2.0/lxc/lxc-config"
+      if File.file?(lxc_config_file)
+        lines = File.readlines(lxc_config_file)
+        deprecated_line = "lxc.pivotdir = lxc_putold\n"
+        if lines[1] == deprecated_line
+          lines[1] = "# #{deprecated_line}"
+          File.open(lxc_config_file, 'w') do |f|
+            f.puts(lines)
+          end
+        end
+      else
+        puts 'You are running LXC 2.1.0, and fgrehm/trusty64-lxc box is incompatible '\
+            "with it by default. First add the box by doing:\n"\
+            "  vagrant box add  https://vagrantcloud.com/fgrehm/trusty64-lxc\n"\
+            'Once this command succeeds, do "vagrant up" again.'
+        exit
+      end
+    end
+  end
+end
+
 # Workaround: Vagrant removed the atlas.hashicorp.com to
 # vagrantcloud.com redirect in February 2018. The value of
 # DEFAULT_SERVER_URL in Vagrant versions less than 1.9.3 is
@@ -29,38 +66,24 @@ if Vagrant::DEFAULT_SERVER_URL == "atlas.hashicorp.com"
   Vagrant::DEFAULT_SERVER_URL.replace('https://vagrantcloud.com')
 end
 
-# Monkey patch https://github.com/hashicorp/vagrant/pull/10879 so we
-# can fall back to another provider if docker is not installed.
-begin
-  require Vagrant.source_root.join("plugins", "providers", "docker", "provider")
-rescue LoadError
-else
-  VagrantPlugins::DockerProvider::Provider.class_eval do
-    method(:usable?).owner == singleton_class or def self.usable?(raise_error=false)
-      VagrantPlugins::DockerProvider::Driver.new.execute("docker", "version")
-      true
-    rescue Vagrant::Errors::CommandUnavailable, VagrantPlugins::DockerProvider::Errors::ExecuteError
-      raise if raise_error
-      return false
-    end
-  end
-end
-
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
+  # For LXC. VirtualBox hosts use a different box, described below.
+  config.vm.box = "fgrehm/trusty64-lxc"
+
   # The Zulip development environment runs on 9991 on the guest.
   host_port = 9991
   http_proxy = https_proxy = no_proxy = nil
   host_ip_addr = "127.0.0.1"
 
-  # System settings for the virtual machine.
-  vm_num_cpus = "2"
-  vm_memory = "2048"
-
-  ubuntu_mirror = ""
-
   config.vm.synced_folder ".", "/vagrant", disabled: true
-  config.vm.synced_folder ".", "/srv/zulip"
+  if (/darwin/ =~ RUBY_PLATFORM) != nil
+    config.vm.synced_folder ".", "/srv/zulip", type: "nfs",
+        linux__nfs_options: ['rw']
+    config.vm.network "private_network", type: "dhcp"
+  else
+    config.vm.synced_folder ".", "/srv/zulip"
+  end
 
   vagrant_config_file = ENV['HOME'] + "/.zulip-vagrant-config"
   if File.file?(vagrant_config_file)
@@ -74,9 +97,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       when "NO_PROXY"; no_proxy = value
       when "HOST_PORT"; host_port = value.to_i
       when "HOST_IP_ADDR"; host_ip_addr = value
-      when "GUEST_CPUS"; vm_num_cpus = value
-      when "GUEST_MEMORY_MB"; vm_memory = value
-      when "UBUNTU_MIRROR"; ubuntu_mirror = value
       end
     end
   end
@@ -102,28 +122,35 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.network "forwarded_port", guest: 9991, host: host_port, host_ip: host_ip_addr
   config.vm.network "forwarded_port", guest: 9994, host: host_port + 3, host_ip: host_ip_addr
-  # Specify Docker provider before VirtualBox provider so it's preferred.
-  config.vm.provider "docker" do |d, override|
-    d.build_dir = File.join(__dir__, "tools", "setup", "dev-vagrant-docker")
-    d.build_args = ["--build-arg", "VAGRANT_UID=#{Process.uid}"]
-    if !ubuntu_mirror.empty?
-      d.build_args += ["--build-arg", "UBUNTU_MIRROR=#{ubuntu_mirror}"]
+  # Specify LXC provider before VirtualBox provider so it's preferred.
+  config.vm.provider "lxc" do |lxc|
+    if command? "lxc-ls"
+      LXC_VERSION = `lxc-ls --version`.strip unless defined? LXC_VERSION
+      if LXC_VERSION >= "1.1.0" and LXC_VERSION < "3.0.0"
+        # Allow start without AppArmor, otherwise Box will not Start on Ubuntu 14.10
+        # see https://github.com/fgrehm/vagrant-lxc/issues/333
+        lxc.customize 'aa_allow_incomplete', 1
+      end
+      if LXC_VERSION >= "3.0.0"
+        lxc.customize 'apparmor.allow_incomplete', 1
+      end
+      if LXC_VERSION >= "2.0.0"
+        lxc.backingstore = 'dir'
+      end
     end
-    d.has_ssh = true
-    d.create_args = ["--ulimit", "nofile=1024:65536"]
   end
 
   config.vm.provider "virtualbox" do |vb, override|
-    override.vm.box = "ubuntu/bionic64"
-    # An unnecessary log file gets generated when running vagrant up for the
-    # first time with the Ubuntu Bionic box. This looks like it is being
-    # caused upstream by the base box containing a Vagrantfile with a similar
-    # line to the one below.
-    # see https://github.com/hashicorp/vagrant/issues/9425
-    vb.customize [ "modifyvm", :id, "--uartmode1", "disconnected" ]
+    override.vm.box = "ubuntu/trusty64"
     # It's possible we can get away with just 1.5GB; more testing needed
-    vb.memory = vm_memory
-    vb.cpus = vm_num_cpus
+    vb.memory = 2048
+    vb.cpus = 2
+  end
+
+  config.vm.provider "vmware_fusion" do |vb, override|
+    override.vm.box = "puphpet/ubuntu1404-x64"
+    vb.vmx["memsize"] = "2048"
+    vb.vmx["numvcpus"] = "2"
   end
 
 $provision_script = <<SCRIPT
@@ -135,15 +162,19 @@ set -o pipefail
 # something that we don't want to happen when running provision in a
 # development environment not using Vagrant.
 
-# Set the Ubuntu mirror
-[ ! '#{ubuntu_mirror}' ] || sudo sed -i 's|http://\\(\\w*\\.\\)*archive\\.ubuntu\\.com/ubuntu/\\? |#{ubuntu_mirror} |' /etc/apt/sources.list
-
 # Set the MOTD on the system to have Zulip instructions
-sudo ln -nsf /srv/zulip/tools/setup/dev-motd /etc/update-motd.d/99-zulip-dev
-sudo rm -f /etc/update-motd.d/10-help-text
-sudo dpkg --purge landscape-client landscape-common ubuntu-release-upgrader-core update-manager-core update-notifier-common ubuntu-server
-sudo dpkg-divert --add --rename /etc/default/motd-news
-sudo sh -c 'echo ENABLED=0 > /etc/default/motd-news'
+sudo rm -f /etc/update-motd.d/*
+sudo bash -c 'cat << EndOfMessage > /etc/motd
+Welcome to the Zulip development environment!  Popular commands:
+* tools/provision - Update the development environment
+* tools/run-dev.py - Run the development server
+* tools/lint - Run the linter (quick and catches many problems)
+* tools/test-* - Run tests (use --help to learn about options)
+
+Read https://zulip.readthedocs.io/en/latest/testing/testing.html to learn
+how to run individual test suites so that you can get a fast debug cycle.
+
+EndOfMessage'
 
 # If the host is running SELinux remount the /sys/fs/selinux directory as read only,
 # needed for apt-get to work.

analytics/lib/counts.py

@@ -2,20 +2,20 @@ import time
 from collections import OrderedDict, defaultdict
 from datetime import datetime, timedelta
 import logging
-from typing import Callable, Dict, List, \
+from typing import Any, Callable, Dict, List, \
     Optional, Tuple, Type, Union
 
 from django.conf import settings
-from django.db import connection
+from django.db import connection, models
 from django.db.models import F
 
-from analytics.models import BaseCount, \
+from analytics.models import Anomaly, BaseCount, \
     FillState, InstallationCount, RealmCount, StreamCount, \
     UserCount, installation_epoch, last_successful_fill
 from zerver.lib.logging_util import log_to_file
 from zerver.lib.timestamp import ceiling_to_day, \
     ceiling_to_hour, floor_to_hour, verify_UTC
-from zerver.models import Message, Realm, RealmAuditLog, \
+from zerver.models import Message, Realm, \
     Stream, UserActivityInterval, UserProfile, models
 
 ## Logging setup ##
@@ -226,6 +226,7 @@ def do_drop_all_analytics_tables() -> None:
     RealmCount.objects.all().delete()
     InstallationCount.objects.all().delete()
     FillState.objects.all().delete()
+    Anomaly.objects.all().delete()
 
 def do_drop_single_stat(property: str) -> None:
     UserCount.objects.filter(property=property).delete()
@@ -295,8 +296,8 @@ count_message_by_user_query = """
         zerver_userprofile.id = zerver_message.sender_id
     WHERE
         zerver_userprofile.date_joined < %%(time_end)s AND
-        zerver_message.date_sent >= %%(time_start)s AND
-        zerver_message.date_sent < %%(time_end)s
+        zerver_message.pub_date >= %%(time_start)s AND
+        zerver_message.pub_date < %%(time_end)s
     GROUP BY zerver_userprofile.id %(group_by_clause)s
 """
 
@@ -322,8 +323,8 @@ count_message_type_by_user_query = """
         JOIN zerver_message
         ON
             zerver_userprofile.id = zerver_message.sender_id AND
-            zerver_message.date_sent >= %%(time_start)s AND
-            zerver_message.date_sent < %%(time_end)s
+            zerver_message.pub_date >= %%(time_start)s AND
+            zerver_message.pub_date < %%(time_end)s
         JOIN zerver_recipient
         ON
             zerver_message.recipient_id = zerver_recipient.id
@@ -359,8 +360,8 @@ count_message_by_stream_query = """
     WHERE
         zerver_stream.date_created < %%(time_end)s AND
         zerver_recipient.type = 2 AND
-        zerver_message.date_sent >= %%(time_start)s AND
-        zerver_message.date_sent < %%(time_end)s
+        zerver_message.pub_date >= %%(time_start)s AND
+        zerver_message.pub_date < %%(time_end)s
     GROUP BY zerver_stream.id %(group_by_clause)s
 """
 
@@ -385,7 +386,7 @@ count_user_by_realm_query = """
 
 # Currently hardcodes the query needed for active_users_audit:is_bot:day.
 # Assumes that a user cannot have two RealmAuditLog entries with the same event_time and
-# event_type in [RealmAuditLog.USER_CREATED, USER_DEACTIVATED, etc].
+# event_type in ['user_created', 'user_deactivated', etc].
 # In particular, it's important to ensure that migrations don't cause that to happen.
 check_realmauditlog_by_user_query = """
     INSERT INTO analytics_usercount
@@ -397,7 +398,7 @@ check_realmauditlog_by_user_query = """
         SELECT modified_user_id, max(event_time) AS max_event_time
         FROM zerver_realmauditlog
         WHERE
-            event_type in ({user_created}, {user_activated}, {user_deactivated}, {user_reactivated}) AND
+            event_type in ('user_created', 'user_deactivated', 'user_activated', 'user_reactivated') AND
             event_time < %%(time_end)s
         GROUP BY modified_user_id
     ) ral2
@@ -408,11 +409,8 @@ check_realmauditlog_by_user_query = """
     ON
         ral1.modified_user_id = zerver_userprofile.id
     WHERE
-        ral1.event_type in ({user_created}, {user_activated}, {user_reactivated})
-""".format(user_created=RealmAuditLog.USER_CREATED,
-           user_activated=RealmAuditLog.USER_ACTIVATED,
-           user_deactivated=RealmAuditLog.USER_DEACTIVATED,
-           user_reactivated=RealmAuditLog.USER_REACTIVATED)
+        ral1.event_type in ('user_created', 'user_activated', 'user_reactivated')
+"""
 
 check_useractivityinterval_by_user_query = """
     INSERT INTO analytics_usercount

analytics/management/commands/analyze_mit.py

@@ -15,7 +15,7 @@ def compute_stats(log_level: int) -> None:
     one_week_ago = timestamp_to_datetime(time.time()) - datetime.timedelta(weeks=1)
     mit_query = Message.objects.filter(sender__realm__string_id="zephyr",
                                        recipient__type=Recipient.STREAM,
-                                       date_sent__gt=one_week_ago)
+                                       pub_date__gt=one_week_ago)
     for bot_sender_start in ["imap.", "rcmd.", "sys."]:
         mit_query = mit_query.exclude(sender__email__startswith=(bot_sender_start))
     # Filtering for "/" covers tabbott/extra@ and all the daemon/foo bots.

analytics/management/commands/check_analytics_state.py

@@ -1,9 +1,10 @@
+from argparse import ArgumentParser
 from datetime import timedelta
 
 from django.core.management.base import BaseCommand
 from django.utils.timezone import now as timezone_now
 
-from analytics.models import installation_epoch, \
+from analytics.models import InstallationCount, installation_epoch, \
     last_successful_fill
 from analytics.lib.counts import COUNT_STATS, CountStat
 from zerver.lib.timestamp import floor_to_hour, floor_to_day, verify_UTC, \
@@ -11,6 +12,7 @@ from zerver.lib.timestamp import floor_to_hour, floor_to_day, verify_UTC, \
 from zerver.models import Realm
 
 import os
+import sys
 import time
 from typing import Any, Dict
 

analytics/management/commands/clear_analytics_tables.py

@@ -1,7 +1,8 @@
+import sys
 from argparse import ArgumentParser
 from typing import Any
 
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
 
 from analytics.lib.counts import do_drop_all_analytics_tables
 
@@ -17,4 +18,5 @@ class Command(BaseCommand):
         if options['force']:
             do_drop_all_analytics_tables()
         else:
-            raise CommandError("Would delete all data from analytics tables (!); use --force to do so.")
+            print("Would delete all data from analytics tables (!); use --force to do so.")
+            sys.exit(1)

analytics/management/commands/clear_single_stat.py

@@ -1,7 +1,8 @@
+import sys
 from argparse import ArgumentParser
 from typing import Any
 
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
 
 from analytics.lib.counts import COUNT_STATS, do_drop_single_stat
 
@@ -19,8 +20,10 @@ class Command(BaseCommand):
     def handle(self, *args: Any, **options: Any) -> None:
         property = options['property']
         if property not in COUNT_STATS:
-            raise CommandError("Invalid property: %s" % (property,))
+            print("Invalid property: %s" % (property,))
+            sys.exit(1)
         if not options['force']:
-            raise CommandError("No action taken. Use --force.")
+            print("No action taken. Use --force.")
+            sys.exit(1)
 
         do_drop_single_stat(property)

analytics/management/commands/client_activity.py

@@ -1,6 +1,6 @@
 import datetime
 from argparse import ArgumentParser
-from typing import Any, Optional
+from typing import Any
 
 from django.db.models import Count, QuerySet
 from django.utils.timezone import now as timezone_now
@@ -56,7 +56,7 @@ Usage examples:
             print("%25s %15d" % (count[1], count[0]))
         print("Total:", total)
 
-    def handle(self, *args: Any, **options: Optional[str]) -> None:
+    def handle(self, *args: Any, **options: str) -> None:
         realm = self.get_realm(options)
         if options["user"] is None:
             if options["target"] == "server" and realm is None:

analytics/management/commands/populate_analytics_db.py

@@ -1,6 +1,6 @@
-from datetime import timedelta
-from typing import Any, Dict, List, Mapping, Optional, Type
-import mock
+
+from datetime import datetime, timedelta
+from typing import Any, Dict, List, Mapping, Optional, Type, Union
 
 from django.core.management.base import BaseCommand
 from django.utils.timezone import now as timezone_now
@@ -11,11 +11,10 @@ from analytics.lib.fixtures import generate_time_series_data
 from analytics.lib.time_utils import time_range
 from analytics.models import BaseCount, FillState, RealmCount, UserCount, \
     StreamCount, InstallationCount
-from zerver.lib.actions import do_change_is_admin, STREAM_ASSIGNMENT_COLORS
-from zerver.lib.create_user import create_user
+from zerver.lib.actions import do_change_is_admin
 from zerver.lib.timestamp import floor_to_day
-from zerver.models import Realm, Stream, Client, \
-    Recipient, Subscription
+from zerver.models import Realm, UserProfile, Stream, Message, Client, \
+    RealmAuditLog, Recipient
 
 class Command(BaseCommand):
     help = """Populates analytics tables with randomly generated data."""
@@ -23,6 +22,20 @@ class Command(BaseCommand):
     DAYS_OF_DATA = 100
     random_seed = 26
 
+    def create_user(self, email: str,
+                    full_name: str,
+                    is_staff: bool,
+                    date_joined: datetime,
+                    realm: Realm) -> UserProfile:
+        user = UserProfile.objects.create(
+            email=email, full_name=full_name, is_staff=is_staff,
+            realm=realm, short_name=full_name, pointer=-1, last_pointer_updater='none',
+            api_key='42', date_joined=date_joined)
+        RealmAuditLog.objects.create(
+            realm=realm, modified_user=user, event_type=RealmAuditLog.USER_CREATED,
+            event_time=user.date_joined)
+        return user
+
     def generate_fixture_data(self, stat: CountStat, business_hours_base: float,
                               non_business_hours_base: float, growth: float,
                               autocorrelation: float, spikiness: float,
@@ -55,25 +68,11 @@ class Command(BaseCommand):
         last_end_time = floor_to_day(timezone_now())
         realm = Realm.objects.create(
             string_id='analytics', name='Analytics', date_created=installation_time)
-        with mock.patch("zerver.lib.create_user.timezone_now", return_value=installation_time):
-            shylock = create_user('shylock@analytics.ds', 'Shylock', realm,
-                                  full_name='Shylock', short_name='shylock',
-                                  is_realm_admin=True)
+        shylock = self.create_user('shylock@analytics.ds', 'Shylock', True, installation_time, realm)
         do_change_is_admin(shylock, True)
         stream = Stream.objects.create(
             name='all', realm=realm, date_created=installation_time)
-        recipient = Recipient.objects.create(type_id=stream.id, type=Recipient.STREAM)
-        stream.recipient = recipient
-        stream.save(update_fields=["recipient"])
-
-        # Subscribe shylock to the stream to avoid invariant failures.
-        # TODO: This should use subscribe_users_to_streams from populate_db.
-        subs = [
-            Subscription(recipient=recipient,
-                         user_profile=shylock,
-                         color=STREAM_ASSIGNMENT_COLORS[0]),
-        ]
-        Subscription.objects.bulk_create(subs)
+        Recipient.objects.create(type_id=stream.id, type=Recipient.STREAM)
 
         def insert_fixture_data(stat: CountStat,
                                 fixture_data: Mapping[Optional[str], List[int]],

analytics/management/commands/realm_stats.py

@@ -2,7 +2,8 @@ import datetime
 from argparse import ArgumentParser
 from typing import Any, List
 
-from django.core.management.base import BaseCommand, CommandError
+import pytz
+from django.core.management.base import BaseCommand
 from django.db.models import Count
 from django.utils.timezone import now as timezone_now
 
@@ -33,32 +34,32 @@ class Command(BaseCommand):
 
     def messages_sent_by(self, user: UserProfile, days_ago: int) -> int:
         sent_time_cutoff = timezone_now() - datetime.timedelta(days=days_ago)
-        return human_messages.filter(sender=user, date_sent__gt=sent_time_cutoff).count()
+        return human_messages.filter(sender=user, pub_date__gt=sent_time_cutoff).count()
 
     def total_messages(self, realm: Realm, days_ago: int) -> int:
         sent_time_cutoff = timezone_now() - datetime.timedelta(days=days_ago)
-        return Message.objects.filter(sender__realm=realm, date_sent__gt=sent_time_cutoff).count()
+        return Message.objects.filter(sender__realm=realm, pub_date__gt=sent_time_cutoff).count()
 
     def human_messages(self, realm: Realm, days_ago: int) -> int:
         sent_time_cutoff = timezone_now() - datetime.timedelta(days=days_ago)
-        return human_messages.filter(sender__realm=realm, date_sent__gt=sent_time_cutoff).count()
+        return human_messages.filter(sender__realm=realm, pub_date__gt=sent_time_cutoff).count()
 
     def api_messages(self, realm: Realm, days_ago: int) -> int:
         return (self.total_messages(realm, days_ago) - self.human_messages(realm, days_ago))
 
     def stream_messages(self, realm: Realm, days_ago: int) -> int:
         sent_time_cutoff = timezone_now() - datetime.timedelta(days=days_ago)
-        return human_messages.filter(sender__realm=realm, date_sent__gt=sent_time_cutoff,
+        return human_messages.filter(sender__realm=realm, pub_date__gt=sent_time_cutoff,
                                      recipient__type=Recipient.STREAM).count()
 
     def private_messages(self, realm: Realm, days_ago: int) -> int:
         sent_time_cutoff = timezone_now() - datetime.timedelta(days=days_ago)
-        return human_messages.filter(sender__realm=realm, date_sent__gt=sent_time_cutoff).exclude(
+        return human_messages.filter(sender__realm=realm, pub_date__gt=sent_time_cutoff).exclude(
             recipient__type=Recipient.STREAM).exclude(recipient__type=Recipient.HUDDLE).count()
 
     def group_private_messages(self, realm: Realm, days_ago: int) -> int:
         sent_time_cutoff = timezone_now() - datetime.timedelta(days=days_ago)
-        return human_messages.filter(sender__realm=realm, date_sent__gt=sent_time_cutoff).exclude(
+        return human_messages.filter(sender__realm=realm, pub_date__gt=sent_time_cutoff).exclude(
             recipient__type=Recipient.STREAM).exclude(recipient__type=Recipient.PERSONAL).count()
 
     def report_percentage(self, numerator: float, denominator: float, text: str) -> None:
@@ -73,7 +74,8 @@ class Command(BaseCommand):
             try:
                 realms = [get_realm(string_id) for string_id in options['realms']]
             except Realm.DoesNotExist as e:
-                raise CommandError(e)
+                print(e)
+                exit(1)
         else:
             realms = Realm.objects.all()
 
@@ -130,7 +132,7 @@ class Command(BaseCommand):
                 user_profile__in=user_profiles, active=True)
 
             # Streams not in home view
-            non_home_view = active_user_subs.filter(is_muted=True).values(
+            non_home_view = active_user_subs.filter(in_home_view=False).values(
                 "user_profile").annotate(count=Count("user_profile"))
             print("%d users have %d streams not in home view" % (
                 len(non_home_view), sum([elt["count"] for elt in non_home_view])))

analytics/management/commands/stream_stats.py

@@ -1,7 +1,7 @@
 from argparse import ArgumentParser
 from typing import Any
 
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
 from django.db.models import Q
 
 from zerver.models import Message, Realm, \
@@ -19,38 +19,26 @@ class Command(BaseCommand):
             try:
                 realms = [get_realm(string_id) for string_id in options['realms']]
             except Realm.DoesNotExist as e:
-                raise CommandError(e)
+                print(e)
+                exit(1)
         else:
             realms = Realm.objects.all()
 
         for realm in realms:
+            print(realm.string_id)
+            print("------------")
+            print("%25s %15s %10s" % ("stream", "subscribers", "messages"))
             streams = Stream.objects.filter(realm=realm).exclude(Q(name__istartswith="tutorial-"))
-            # private stream count
-            private_count = 0
-            # public stream count
-            public_count = 0
+            invite_only_count = 0
             for stream in streams:
                 if stream.invite_only:
-                    private_count += 1
-                else:
-                    public_count += 1
-            print("------------")
-            print(realm.string_id, end=' ')
-            print("%10s %d public streams and" % ("(", public_count), end=' ')
-            print("%d private streams )" % (private_count,))
-            print("------------")
-            print("%25s %15s %10s %12s" % ("stream", "subscribers", "messages", "type"))
-
-            for stream in streams:
-                if stream.invite_only:
-                    stream_type = 'private'
-                else:
-                    stream_type = 'public'
+                    invite_only_count += 1
+                    continue
                 print("%25s" % (stream.name,), end=' ')
                 recipient = Recipient.objects.filter(type=Recipient.STREAM, type_id=stream.id)
                 print("%10d" % (len(Subscription.objects.filter(recipient=recipient,
                                                                 active=True)),), end=' ')
                 num_messages = len(Message.objects.filter(recipient=recipient))
-                print("%12d" % (num_messages,), end=' ')
-                print("%15s" % (stream_type,))
+                print("%12d" % (num_messages,))
+            print("%d private streams" % (invite_only_count,))
             print("")

analytics/management/commands/update_analytics_counts.py

@@ -11,7 +11,6 @@ from django.utils.timezone import utc as timezone_utc
 
 from analytics.lib.counts import COUNT_STATS, logger, process_count_stat
 from scripts.lib.zulip_tools import ENDC, WARNING
-from zerver.lib.remote_server import send_analytics_to_remote_server
 from zerver.lib.timestamp import floor_to_hour
 from zerver.models import Realm
 
@@ -85,6 +84,3 @@ class Command(BaseCommand):
             print("Finished updating analytics counts through %s in %.3fs" %
                   (fill_to_time, time.time() - start))
         logger.info("Finished updating analytics counts through %s" % (fill_to_time,))
-
-        if settings.PUSH_NOTIFICATION_BOUNCER_URL and settings.SUBMIT_USAGE_STATISTICS:
-            send_analytics_to_remote_server()

analytics/management/commands/user_stats.py

@@ -2,7 +2,7 @@ import datetime
 from argparse import ArgumentParser
 from typing import Any
 
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
 from django.utils.timezone import now as timezone_now
 
 from zerver.models import Message, Realm, Stream, UserProfile, get_realm
@@ -17,14 +17,15 @@ class Command(BaseCommand):
     def messages_sent_by(self, user: UserProfile, week: int) -> int:
         start = timezone_now() - datetime.timedelta(days=(week + 1)*7)
         end = timezone_now() - datetime.timedelta(days=week*7)
-        return Message.objects.filter(sender=user, date_sent__gt=start, date_sent__lte=end).count()
+        return Message.objects.filter(sender=user, pub_date__gt=start, pub_date__lte=end).count()
 
     def handle(self, *args: Any, **options: Any) -> None:
         if options['realms']:
             try:
                 realms = [get_realm(string_id) for string_id in options['realms']]
             except Realm.DoesNotExist as e:
-                raise CommandError(e)
+                print(e)
+                exit(1)
         else:
             realms = Realm.objects.all()
 
@@ -37,5 +38,5 @@ class Command(BaseCommand):
             for user_profile in user_profiles:
                 print("%35s" % (user_profile.email,), end=' ')
                 for week in range(10):
-                    print("%5d" % (self.messages_sent_by(user_profile, week),), end=' ')
+                    print("%5d" % (self.messages_sent_by(user_profile, week)), end=' ')
                 print("")

analytics/migrations/0001_initial.py

@@ -3,6 +3,8 @@ import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
 
+import zerver.lib.str_utils
+
 class Migration(migrations.Migration):
 
     dependencies = [

analytics/migrations/0002_remove_huddlecount.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from django.db import migrations
+from django.db import migrations, models
 
 class Migration(migrations.Migration):
 

analytics/migrations/0003_fillstate.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from django.db import migrations, models
 
+import zerver.lib.str_utils
+
 class Migration(migrations.Migration):
 
     dependencies = [

analytics/migrations/0006_add_subgroup_to_unique_constraints.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from django.db import migrations
+from django.db import migrations, models
 
 class Migration(migrations.Migration):
 

analytics/migrations/0007_remove_interval.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.4 on 2017-01-16 20:50
+from django.conf import settings
 from django.db import migrations
 
 class Migration(migrations.Migration):

analytics/migrations/0013_remove_anomaly.py

@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.18 on 2019-02-02 02:47
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('analytics', '0012_add_on_delete'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='installationcount',
-            name='anomaly',
-        ),
-        migrations.RemoveField(
-            model_name='realmcount',
-            name='anomaly',
-        ),
-        migrations.RemoveField(
-            model_name='streamcount',
-            name='anomaly',
-        ),
-        migrations.RemoveField(
-            model_name='usercount',
-            name='anomaly',
-        ),
-        migrations.DeleteModel(
-            name='Anomaly',
-        ),
-    ]

analytics/models.py

@@ -1,10 +1,10 @@
 import datetime
-from typing import Optional
+from typing import Any, Dict, Optional, Tuple, Union
 
 from django.db import models
 
 from zerver.lib.timestamp import floor_to_day
-from zerver.models import Realm, Stream, UserProfile
+from zerver.models import Realm, Recipient, Stream, UserProfile
 
 class FillState(models.Model):
     property = models.CharField(max_length=40, unique=True)  # type: str
@@ -34,6 +34,13 @@ def last_successful_fill(property: str) -> Optional[datetime.datetime]:
         return fillstate.end_time
     return fillstate.end_time - datetime.timedelta(hours=1)
 
+# would only ever make entries here by hand
+class Anomaly(models.Model):
+    info = models.CharField(max_length=1000)  # type: str
+
+    def __str__(self) -> str:
+        return "<Anomaly: %s... %s>" % (self.info, self.id)
+
 class BaseCount(models.Model):
     # Note: When inheriting from BaseCount, you may want to rearrange
     # the order of the columns in the migration to make sure they
@@ -42,6 +49,7 @@ class BaseCount(models.Model):
     subgroup = models.CharField(max_length=16, null=True)  # type: Optional[str]
     end_time = models.DateTimeField()  # type: datetime.datetime
     value = models.BigIntegerField()  # type: int
+    anomaly = models.ForeignKey(Anomaly, on_delete=models.SET_NULL, null=True)  # type: Optional[Anomaly]
 
     class Meta:
         abstract = True

analytics/tests/test_counts.py

@@ -1,7 +1,7 @@
-from datetime import datetime, timedelta
-from typing import Any, Dict, List, Optional, Tuple, Type
 
-import mock
+from datetime import datetime, timedelta
+from typing import Any, Dict, List, Optional, Tuple, Type, Union
+
 import ujson
 from django.apps import apps
 from django.db import models
@@ -10,21 +10,19 @@ from django.test import TestCase
 from django.utils.timezone import now as timezone_now
 from django.utils.timezone import utc as timezone_utc
 
-from analytics.lib.counts import COUNT_STATS, CountStat, \
+from analytics.lib.counts import COUNT_STATS, CountStat, DataCollector, \
     DependentCountStat, LoggingCountStat, do_aggregate_to_summary_table, \
     do_drop_all_analytics_tables, do_drop_single_stat, \
     do_fill_count_stat_at_hour, do_increment_logging_stat, \
     process_count_stat, sql_data_collector
-from analytics.models import BaseCount, \
+from analytics.models import Anomaly, BaseCount, \
     FillState, InstallationCount, RealmCount, StreamCount, \
-    UserCount, installation_epoch
+    UserCount, installation_epoch, last_successful_fill
 from zerver.lib.actions import do_activate_user, do_create_user, \
     do_deactivate_user, do_reactivate_user, update_user_activity_interval, \
     do_invite_users, do_revoke_user_invite, do_resend_user_invite_email, \
     InvitationError
-from zerver.lib.create_user import create_user
 from zerver.lib.timestamp import TimezoneNotUTCException, floor_to_day
-from zerver.lib.topic import DB_TOPIC_NAME
 from zerver.models import Client, Huddle, Message, Realm, \
     RealmAuditLog, Recipient, Stream, UserActivityInterval, \
     UserProfile, get_client, get_user, PreregistrationUser
@@ -37,7 +35,6 @@ class AnalyticsTestCase(TestCase):
     TIME_LAST_HOUR = TIME_ZERO - HOUR
 
     def setUp(self) -> None:
-        super().setUp()
         self.default_realm = Realm.objects.create(
             string_id='realmtest', name='Realm Test', date_created=self.TIME_ZERO - 2*self.DAY)
         # used to generate unique names in self.create_*
@@ -53,21 +50,13 @@ class AnalyticsTestCase(TestCase):
             'date_joined': self.TIME_LAST_HOUR,
             'full_name': 'full_name',
             'short_name': 'short_name',
-            'is_active': True,
-            'is_bot': False,
-            'realm': self.default_realm}
+            'pointer': -1,
+            'last_pointer_updater': 'seems unused?',
+            'realm': self.default_realm,
+            'api_key': '42'}
         for key, value in defaults.items():
             kwargs[key] = kwargs.get(key, value)
-        kwargs['delivery_email'] = kwargs['email']
-        with mock.patch("zerver.lib.create_user.timezone_now", return_value=kwargs['date_joined']):
-            pass_kwargs = {}  # type: Dict[str, Any]
-            if kwargs['is_bot']:
-                pass_kwargs['bot_type'] = UserProfile.DEFAULT_BOT
-                pass_kwargs['bot_owner'] = None
-            return create_user(kwargs['email'], 'password', kwargs['realm'],
-                               active=kwargs['is_active'],
-                               full_name=kwargs['full_name'], short_name=kwargs['short_name'],
-                               is_realm_admin=True, **pass_kwargs)
+        return UserProfile.objects.create(**kwargs)
 
     def create_stream_with_recipient(self, **kwargs: Any) -> Tuple[Stream, Recipient]:
         self.name_counter += 1
@@ -93,9 +82,9 @@ class AnalyticsTestCase(TestCase):
         defaults = {
             'sender': sender,
             'recipient': recipient,
-            DB_TOPIC_NAME: 'subject',
+            'subject': 'subject',
             'content': 'hi',
-            'date_sent': self.TIME_LAST_HOUR,
+            'pub_date': self.TIME_LAST_HOUR,
             'sending_client': get_client("website")}
         for key, value in defaults.items():
             kwargs[key] = kwargs.get(key, value)
@@ -325,7 +314,7 @@ class TestCountStats(AnalyticsTestCase):
             recipient = self.create_stream_with_recipient(
                 name='stream %s' % (minutes_ago,), realm=self.second_realm,
                 date_created=creation_time)[1]
-            self.create_message(user, recipient, date_sent=creation_time)
+            self.create_message(user, recipient, pub_date=creation_time)
         self.hourly_user = get_user('user-1@second.analytics', self.second_realm)
         self.daily_user = get_user('user-61@second.analytics', self.second_realm)
 
@@ -370,8 +359,8 @@ class TestCountStats(AnalyticsTestCase):
         bot = self.create_user(is_bot=True)
         human1 = self.create_user()
         human2 = self.create_user()
-        recipient_human1 = Recipient.objects.get(type_id=human1.id,
-                                                 type=Recipient.PERSONAL)
+        recipient_human1 = Recipient.objects.create(type_id=human1.id,
+                                                    type=Recipient.PERSONAL)
 
         recipient_stream = self.create_stream_with_recipient()[1]
         recipient_huddle = self.create_huddle_with_recipient()[1]
@@ -425,9 +414,9 @@ class TestCountStats(AnalyticsTestCase):
         self.create_message(user2, recipient_huddle2)
 
         # private messages
-        recipient_user1 = Recipient.objects.get(type_id=user1.id, type=Recipient.PERSONAL)
-        recipient_user2 = Recipient.objects.get(type_id=user2.id, type=Recipient.PERSONAL)
-        recipient_user3 = Recipient.objects.get(type_id=user3.id, type=Recipient.PERSONAL)
+        recipient_user1 = Recipient.objects.create(type_id=user1.id, type=Recipient.PERSONAL)
+        recipient_user2 = Recipient.objects.create(type_id=user2.id, type=Recipient.PERSONAL)
+        recipient_user3 = Recipient.objects.create(type_id=user3.id, type=Recipient.PERSONAL)
         self.create_message(user1, recipient_user2)
         self.create_message(user2, recipient_user1)
         self.create_message(user3, recipient_user3)
@@ -459,7 +448,7 @@ class TestCountStats(AnalyticsTestCase):
         self.current_property = stat.property
 
         user = self.create_user(id=1000)
-        user_recipient = Recipient.objects.get(type_id=user.id, type=Recipient.PERSONAL)
+        user_recipient = Recipient.objects.create(type_id=user.id, type=Recipient.PERSONAL)
         stream_recipient = self.create_stream_with_recipient(id=1000)[1]
         huddle_recipient = self.create_huddle_with_recipient(id=1000)[1]
 
@@ -479,7 +468,7 @@ class TestCountStats(AnalyticsTestCase):
 
         user1 = self.create_user(is_bot=True)
         user2 = self.create_user()
-        recipient_user2 = Recipient.objects.get(type_id=user2.id, type=Recipient.PERSONAL)
+        recipient_user2 = Recipient.objects.create(type_id=user2.id, type=Recipient.PERSONAL)
 
         recipient_stream = self.create_stream_with_recipient()[1]
         recipient_huddle = self.create_huddle_with_recipient()[1]
@@ -515,7 +504,7 @@ class TestCountStats(AnalyticsTestCase):
         bot = self.create_user(is_bot=True)
         human1 = self.create_user()
         human2 = self.create_user()
-        recipient_human1 = Recipient.objects.get(type_id=human1.id, type=Recipient.PERSONAL)
+        recipient_human1 = Recipient.objects.create(type_id=human1.id, type=Recipient.PERSONAL)
 
         stream1, recipient_stream1 = self.create_stream_with_recipient()
         stream2, recipient_stream2 = self.create_stream_with_recipient()
@@ -853,6 +842,7 @@ class TestDeleteStats(AnalyticsTestCase):
         RealmCount.objects.create(realm=user.realm, **count_args)
         InstallationCount.objects.create(**count_args)
         FillState.objects.create(property='test', end_time=self.TIME_ZERO, state=FillState.DONE)
+        Anomaly.objects.create(info='test anomaly')
 
         analytics = apps.get_app_config('analytics')
         for table in list(analytics.models.values()):
@@ -875,6 +865,7 @@ class TestDeleteStats(AnalyticsTestCase):
             InstallationCount.objects.create(**count_args)
         FillState.objects.create(property='to_delete', end_time=self.TIME_ZERO, state=FillState.DONE)
         FillState.objects.create(property='to_save', end_time=self.TIME_ZERO, state=FillState.DONE)
+        Anomaly.objects.create(info='test anomaly')
 
         analytics = apps.get_app_config('analytics')
         for table in list(analytics.models.values()):
@@ -882,8 +873,11 @@ class TestDeleteStats(AnalyticsTestCase):
 
         do_drop_single_stat('to_delete')
         for table in list(analytics.models.values()):
-            self.assertFalse(table.objects.filter(property='to_delete').exists())
-            self.assertTrue(table.objects.filter(property='to_save').exists())
+            if table._meta.db_table == 'analytics_anomaly':
+                self.assertTrue(table.objects.exists())
+            else:
+                self.assertFalse(table.objects.filter(property='to_delete').exists())
+                self.assertTrue(table.objects.filter(property='to_save').exists())
 
 class TestActiveUsersAudit(AnalyticsTestCase):
     def setUp(self) -> None:
@@ -892,7 +886,7 @@ class TestActiveUsersAudit(AnalyticsTestCase):
         self.stat = COUNT_STATS['active_users_audit:is_bot:day']
         self.current_property = self.stat.property
 
-    def add_event(self, event_type: int, days_offset: float,
+    def add_event(self, event_type: str, days_offset: float,
                   user: Optional[UserProfile]=None) -> None:
         hours_offset = int(24*days_offset)
         if user is None:
@@ -986,7 +980,7 @@ class TestActiveUsersAudit(AnalyticsTestCase):
     # doesn't go through do_create_user. Mainly just want to make sure that
     # that situation doesn't throw an error.
     def test_empty_realm_or_user_with_no_relevant_activity(self) -> None:
-        self.add_event(RealmAuditLog.USER_SOFT_ACTIVATED, 1)
+        self.add_event('unrelated', 1)
         self.create_user()  # also test a user with no RealmAuditLog entries
         Realm.objects.create(string_id='moo', name='moo')
         do_fill_count_stat_at_hour(self.stat, self.TIME_ZERO)
@@ -994,14 +988,14 @@ class TestActiveUsersAudit(AnalyticsTestCase):
 
     def test_max_audit_entry_is_unrelated(self) -> None:
         self.add_event(RealmAuditLog.USER_CREATED, 1)
-        self.add_event(RealmAuditLog.USER_SOFT_ACTIVATED, .5)
+        self.add_event('unrelated', .5)
         do_fill_count_stat_at_hour(self.stat, self.TIME_ZERO)
         self.assertTableState(UserCount, ['subgroup'], [['false']])
 
     # Simultaneous related audit entries should not be allowed, and so not testing for that.
     def test_simultaneous_unrelated_audit_entry(self) -> None:
         self.add_event(RealmAuditLog.USER_CREATED, 1)
-        self.add_event(RealmAuditLog.USER_SOFT_ACTIVATED, 1)
+        self.add_event('unrelated', 1)
         do_fill_count_stat_at_hour(self.stat, self.TIME_ZERO)
         self.assertTableState(UserCount, ['subgroup'], [['false']])
 
@@ -1031,7 +1025,7 @@ class TestActiveUsersAudit(AnalyticsTestCase):
             self.assertTrue(UserCount.objects.filter(
                 user=user, property=self.current_property, subgroup='false',
                 end_time=end_time, value=1).exists())
-        self.assertFalse(UserCount.objects.filter(user=user2, end_time=end_time).exists())
+        self.assertFalse(UserCount.objects.filter(user=user2).exists())
 
 class TestRealmActiveHumans(AnalyticsTestCase):
     def setUp(self) -> None:

analytics/tests/test_views.py

@@ -1,23 +1,19 @@
 from datetime import datetime, timedelta
-from typing import List, Optional
+from typing import Dict, List, Optional
 
 import mock
 from django.utils.timezone import utc
-from django.http import HttpResponse
-import ujson
 
 from analytics.lib.counts import COUNT_STATS, CountStat
 from analytics.lib.time_utils import time_range
 from analytics.models import FillState, \
     RealmCount, UserCount, last_successful_fill
-from analytics.views import rewrite_client_arrays, \
-    sort_by_totals, sort_client_labels
+from analytics.views import get_chart_data, rewrite_client_arrays, \
+    sort_by_totals, sort_client_labels, stats
 from zerver.lib.test_classes import ZulipTestCase
 from zerver.lib.timestamp import ceiling_to_day, \
     ceiling_to_hour, datetime_to_timestamp
-from zerver.lib.actions import do_create_multiuse_invite_link, \
-    do_send_realm_reactivation_email
-from zerver.models import Client, get_realm, MultiuseInvite
+from zerver.models import Client, get_realm
 
 class TestStatsEndpoint(ZulipTestCase):
     def test_stats(self) -> None:
@@ -72,7 +68,6 @@ class TestStatsEndpoint(ZulipTestCase):
 
 class TestGetChartData(ZulipTestCase):
     def setUp(self) -> None:
-        super().setUp()
         self.realm = get_realm('zulip')
         self.user = self.example_user('hamlet')
         self.login(self.user.email)
@@ -332,215 +327,6 @@ class TestGetChartData(ZulipTestCase):
                                  {'chart_name': 'number_of_humans'})
         self.assert_json_success(result)
 
-class TestSupportEndpoint(ZulipTestCase):
-    def test_search(self) -> None:
-        def check_hamlet_user_query_result(result: HttpResponse) -> None:
-            self.assert_in_success_response(['<span class="label">user</span>\n', '<h3>King Hamlet</h3>',
-                                             '<b>Email</b>: hamlet@zulip.com', '<b>Is active</b>: True<br>',
-                                             '<b>Admins</b>: iago@zulip.com\n',
-                                             'class="copy-button" data-copytext="iago@zulip.com"'
-                                             ], result)
-
-        def check_zulip_realm_query_result(result: HttpResponse) -> None:
-            zulip_realm = get_realm("zulip")
-            self.assert_in_success_response(['<input type="hidden" name="realm_id" value="%s"' % (zulip_realm.id,),
-                                             'Zulip Dev</h3>',
-                                             '<option value="1" selected>Self Hosted</option>',
-                                             '<option value="2" >Limited</option>',
-                                             'input type="number" name="discount" value="None"',
-                                             '<option value="active" selected>Active</option>',
-                                             '<option value="deactivated" >Deactivated</option>',
-                                             'scrub-realm-button">',
-                                             'data-string-id="zulip"'], result)
-
-        def check_lear_realm_query_result(result: HttpResponse) -> None:
-            lear_realm = get_realm("lear")
-            self.assert_in_success_response(['<input type="hidden" name="realm_id" value="%s"' % (lear_realm.id,),
-                                             'Lear &amp; Co.</h3>',
-                                             '<option value="1" selected>Self Hosted</option>',
-                                             '<option value="2" >Limited</option>',
-                                             'input type="number" name="discount" value="None"',
-                                             '<option value="active" selected>Active</option>',
-                                             '<option value="deactivated" >Deactivated</option>',
-                                             'scrub-realm-button">',
-                                             'data-string-id="lear"'], result)
-
-        def check_preregistration_user_query_result(result: HttpResponse, email: str, invite: Optional[bool]=False) -> None:
-            self.assert_in_success_response(['<span class="label">preregistration user</span>\n',
-                                             '<b>Email</b>: {}'.format(email),
-                                             ], result)
-            if invite:
-                self.assert_in_success_response(['<span class="label">invite</span>'], result)
-                self.assert_in_success_response(['<b>Expires in</b>: 1\xa0week, 3',
-                                                 '<b>Status</b>: Link has never been clicked'], result)
-                self.assert_in_success_response([], result)
-            else:
-                self.assert_not_in_success_response(['<span class="label">invite</span>'], result)
-                self.assert_in_success_response(['<b>Expires in</b>: 1\xa0day',
-                                                 '<b>Status</b>: Link has never been clicked'], result)
-
-        def check_realm_creation_query_result(result: HttpResponse, email: str) -> None:
-            self.assert_in_success_response(['<span class="label">preregistration user</span>\n',
-                                             '<span class="label">realm creation</span>\n',
-                                             '<b>Link</b>: http://zulip.testserver/accounts/do_confirm/',
-                                             '<b>Expires in</b>: 1\xa0day<br>\n'
-                                             ], result)
-
-        def check_multiuse_invite_link_query_result(result: HttpResponse) -> None:
-            self.assert_in_success_response(['<span class="label">multiuse invite</span>\n',
-                                             '<b>Link</b>: http://zulip.testserver/join/',
-                                             '<b>Expires in</b>: 1\xa0week, 3'
-                                             ], result)
-
-        def check_realm_reactivation_link_query_result(result: HttpResponse) -> None:
-            self.assert_in_success_response(['<span class="label">realm reactivation</span>\n',
-                                             '<b>Link</b>: http://zulip.testserver/reactivate/',
-                                             '<b>Expires in</b>: 1\xa0day'
-                                             ], result)
-
-        cordelia_email = self.example_email("cordelia")
-        self.login(cordelia_email)
-
-        result = self.client_get("/activity/support")
-        self.assertEqual(result.status_code, 302)
-        self.assertEqual(result["Location"], "/login/")
-
-        iago_email = self.example_email("iago")
-        self.login(iago_email)
-
-        result = self.client_get("/activity/support")
-        self.assert_in_success_response(['<input type="text" name="q" class="input-xxlarge search-query"'], result)
-
-        result = self.client_get("/activity/support", {"q": "hamlet@zulip.com"})
-        check_hamlet_user_query_result(result)
-        check_zulip_realm_query_result(result)
-
-        result = self.client_get("/activity/support", {"q": "lear"})
-        check_lear_realm_query_result(result)
-
-        result = self.client_get("/activity/support", {"q": "http://lear.testserver"})
-        check_lear_realm_query_result(result)
-
-        with self.settings(REALM_HOSTS={'zulip': 'localhost'}):
-            result = self.client_get("/activity/support", {"q": "http://localhost"})
-            check_zulip_realm_query_result(result)
-
-        result = self.client_get("/activity/support", {"q": "hamlet@zulip.com, lear"})
-        check_hamlet_user_query_result(result)
-        check_zulip_realm_query_result(result)
-        check_lear_realm_query_result(result)
-
-        result = self.client_get("/activity/support", {"q": "lear, Hamlet <hamlet@zulip.com>"})
-        check_hamlet_user_query_result(result)
-        check_zulip_realm_query_result(result)
-        check_lear_realm_query_result(result)
-
-        self.client_post('/accounts/home/', {'email': self.nonreg_email("test")})
-        self.login(iago_email)
-        result = self.client_get("/activity/support", {"q": self.nonreg_email("test")})
-        check_preregistration_user_query_result(result, self.nonreg_email("test"))
-        check_zulip_realm_query_result(result)
-
-        stream_ids = [self.get_stream_id("Denmark")]
-        invitee_emails = [self.nonreg_email("test1")]
-        self.client_post("/json/invites", {"invitee_emails": invitee_emails,
-                         "stream_ids": ujson.dumps(stream_ids), "invite_as": 1})
-        result = self.client_get("/activity/support", {"q": self.nonreg_email("test1")})
-        check_preregistration_user_query_result(result, self.nonreg_email("test1"), invite=True)
-        check_zulip_realm_query_result(result)
-
-        email = self.nonreg_email('alice')
-        self.client_post('/new/', {'email': email})
-        result = self.client_get("/activity/support", {"q": email})
-        check_realm_creation_query_result(result, email)
-
-        do_create_multiuse_invite_link(self.example_user("hamlet"), invited_as=1)
-        result = self.client_get("/activity/support", {"q": "zulip"})
-        check_multiuse_invite_link_query_result(result)
-        check_zulip_realm_query_result(result)
-        MultiuseInvite.objects.all().delete()
-
-        do_send_realm_reactivation_email(get_realm("zulip"))
-        result = self.client_get("/activity/support", {"q": "zulip"})
-        check_realm_reactivation_link_query_result(result)
-        check_zulip_realm_query_result(result)
-
-    def test_change_plan_type(self) -> None:
-        cordelia = self.example_user("cordelia")
-        self.login(cordelia.email)
-
-        result = self.client_post("/activity/support", {"realm_id": "%s" % (cordelia.realm_id,), "plan_type": "2"})
-        self.assertEqual(result.status_code, 302)
-        self.assertEqual(result["Location"], "/login/")
-
-        iago = self.example_user("iago")
-        self.login(iago.email)
-
-        with mock.patch("analytics.views.do_change_plan_type") as m:
-            result = self.client_post("/activity/support", {"realm_id": "%s" % (iago.realm_id,), "plan_type": "2"})
-            m.assert_called_once_with(get_realm("zulip"), 2)
-            self.assert_in_success_response(["Plan type of Zulip Dev changed from self hosted to limited"], result)
-
-    def test_attach_discount(self) -> None:
-        lear_realm = get_realm("lear")
-        cordelia_email = self.example_email("cordelia")
-        self.login(cordelia_email)
-
-        result = self.client_post("/activity/support", {"realm_id": "%s" % (lear_realm.id,), "discount": "25"})
-        self.assertEqual(result.status_code, 302)
-        self.assertEqual(result["Location"], "/login/")
-
-        iago_email = self.example_email("iago")
-        self.login(iago_email)
-
-        with mock.patch("analytics.views.attach_discount_to_realm") as m:
-            result = self.client_post("/activity/support", {"realm_id": "%s" % (lear_realm.id,), "discount": "25"})
-            m.assert_called_once_with(get_realm("lear"), 25)
-            self.assert_in_success_response(["Discount of Lear &amp; Co. changed to 25 from None"], result)
-
-    def test_activate_or_deactivate_realm(self) -> None:
-        lear_realm = get_realm("lear")
-        cordelia_email = self.example_email("cordelia")
-        self.login(cordelia_email)
-
-        result = self.client_post("/activity/support", {"realm_id": "%s" % (lear_realm.id,), "status": "deactivated"})
-        self.assertEqual(result.status_code, 302)
-        self.assertEqual(result["Location"], "/login/")
-
-        iago_email = self.example_email("iago")
-        self.login(iago_email)
-
-        with mock.patch("analytics.views.do_deactivate_realm") as m:
-            result = self.client_post("/activity/support", {"realm_id": "%s" % (lear_realm.id,), "status": "deactivated"})
-            m.assert_called_once_with(lear_realm, self.example_user("iago"))
-            self.assert_in_success_response(["Lear &amp; Co. deactivated"], result)
-
-        with mock.patch("analytics.views.do_send_realm_reactivation_email") as m:
-            result = self.client_post("/activity/support", {"realm_id": "%s" % (lear_realm.id,), "status": "active"})
-            m.assert_called_once_with(lear_realm)
-            self.assert_in_success_response(["Realm reactivation email sent to admins of Lear"], result)
-
-    def test_scrub_realm(self) -> None:
-        lear_realm = get_realm("lear")
-        cordelia_email = self.example_email("cordelia")
-        self.login(cordelia_email)
-
-        result = self.client_post("/activity/support", {"realm_id": "%s" % (lear_realm.id,), "discount": "25"})
-        self.assertEqual(result.status_code, 302)
-        self.assertEqual(result["Location"], "/login/")
-
-        iago_email = self.example_email("iago")
-        self.login(iago_email)
-
-        with mock.patch("analytics.views.do_scrub_realm") as m:
-            result = self.client_post("/activity/support", {"realm_id": "%s" % (lear_realm.id,), "scrub_realm": "scrub_realm"})
-            m.assert_called_once_with(lear_realm)
-            self.assert_in_success_response(["Lear &amp; Co. scrubbed"], result)
-
-        with mock.patch("analytics.views.do_scrub_realm") as m:
-            result = self.client_post("/activity/support", {"realm_id": "%s" % (lear_realm.id,)})
-            m.assert_not_called()
-
 class TestGetChartDataHelpers(ZulipTestCase):
     # last_successful_fill is in analytics/models.py, but get_chart_data is
     # the only function that uses it at the moment

analytics/urls.py

@@ -7,8 +7,6 @@ i18n_urlpatterns = [
     # Server admin (user_profile.is_staff) visible stats pages
     url(r'^activity$', analytics.views.get_activity,
         name='analytics.views.get_activity'),
-    url(r'^activity/support$', analytics.views.support,
-        name='analytics.views.support'),
     url(r'^realm_activity/(?P<realm_str>[\S]+)/$', analytics.views.get_realm_activity,
         name='analytics.views.get_realm_activity'),
     url(r'^user_activity/(?P<email>[\S]+)/$', analytics.views.get_user_activity,
@@ -18,12 +16,6 @@ i18n_urlpatterns = [
         name='analytics.views.stats_for_realm'),
     url(r'^stats/installation$', analytics.views.stats_for_installation,
         name='analytics.views.stats_for_installation'),
-    url(r'^stats/remote/(?P<remote_server_id>[\S]+)/installation$',
-        analytics.views.stats_for_remote_installation,
-        name='analytics.views.stats_for_remote_installation'),
-    url(r'^stats/remote/(?P<remote_server_id>[\S]+)/realm/(?P<remote_realm_id>[\S]+)/$',
-        analytics.views.stats_for_remote_realm,
-        name='analytics.views.stats_for_remote_realm'),
 
     # User-visible stats page
     url(r'^stats$', analytics.views.stats,
@@ -46,11 +38,6 @@ v1_api_and_json_patterns = [
         {'GET': 'analytics.views.get_chart_data_for_realm'}),
     url(r'^analytics/chart_data/installation$', rest_dispatch,
         {'GET': 'analytics.views.get_chart_data_for_installation'}),
-    url(r'^analytics/chart_data/remote/(?P<remote_server_id>[\S]+)/installation$', rest_dispatch,
-        {'GET': 'analytics.views.get_chart_data_for_remote_installation'}),
-    url(r'^analytics/chart_data/remote/(?P<remote_server_id>[\S]+)/realm/(?P<remote_realm_id>[\S]+)$',
-        rest_dispatch,
-        {'GET': 'analytics.views.get_chart_data_for_remote_realm'}),
 ]
 
 i18n_urlpatterns += [

analytics/views.py

@@ -1,12 +1,11 @@
+
 import itertools
+import json
 import logging
 import re
 import time
-import urllib
 from collections import defaultdict
 from datetime import datetime, timedelta
-from decimal import Decimal
-
 from typing import Any, Callable, Dict, List, \
     Optional, Set, Tuple, Type, Union
 
@@ -14,160 +13,90 @@ import pytz
 from django.conf import settings
 from django.urls import reverse
 from django.db import connection
+from django.db.models import Sum
 from django.db.models.query import QuerySet
 from django.http import HttpRequest, HttpResponse, HttpResponseNotFound
 from django.shortcuts import render
-from django.template import loader
+from django.template import RequestContext, loader
 from django.utils.timezone import now as timezone_now, utc as timezone_utc
 from django.utils.translation import ugettext as _
-from django.utils.timesince import timesince
-from django.core.validators import URLValidator
-from django.core.exceptions import ValidationError
 from jinja2 import Markup as mark_safe
 
-from analytics.lib.counts import COUNT_STATS, CountStat
+from analytics.lib.counts import COUNT_STATS, CountStat, process_count_stat
 from analytics.lib.time_utils import time_range
 from analytics.models import BaseCount, InstallationCount, \
     RealmCount, StreamCount, UserCount, last_successful_fill, installation_epoch
-from confirmation.models import Confirmation, confirmation_url, _properties
 from zerver.decorator import require_server_admin, require_server_admin_api, \
     to_non_negative_int, to_utc_datetime, zulip_login_required, require_non_guest_user
 from zerver.lib.exceptions import JsonableError
+from zerver.lib.json_encoder_for_html import JSONEncoderForHTML
 from zerver.lib.request import REQ, has_request_variables
 from zerver.lib.response import json_success
-from zerver.lib.timestamp import convert_to_UTC, timestamp_to_datetime
-from zerver.lib.realm_icon import realm_icon_url
-from zerver.views.invite import get_invitee_emails_set
-from zerver.lib.subdomains import get_subdomain_from_hostname
-from zerver.lib.actions import do_change_plan_type, do_deactivate_realm, \
-    do_send_realm_reactivation_email, do_scrub_realm
-from confirmation.settings import STATUS_ACTIVE
-
-if settings.BILLING_ENABLED:
-    from corporate.lib.stripe import attach_discount_to_realm, get_discount_for_realm
-
-from zerver.models import Client, get_realm, Realm, UserActivity, UserActivityInterval, \
-    UserProfile, PreregistrationUser, MultiuseInvite
-
-if settings.ZILENCER_ENABLED:
-    from zilencer.models import RemoteInstallationCount, RemoteRealmCount, \
-        RemoteZulipServer
-else:
-    from mock import Mock
-    RemoteInstallationCount = Mock()  # type: ignore # https://github.com/JukkaL/mypy/issues/1188
-    RemoteZulipServer = Mock()  # type: ignore # https://github.com/JukkaL/mypy/issues/1188
-    RemoteRealmCount = Mock()  # type: ignore # https://github.com/JukkaL/mypy/issues/1188
+from zerver.lib.timestamp import ceiling_to_day, \
+    ceiling_to_hour, convert_to_UTC, timestamp_to_datetime
+from zerver.models import Client, get_realm, Realm, \
+    UserActivity, UserActivityInterval, UserProfile
 
 def render_stats(request: HttpRequest, data_url_suffix: str, target_name: str,
-                 for_installation: bool=False, remote: bool=False) -> HttpRequest:
+                 for_installation: bool=False) -> HttpRequest:
     page_params = dict(
         data_url_suffix=data_url_suffix,
         for_installation=for_installation,
-        remote=remote,
         debug_mode=False,
     )
     return render(request,
                   'analytics/stats.html',
                   context=dict(target_name=target_name,
-                               page_params=page_params))
+                               page_params=JSONEncoderForHTML().encode(page_params)))
 
 @zulip_login_required
 def stats(request: HttpRequest) -> HttpResponse:
     realm = request.user.realm
     if request.user.is_guest:
         # TODO: Make @zulip_login_required pass the UserProfile so we
-        # can use @require_member_or_admin
+        # can use @require_non_guest_human_user
         raise JsonableError(_("Not allowed for guest users"))
     return render_stats(request, '', realm.name or realm.string_id)
 
 @require_server_admin
 @has_request_variables
 def stats_for_realm(request: HttpRequest, realm_str: str) -> HttpResponse:
-    try:
-        realm = get_realm(realm_str)
-    except Realm.DoesNotExist:
+    realm = get_realm(realm_str)
+    if realm is None:
         return HttpResponseNotFound("Realm %s does not exist" % (realm_str,))
 
     return render_stats(request, '/realm/%s' % (realm_str,), realm.name or realm.string_id)
 
-@require_server_admin
-@has_request_variables
-def stats_for_remote_realm(request: HttpRequest, remote_server_id: str,
-                           remote_realm_id: str) -> HttpResponse:
-    server = RemoteZulipServer.objects.get(id=remote_server_id)
-    return render_stats(request, '/remote/%s/realm/%s' % (server.id, remote_realm_id),
-                        "Realm %s on server %s" % (remote_realm_id, server.hostname))
-
 @require_server_admin_api
 @has_request_variables
 def get_chart_data_for_realm(request: HttpRequest, user_profile: UserProfile,
                              realm_str: str, **kwargs: Any) -> HttpResponse:
-    try:
-        realm = get_realm(realm_str)
-    except Realm.DoesNotExist:
+    realm = get_realm(realm_str)
+    if realm is None:
         raise JsonableError(_("Invalid organization"))
 
     return get_chart_data(request=request, user_profile=user_profile, realm=realm, **kwargs)
 
-@require_server_admin_api
-@has_request_variables
-def get_chart_data_for_remote_realm(
-        request: HttpRequest, user_profile: UserProfile, remote_server_id: str,
-        remote_realm_id: str, **kwargs: Any) -> HttpResponse:
-    server = RemoteZulipServer.objects.get(id=remote_server_id)
-    return get_chart_data(request=request, user_profile=user_profile, server=server,
-                          remote=True, remote_realm_id=int(remote_realm_id), **kwargs)
-
 @require_server_admin
 def stats_for_installation(request: HttpRequest) -> HttpResponse:
     return render_stats(request, '/installation', 'Installation', True)
 
-@require_server_admin
-def stats_for_remote_installation(request: HttpRequest, remote_server_id: str) -> HttpResponse:
-    server = RemoteZulipServer.objects.get(id=remote_server_id)
-    return render_stats(request, '/remote/%s/installation' % (server.id,),
-                        'remote Installation %s' % (server.hostname,), True, True)
-
 @require_server_admin_api
 @has_request_variables
 def get_chart_data_for_installation(request: HttpRequest, user_profile: UserProfile,
                                     chart_name: str=REQ(), **kwargs: Any) -> HttpResponse:
     return get_chart_data(request=request, user_profile=user_profile, for_installation=True, **kwargs)
 
-@require_server_admin_api
-@has_request_variables
-def get_chart_data_for_remote_installation(
-        request: HttpRequest,
-        user_profile: UserProfile,
-        remote_server_id: str,
-        chart_name: str=REQ(),
-        **kwargs: Any) -> HttpResponse:
-    server = RemoteZulipServer.objects.get(id=remote_server_id)
-    return get_chart_data(request=request, user_profile=user_profile, for_installation=True,
-                          remote=True, server=server, **kwargs)
-
 @require_non_guest_user
 @has_request_variables
 def get_chart_data(request: HttpRequest, user_profile: UserProfile, chart_name: str=REQ(),
                    min_length: Optional[int]=REQ(converter=to_non_negative_int, default=None),
                    start: Optional[datetime]=REQ(converter=to_utc_datetime, default=None),
                    end: Optional[datetime]=REQ(converter=to_utc_datetime, default=None),
-                   realm: Optional[Realm]=None, for_installation: bool=False,
-                   remote: bool=False, remote_realm_id: Optional[int]=None,
-                   server: Optional[RemoteZulipServer]=None) -> HttpResponse:
+                   realm: Optional[Realm]=None, for_installation: bool=False) -> HttpResponse:
+    aggregate_table = RealmCount
     if for_installation:
-        if remote:
-            aggregate_table = RemoteInstallationCount
-            assert server is not None
-        else:
-            aggregate_table = InstallationCount
-    else:
-        if remote:
-            aggregate_table = RemoteRealmCount
-            assert server is not None
-            assert remote_realm_id is not None
-        else:
-            aggregate_table = RealmCount
+        aggregate_table = InstallationCount
 
     if chart_name == 'number_of_humans':
         stats = [
@@ -218,60 +147,29 @@ def get_chart_data(request: HttpRequest, user_profile: UserProfile, chart_name:
                             {'start': start, 'end': end})
 
     if realm is None:
-        # Note that this value is invalid for Remote tables; be
-        # careful not to access it in those code paths.
         realm = user_profile.realm
-
-    if remote:
-        # For remote servers, we don't have fillstate data, and thus
-        # should simply use the first and last data points for the
-        # table.
-        assert server is not None
-        if not aggregate_table.objects.filter(server=server).exists():
-            raise JsonableError(_("No analytics data available. Please contact your server administrator."))
-        if start is None:
-            start = aggregate_table.objects.filter(server=server).first().end_time
-        if end is None:
-            end = aggregate_table.objects.filter(server=server).last().end_time
-    else:
-        # Otherwise, we can use tables on the current server to
-        # determine a nice range, and some additional validation.
-        if start is None:
-            if for_installation:
-                start = installation_epoch()
-            else:
-                start = realm.date_created
-        if end is None:
-            end = max(last_successful_fill(stat.property) or
-                      datetime.min.replace(tzinfo=timezone_utc) for stat in stats)
-        if start > end:
-            logging.warning("User from realm %s attempted to access /stats, but the computed "
-                            "start time: %s (creation of realm or installation) is later than the computed "
-                            "end time: %s (last successful analytics update). Is the "
-                            "analytics cron job running?" % (realm.string_id, start, end))
-            raise JsonableError(_("No analytics data available. Please contact your server administrator."))
+    if start is None:
+        if for_installation:
+            start = installation_epoch()
+        else:
+            start = realm.date_created
+    if end is None:
+        end = max(last_successful_fill(stat.property) or
+                  datetime.min.replace(tzinfo=timezone_utc) for stat in stats)
+    if end is None or start > end:
+        logging.warning("User from realm %s attempted to access /stats, but the computed "
+                        "start time: %s (creation of realm or installation) is later than the computed "
+                        "end time: %s (last successful analytics update). Is the "
+                        "analytics cron job running?" % (realm.string_id, start, end))
+        raise JsonableError(_("No analytics data available. Please contact your server administrator."))
 
     assert len(set([stat.frequency for stat in stats])) == 1
     end_times = time_range(start, end, stats[0].frequency, min_length)
     data = {'end_times': end_times, 'frequency': stats[0].frequency}  # type: Dict[str, Any]
 
-    aggregation_level = {
-        InstallationCount: 'everyone',
-        RealmCount: 'everyone',
-        RemoteInstallationCount: 'everyone',
-        RemoteRealmCount: 'everyone',
-        UserCount: 'user',
-    }
+    aggregation_level = {InstallationCount: 'everyone', RealmCount: 'everyone', UserCount: 'user'}
     # -1 is a placeholder value, since there is no relevant filtering on InstallationCount
-    id_value = {
-        InstallationCount: -1,
-        RealmCount: realm.id,
-        RemoteInstallationCount: server.id if server is not None else None,
-        # TODO: RemoteRealmCount logic doesn't correctly handle
-        # filtering by server_id as well.
-        RemoteRealmCount: remote_realm_id,
-        UserCount: user_profile.id,
-    }
+    id_value = {InstallationCount: -1, RealmCount: realm.id, UserCount: user_profile.id}
     for table in tables:
         data[aggregation_level[table]] = {}
         for stat in stats:
@@ -315,10 +213,6 @@ def table_filtered_to_id(table: Type[BaseCount], key_id: int) -> QuerySet:
         return StreamCount.objects.filter(stream_id=key_id)
     elif table == InstallationCount:
         return InstallationCount.objects.all()
-    elif table == RemoteInstallationCount:
-        return RemoteInstallationCount.objects.filter(server_id=key_id)
-    elif table == RemoteRealmCount:
-        return RemoteRealmCount.objects.filter(realm_id=key_id)
     else:
         raise AssertionError("Unknown table: %s" % (table,))
 
@@ -407,7 +301,7 @@ def get_realm_day_counts() -> Dict[str, Dict[str, str]]:
     query = '''
         select
             r.string_id,
-            (now()::date - date_sent::date) age,
+            (now()::date - pub_date::date) age,
             count(*) cnt
         from zerver_message m
         join zerver_userprofile up on up.id = m.sender_id
@@ -416,7 +310,7 @@ def get_realm_day_counts() -> Dict[str, Dict[str, str]]:
         where
             (not up.is_bot)
         and
-            date_sent > now()::date - interval '8 day'
+            pub_date > now()::date - interval '8 day'
         and
             c.name not in ('zephyr_mirror', 'ZulipMonitoring')
         group by
@@ -459,9 +353,6 @@ def get_realm_day_counts() -> Dict[str, Dict[str, str]]:
 
     return result
 
-def get_plan_name(plan_type: int) -> str:
-    return ['', 'self hosted', 'limited', 'standard', 'open source'][plan_type]
-
 def realm_summary_table(realm_minutes: Dict[str, float]) -> str:
     now = timezone_now()
 
@@ -522,7 +413,7 @@ def realm_summary_table(realm_minutes: Dict[str, float]) -> str:
                 FROM (
                     SELECT
                         realm.id as realm_id,
-                        up.delivery_email
+                        up.email
                     FROM zerver_useractivity ua
                     JOIN zerver_userprofile up
                         ON up.id = ua.user_profile_id
@@ -539,7 +430,7 @@ def realm_summary_table(realm_minutes: Dict[str, float]) -> str:
                             '/json/users/me/pointer',
                             'update_pointer_backend'
                         )
-                    GROUP by realm.id, up.delivery_email
+                    GROUP by realm.id, up.email
                     HAVING max(last_visit) > now() - interval '7 day'
                 ) as wau_users
                 GROUP BY realm_id
@@ -577,14 +468,15 @@ def realm_summary_table(realm_minutes: Dict[str, float]) -> str:
     # Fetch all the realm administrator users
     realm_admins = defaultdict(list)  # type: Dict[str, List[str]]
     for up in UserProfile.objects.select_related("realm").filter(
-        role=UserProfile.ROLE_REALM_ADMINISTRATOR,
+        is_realm_admin=True,
         is_active=True
     ):
-        realm_admins[up.realm.string_id].append(up.delivery_email)
+        realm_admins[up.realm.string_id].append(up.email)
 
     for row in rows:
         row['date_created_day'] = row['date_created'].strftime('%Y-%m-%d')
-        row['plan_type_string'] = get_plan_name(row['plan_type'])
+        row['plan_type_string'] = [
+            '', 'self hosted', 'limited', 'standard', 'standard free'][row['plan_type']]
         row['age_days'] = int((now - row['date_created']).total_seconds()
                               / 86400)
         row['is_new'] = row['age_days'] < 12 * 7
@@ -598,16 +490,6 @@ def realm_summary_table(realm_minutes: Dict[str, float]) -> str:
         except Exception:
             row['history'] = ''
 
-    # estimate annual subscription revenue
-    total_amount = 0
-    if settings.BILLING_ENABLED:
-        from corporate.lib.stripe import estimate_annual_recurring_revenue_by_realm
-        estimated_arrs = estimate_annual_recurring_revenue_by_realm()
-        for row in rows:
-            if row['string_id'] in estimated_arrs:
-                row['amount'] = estimated_arrs[row['string_id']]
-        total_amount += sum(estimated_arrs.values())
-
     # augment data with realm_minutes
     total_hours = 0.0
     for row in rows:
@@ -643,10 +525,9 @@ def realm_summary_table(realm_minutes: Dict[str, float]) -> str:
         total_bot_count += int(row['bot_count'])
         total_wau_count += int(row['wau_count'])
 
-    total_row = dict(
+    rows.append(dict(
         string_id='Total',
         plan_type_string="",
-        amount=total_amount,
         stats_link = '',
         date_created_day='',
         realm_admin_email='',
@@ -655,9 +536,7 @@ def realm_summary_table(realm_minutes: Dict[str, float]) -> str:
         bot_count=total_bot_count,
         hours=int(total_hours),
         wau_count=total_wau_count,
-    )
-
-    rows.insert(0, total_row)
+    ))
 
     content = loader.render_to_string(
         'analytics/realm_summary_table.html',
@@ -683,15 +562,15 @@ def user_activity_intervals() -> Tuple[mark_safe, Dict[str, float]]:
     ).only(
         'start',
         'end',
-        'user_profile__delivery_email',
+        'user_profile__email',
         'user_profile__realm__string_id'
     ).order_by(
         'user_profile__realm__string_id',
-        'user_profile__delivery_email'
+        'user_profile__email'
     )
 
     by_string_id = lambda row: row.user_profile.realm.string_id
-    by_email = lambda row: row.user_profile.delivery_email
+    by_email = lambda row: row.user_profile.email
 
     realm_minutes = {}
 
@@ -740,7 +619,7 @@ def sent_messages_report(realm: str) -> str:
         ) as series
         left join (
             select
-                date_sent::date date_sent,
+                pub_date::date pub_date,
                 count(*) cnt
             from zerver_message m
             join zerver_userprofile up on up.id = m.sender_id
@@ -750,16 +629,16 @@ def sent_messages_report(realm: str) -> str:
             and
                 (not up.is_bot)
             and
-                date_sent > now() - interval '2 week'
+                pub_date > now() - interval '2 week'
             group by
-                date_sent::date
+                pub_date::date
             order by
-                date_sent::date
+                pub_date::date
         ) humans on
-            series.day = humans.date_sent
+            series.day = humans.pub_date
         left join (
             select
-                date_sent::date date_sent,
+                pub_date::date pub_date,
                 count(*) cnt
             from zerver_message m
             join zerver_userprofile up on up.id = m.sender_id
@@ -769,13 +648,13 @@ def sent_messages_report(realm: str) -> str:
             and
                 up.is_bot
             and
-                date_sent > now() - interval '2 week'
+                pub_date > now() - interval '2 week'
             group by
-                date_sent::date
+                pub_date::date
             order by
-                date_sent::date
+                pub_date::date
         ) bots on
-            series.day = bots.date_sent
+            series.day = bots.pub_date
     '''
     cursor = connection.cursor()
     cursor.execute(query, [realm, realm])
@@ -785,8 +664,7 @@ def sent_messages_report(realm: str) -> str:
     return make_table(title, cols, rows)
 
 def ad_hoc_queries() -> List[Dict[str, str]]:
-    def get_page(query: str, cols: List[str], title: str,
-                 totals_columns: List[int]=[]) -> Dict[str, str]:
+    def get_page(query: str, cols: List[str], title: str) -> Dict[str, str]:
         cursor = connection.cursor()
         cursor.execute(query)
         rows = cursor.fetchall()
@@ -798,24 +676,11 @@ def ad_hoc_queries() -> List[Dict[str, str]]:
             for row in rows:
                 row[i] = fixup_func(row[i])
 
-        total_row = []
         for i, col in enumerate(cols):
             if col == 'Realm':
                 fix_rows(i, realm_activity_link)
             elif col in ['Last time', 'Last visit']:
                 fix_rows(i, format_date_for_activity_reports)
-            elif col == 'Hostname':
-                for row in rows:
-                    row[i] = remote_installation_stats_link(row[0], row[i])
-            if len(totals_columns) > 0:
-                if i == 0:
-                    total_row.append("Total")
-                elif i in totals_columns:
-                    total_row.append(str(sum(row[i] for row in rows if row[i] is not None)))
-                else:
-                    total_row.append('')
-        if len(totals_columns) > 0:
-            rows.insert(0, total_row)
 
         content = make_table(title, cols, rows)
 
@@ -965,49 +830,6 @@ def ad_hoc_queries() -> List[Dict[str, str]]:
 
     pages.append(get_page(query, cols, title))
 
-    title = 'Remote Zulip servers'
-
-    query = '''
-        with icount as (
-            select
-                server_id,
-                max(value) as max_value,
-                max(end_time) as max_end_time
-            from zilencer_remoteinstallationcount
-            where
-                property='active_users:is_bot:day'
-                and subgroup='false'
-            group by server_id
-            ),
-        remote_push_devices as (
-            select server_id, count(distinct(user_id)) as push_user_count from zilencer_remotepushdevicetoken
-            group by server_id
-        )
-        select
-            rserver.id,
-            rserver.hostname,
-            rserver.contact_email,
-            max_value,
-            push_user_count,
-            max_end_time
-        from zilencer_remotezulipserver rserver
-        left join icount on icount.server_id = rserver.id
-        left join remote_push_devices on remote_push_devices.server_id = rserver.id
-        order by max_value DESC NULLS LAST, push_user_count DESC NULLS LAST
-    '''
-
-    cols = [
-        'ID',
-        'Hostname',
-        'Contact email',
-        'Analytics users',
-        'Mobile users',
-        'Last update time',
-    ]
-
-    pages.append(get_page(query, cols, title,
-                          totals_columns=[3, 4]))
-
     return pages
 
 @require_server_admin
@@ -1030,138 +852,10 @@ def get_activity(request: HttpRequest) -> HttpResponse:
         context=dict(data=data, title=title, is_home=True),
     )
 
-def get_confirmations(types: List[int], object_ids: List[int],
-                      hostname: Optional[str]=None) -> List[Dict[str, Any]]:
-    lowest_datetime = timezone_now() - timedelta(days=30)
-    confirmations = Confirmation.objects.filter(type__in=types, object_id__in=object_ids,
-                                                date_sent__gte=lowest_datetime)
-    confirmation_dicts = []
-    for confirmation in confirmations:
-        realm = confirmation.realm
-        content_object = confirmation.content_object
-
-        if realm is not None:
-            realm_host = realm.host
-        elif isinstance(content_object, Realm):
-            realm_host = content_object.host
-        else:
-            realm_host = hostname
-
-        type = confirmation.type
-        days_to_activate = _properties[type].validity_in_days
-        expiry_date = confirmation.date_sent + timedelta(days=days_to_activate)
-
-        if hasattr(content_object, "status"):
-            if content_object.status == STATUS_ACTIVE:
-                link_status = "Link has been clicked"
-            else:
-                link_status = "Link has never been clicked"
-        else:
-            link_status = ""
-
-        if timezone_now() < expiry_date:
-            expires_in = timesince(confirmation.date_sent, expiry_date)
-        else:
-            expires_in = "Expired"
-
-        url = confirmation_url(confirmation.confirmation_key, realm_host, type)
-        confirmation_dicts.append({"object": confirmation.content_object,
-                                   "url": url, "type": type, "link_status": link_status,
-                                   "expires_in": expires_in})
-    return confirmation_dicts
-
-@require_server_admin
-def support(request: HttpRequest) -> HttpResponse:
-    context = {}  # type: Dict[str, Any]
-    if settings.BILLING_ENABLED and request.method == "POST":
-        realm_id = request.POST.get("realm_id", None)
-        realm = Realm.objects.get(id=realm_id)
-
-        new_plan_type = request.POST.get("plan_type", None)
-        if new_plan_type is not None:
-            new_plan_type = int(new_plan_type)
-            current_plan_type = realm.plan_type
-            do_change_plan_type(realm, new_plan_type)
-            msg = "Plan type of {} changed from {} to {} ".format(realm.name,
-                                                                  get_plan_name(current_plan_type),
-                                                                  get_plan_name(new_plan_type))
-            context["message"] = msg
-
-        new_discount = request.POST.get("discount", None)
-        if new_discount is not None:
-            new_discount = Decimal(new_discount)
-            current_discount = get_discount_for_realm(realm)
-            attach_discount_to_realm(realm, new_discount)
-            msg = "Discount of {} changed to {} from {} ".format(realm.name, new_discount, current_discount)
-            context["message"] = msg
-
-        status = request.POST.get("status", None)
-        if status is not None:
-            if status == "active":
-                do_send_realm_reactivation_email(realm)
-                context["message"] = "Realm reactivation email sent to admins of {}.".format(realm.name)
-            elif status == "deactivated":
-                do_deactivate_realm(realm, request.user)
-                context["message"] = "{} deactivated.".format(realm.name)
-
-        scrub_realm = request.POST.get("scrub_realm", None)
-        if scrub_realm is not None:
-            if scrub_realm == "scrub_realm":
-                do_scrub_realm(realm)
-                context["message"] = "{} scrubbed.".format(realm.name)
-
-    query = request.GET.get("q", None)
-    if query:
-        key_words = get_invitee_emails_set(query)
-
-        context["users"] = UserProfile.objects.filter(delivery_email__in=key_words)
-        realms = set(Realm.objects.filter(string_id__in=key_words))
-
-        for key_word in key_words:
-            try:
-                URLValidator()(key_word)
-                parse_result = urllib.parse.urlparse(key_word)
-                hostname = parse_result.hostname
-                assert hostname is not None
-                if parse_result.port:
-                    hostname = "{}:{}".format(hostname, parse_result.port)
-                subdomain = get_subdomain_from_hostname(hostname)
-                try:
-                    realms.add(get_realm(subdomain))
-                except Realm.DoesNotExist:
-                    pass
-            except ValidationError:
-                pass
-
-        context["realms"] = realms
-
-        confirmations = []  # type: List[Dict[str, Any]]
-
-        preregistration_users = PreregistrationUser.objects.filter(email__in=key_words)
-        confirmations += get_confirmations([Confirmation.USER_REGISTRATION, Confirmation.INVITATION,
-                                            Confirmation.REALM_CREATION], preregistration_users,
-                                           hostname=request.get_host())
-
-        multiuse_invites = MultiuseInvite.objects.filter(realm__in=realms)
-        confirmations += get_confirmations([Confirmation.MULTIUSE_INVITE], multiuse_invites)
-
-        confirmations += get_confirmations([Confirmation.REALM_REACTIVATION], [realm.id for realm in realms])
-
-        context["confirmations"] = confirmations
-
-    def realm_admin_emails(realm: Realm) -> str:
-        return ", ".join(realm.get_human_admin_users().values_list("delivery_email", flat=True))
-
-    context["realm_admin_emails"] = realm_admin_emails
-    context["get_discount_for_realm"] = get_discount_for_realm
-    context["realm_icon_url"] = realm_icon_url
-    context["Confirmation"] = Confirmation
-    return render(request, 'analytics/support.html', context=context)
-
 def get_user_activity_records_for_realm(realm: str, is_bot: bool) -> QuerySet:
     fields = [
         'user_profile__full_name',
-        'user_profile__delivery_email',
+        'user_profile__email',
         'query',
         'client__name',
         'count',
@@ -1173,7 +867,7 @@ def get_user_activity_records_for_realm(realm: str, is_bot: bool) -> QuerySet:
         user_profile__is_active=True,
         user_profile__is_bot=is_bot
     )
-    records = records.order_by("user_profile__delivery_email", "-last_visit")
+    records = records.order_by("user_profile__email", "-last_visit")
     records = records.select_related('user_profile', 'client').only(*fields)
     return records
 
@@ -1187,7 +881,7 @@ def get_user_activity_records_for_email(email: str) -> List[QuerySet]:
     ]
 
     records = UserActivity.objects.filter(
-        user_profile__delivery_email=email
+        user_profile__email=email
     )
     records = records.order_by("-last_visit")
     records = records.select_related('user_profile', 'client').only(*fields)
@@ -1283,13 +977,7 @@ def realm_activity_link(realm_str: str) -> mark_safe:
 def realm_stats_link(realm_str: str) -> mark_safe:
     url_name = 'analytics.views.stats_for_realm'
     url = reverse(url_name, kwargs=dict(realm_str=realm_str))
-    stats_link = '<a href="{}"><i class="fa fa-pie-chart"></i>{}</a>'.format(url, realm_str)
-    return mark_safe(stats_link)
-
-def remote_installation_stats_link(server_id: int, hostname: str) -> mark_safe:
-    url_name = 'analytics.views.stats_for_remote_installation'
-    url = reverse(url_name, kwargs=dict(remote_server_id=server_id))
-    stats_link = '<a href="{}"><i class="fa fa-pie-chart"></i>{}</a>'.format(url, hostname)
+    stats_link = '<a href="{}"><i class="fa fa-pie-chart"></i></a>'.format(url, realm_str)
     return mark_safe(stats_link)
 
 def realm_client_table(user_summaries: Dict[str, Dict[str, Dict[str, Any]]]) -> str:
@@ -1367,7 +1055,7 @@ def realm_user_summary_table(all_records: List[QuerySet],
     user_records = {}
 
     def by_email(record: QuerySet) -> str:
-        return record.user_profile.delivery_email
+        return record.user_profile.email
 
     for email, records in itertools.groupby(all_records, by_email):
         user_records[email] = get_user_activity_summary(list(records))
@@ -1434,11 +1122,11 @@ def get_realm_activity(request: HttpRequest, realm_str: str) -> HttpResponse:
     all_user_records = {}  # type: Dict[str, Any]
 
     try:
-        admins = Realm.objects.get(string_id=realm_str).get_human_admin_users()
+        admins = Realm.objects.get(string_id=realm_str).get_admin_users()
     except Realm.DoesNotExist:
         return HttpResponseNotFound("Realm %s does not exist" % (realm_str,))
 
-    admin_emails = {admin.delivery_email for admin in admins}
+    admin_emails = {admin.email for admin in admins}
 
     for is_bot, page_title in [(False, 'Humans'), (True, 'Bots')]:
         all_records = list(get_user_activity_records_for_realm(realm_str, is_bot))

babel.config.js

@@ -1,17 +0,0 @@
-module.exports = {
-    presets: [
-        [
-            "@babel/preset-env",
-            {
-                corejs: 3,
-                useBuiltIns: "usage",
-            },
-        ],
-        "@babel/typescript",
-    ],
-    plugins: [
-        "@babel/proposal-class-properties",
-        ["@babel/plugin-proposal-unicode-property-regex", { useUnicodeFlag: false }],
-    ],
-    sourceType: "unambiguous",
-};

confirmation/models.py

@@ -16,11 +16,12 @@ from django.http import HttpRequest, HttpResponse
 from django.shortcuts import render
 from django.utils.timezone import now as timezone_now
 
+from zerver.lib.utils import generate_random_token
 from zerver.models import PreregistrationUser, EmailChangeStatus, MultiuseInvite, \
     UserProfile, Realm
 from random import SystemRandom
 import string
-from typing import Dict, Optional, Union
+from typing import Any, Dict, Optional, Union
 
 class ConfirmationKeyException(Exception):
     WRONG_LENGTH = 1
@@ -69,14 +70,8 @@ def create_confirmation_link(obj: ContentType, host: str,
                              confirmation_type: int,
                              url_args: Optional[Dict[str, str]]=None) -> str:
     key = generate_key()
-    realm = None
-    if hasattr(obj, 'realm'):
-        realm = obj.realm
-    elif isinstance(obj, Realm):
-        realm = obj
-
     Confirmation.objects.create(content_object=obj, date_sent=timezone_now(), confirmation_key=key,
-                                realm=realm, type=confirmation_type)
+                                realm=obj.realm, type=confirmation_type)
     return confirmation_url(key, host, confirmation_type, url_args)
 
 def confirmation_url(confirmation_key: str, host: str,
@@ -104,7 +99,6 @@ class Confirmation(models.Model):
     SERVER_REGISTRATION = 5
     MULTIUSE_INVITE = 6
     REALM_CREATION = 7
-    REALM_REACTIVATION = 8
     type = models.PositiveSmallIntegerField()  # type: int
 
     def __str__(self) -> str:
@@ -127,18 +121,8 @@ _properties = {
         'zerver.views.registration.accounts_home_from_multiuse_invite',
         validity_in_days=settings.INVITATION_LINK_VALIDITY_DAYS),
     Confirmation.REALM_CREATION: ConfirmationType('check_prereg_key_and_redirect'),
-    Confirmation.REALM_REACTIVATION: ConfirmationType('zerver.views.realm.realm_reactivation'),
 }
 
-def one_click_unsubscribe_link(user_profile: UserProfile, email_type: str) -> str:
-    """
-    Generate a unique link that a logged-out user can visit to unsubscribe from
-    Zulip e-mails without having to first log in.
-    """
-    return create_confirmation_link(user_profile, user_profile.realm.host,
-                                    Confirmation.UNSUBSCRIBE,
-                                    url_args = {'email_type': email_type})
-
 # Functions related to links generated by the generate_realm_creation_link.py
 # management command.
 # Note that being validated here will just allow the user to access the create_realm

confirmation/settings.py

@@ -2,6 +2,8 @@
 
 # Copyright: (c) 2008, Jarek Zgoda <jarek.zgoda@gmail.com>
 
+from typing import Any, Dict
+
 __revision__ = '$Id: settings.py 12 2008-11-23 19:38:52Z jarek.zgoda $'
 
 STATUS_ACTIVE = 1

corporate/lib/stripe.py

@@ -1,10 +1,8 @@
-from datetime import datetime
-from decimal import Decimal
+import datetime
 from functools import wraps
 import logging
-import math
 import os
-from typing import Any, Callable, Dict, Optional, TypeVar, Tuple, cast
+from typing import Any, Callable, Dict, Optional, TypeVar, Tuple
 import ujson
 
 from django.conf import settings
@@ -14,13 +12,14 @@ from django.utils.timezone import now as timezone_now
 from django.core.signing import Signer
 import stripe
 
+from zerver.lib.exceptions import JsonableError
 from zerver.lib.logging_util import log_to_file
 from zerver.lib.timestamp import datetime_to_timestamp, timestamp_to_datetime
 from zerver.lib.utils import generate_random_token
+from zerver.lib.actions import do_change_plan_type
 from zerver.models import Realm, UserProfile, RealmAuditLog
-from corporate.models import Customer, CustomerPlan, LicenseLedger, \
-    get_current_plan
-from zproject.config import get_secret
+from corporate.models import Customer, Plan, Coupon, BillingProcessor
+from zproject.settings import get_secret
 
 STRIPE_PUBLISHABLE_KEY = get_secret('stripe_publishable_key')
 stripe.api_key = get_secret('stripe_secret_key')
@@ -33,17 +32,30 @@ billing_logger = logging.getLogger('corporate.stripe')
 log_to_file(billing_logger, BILLING_LOG_PATH)
 log_to_file(logging.getLogger('stripe'), BILLING_LOG_PATH)
 
+## Note: this is no longer accurate, as of when we added coupons
+# To generate the fixture data in stripe_fixtures.json:
+# * Set PRINT_STRIPE_FIXTURE_DATA to True
+# * ./manage.py setup_stripe
+# * Customer.objects.all().delete()
+# * Log in as a user, and go to http://localhost:9991/upgrade/
+# * Click Add card. Enter the following billing details:
+#       Name: Ada Starr, Street: Under the sea, City: Pacific,
+#       Zip: 33333, Country: United States
+#       Card number: 4242424242424242, Expiry: 03/33, CVV: 333
+# * Click Make payment.
+# * Copy out the 4 blobs of json from the dev console into stripe_fixtures.json.
+#   The contents of that file are '{\n' + concatenate the 4 json blobs + '\n}'.
+#   Then you can run e.g. `M-x mark-whole-buffer` and `M-x indent-region` in emacs
+#   to prettify the file (and make 4 space indents).
+# * Copy out the customer id, plan id, and quantity values into
+#   corporate.tests.test_stripe.StripeTest.setUp.
+# * Set PRINT_STRIPE_FIXTURE_DATA to False
+PRINT_STRIPE_FIXTURE_DATA = False
+
 CallableT = TypeVar('CallableT', bound=Callable[..., Any])
 
-MIN_INVOICED_LICENSES = 30
-DEFAULT_INVOICE_DAYS_UNTIL_DUE = 30
-
-def get_latest_seat_count(realm: Realm) -> int:
-    non_guests = UserProfile.objects.filter(
-        realm=realm, is_active=True, is_bot=False).exclude(role=UserProfile.ROLE_GUEST).count()
-    guests = UserProfile.objects.filter(
-        realm=realm, is_active=True, is_bot=False, role=UserProfile.ROLE_GUEST).count()
-    return max(non_guests, math.ceil(guests / 5))
+def get_seat_count(realm: Realm) -> int:
+    return UserProfile.objects.filter(realm=realm, is_active=True, is_bot=False).count()
 
 def sign_string(string: str) -> Tuple[str, str]:
     salt = generate_random_token(64)
@@ -54,81 +66,13 @@ def unsign_string(signed_string: str, salt: str) -> str:
     signer = Signer(salt=salt)
     return signer.unsign(signed_string)
 
-# Be extremely careful changing this function. Historical billing periods
-# are not stored anywhere, and are just computed on the fly using this
-# function. Any change you make here should return the same value (or be
-# within a few seconds) for basically any value from when the billing system
-# went online to within a year from now.
-def add_months(dt: datetime, months: int) -> datetime:
-    assert(months >= 0)
-    # It's fine that the max day in Feb is 28 for leap years.
-    MAX_DAY_FOR_MONTH = {1: 31, 2: 28, 3: 31, 4: 30, 5: 31, 6: 30,
-                         7: 31, 8: 31, 9: 30, 10: 31, 11: 30, 12: 31}
-    year = dt.year
-    month = dt.month + months
-    while month > 12:
-        year += 1
-        month -= 12
-    day = min(dt.day, MAX_DAY_FOR_MONTH[month])
-    # datetimes don't support leap seconds, so don't need to worry about those
-    return dt.replace(year=year, month=month, day=day)
-
-def next_month(billing_cycle_anchor: datetime, dt: datetime) -> datetime:
-    estimated_months = round((dt - billing_cycle_anchor).days * 12. / 365)
-    for months in range(max(estimated_months - 1, 0), estimated_months + 2):
-        proposed_next_month = add_months(billing_cycle_anchor, months)
-        if 20 < (proposed_next_month - dt).days < 40:
-            return proposed_next_month
-    raise AssertionError('Something wrong in next_month calculation with '
-                         'billing_cycle_anchor: %s, dt: %s' % (billing_cycle_anchor, dt))
-
-def start_of_next_billing_cycle(plan: CustomerPlan, event_time: datetime) -> datetime:
-    months_per_period = {
-        CustomerPlan.ANNUAL: 12,
-        CustomerPlan.MONTHLY: 1,
-    }[plan.billing_schedule]
-    periods = 1
-    dt = plan.billing_cycle_anchor
-    while dt <= event_time:
-        dt = add_months(plan.billing_cycle_anchor, months_per_period * periods)
-        periods += 1
-    return dt
-
-def next_invoice_date(plan: CustomerPlan) -> Optional[datetime]:
-    if plan.status == CustomerPlan.ENDED:
-        return None
-    assert(plan.next_invoice_date is not None)  # for mypy
-    months_per_period = {
-        CustomerPlan.ANNUAL: 12,
-        CustomerPlan.MONTHLY: 1,
-    }[plan.billing_schedule]
-    if plan.automanage_licenses:
-        months_per_period = 1
-    periods = 1
-    dt = plan.billing_cycle_anchor
-    while dt <= plan.next_invoice_date:
-        dt = add_months(plan.billing_cycle_anchor, months_per_period * periods)
-        periods += 1
-    return dt
-
-def renewal_amount(plan: CustomerPlan, event_time: datetime) -> int:  # nocoverage: TODO
-    if plan.fixed_price is not None:
-        return plan.fixed_price
-    last_ledger_entry = make_end_of_cycle_updates_if_needed(plan, event_time)
-    if last_ledger_entry is None:
-        return 0
-    if last_ledger_entry.licenses_at_next_renewal is None:
-        return 0
-    assert(plan.price_per_license is not None)  # for mypy
-    return plan.price_per_license * last_ledger_entry.licenses_at_next_renewal
-
 class BillingError(Exception):
     # error messages
-    CONTACT_SUPPORT = _("Something went wrong. Please contact %s.") % (settings.ZULIP_ADMINISTRATOR,)
+    CONTACT_SUPPORT = _("Something went wrong. Please contact %s." % (settings.ZULIP_ADMINISTRATOR,))
     TRY_RELOADING = _("Something went wrong. Please reload the page.")
 
     # description is used only for tests
-    def __init__(self, description: str, message: str=CONTACT_SUPPORT) -> None:
+    def __init__(self, description: str, message: str) -> None:
         self.description = description
         self.message = message
 
@@ -145,6 +89,9 @@ def catch_stripe_errors(func: CallableT) -> CallableT:
             if STRIPE_PUBLISHABLE_KEY is None:
                 raise BillingError('missing stripe config', "Missing Stripe config. "
                                    "See https://zulip.readthedocs.io/en/latest/subsystems/billing.html.")
+            if not Plan.objects.exists():
+                raise BillingError('missing plans',
+                                   "Plan objects not created. Please run ./manage.py setup_stripe")
         try:
             return func(*args, **kwargs)
         # See https://stripe.com/docs/api/python#error_handling, though
@@ -167,20 +114,70 @@ def catch_stripe_errors(func: CallableT) -> CallableT:
 
 @catch_stripe_errors
 def stripe_get_customer(stripe_customer_id: str) -> stripe.Customer:
-    return stripe.Customer.retrieve(stripe_customer_id, expand=["default_source"])
+    stripe_customer = stripe.Customer.retrieve(stripe_customer_id, expand=["default_source"])
+    if PRINT_STRIPE_FIXTURE_DATA:
+        print(''.join(['"customer_with_subscription": ', str(stripe_customer), ',']))  # nocoverage
+    return stripe_customer
 
 @catch_stripe_errors
-def do_create_stripe_customer(user: UserProfile, stripe_token: Optional[str]=None) -> Customer:
+def stripe_get_upcoming_invoice(stripe_customer_id: str) -> stripe.Invoice:
+    stripe_invoice = stripe.Invoice.upcoming(customer=stripe_customer_id)
+    if PRINT_STRIPE_FIXTURE_DATA:
+        print(''.join(['"upcoming_invoice": ', str(stripe_invoice), ',']))  # nocoverage
+    return stripe_invoice
+
+@catch_stripe_errors
+def stripe_get_invoice_preview_for_downgrade(
+        stripe_customer_id: str, stripe_subscription_id: str,
+        stripe_subscriptionitem_id: str) -> stripe.Invoice:
+    return stripe.Invoice.upcoming(
+        customer=stripe_customer_id, subscription=stripe_subscription_id,
+        subscription_items=[{'id': stripe_subscriptionitem_id, 'quantity': 0}])
+
+def preview_invoice_total_for_downgrade(stripe_customer: stripe.Customer) -> int:
+    stripe_subscription = extract_current_subscription(stripe_customer)
+    if stripe_subscription is None:
+        # Most likely situation is: user A goes to billing page, user B
+        # cancels subscription, user A clicks on "downgrade" or something
+        # else that calls this function.
+        billing_logger.error("Trying to extract subscription item that doesn't exist, for Stripe customer %s"
+                             % (stripe_customer.id,))
+        raise BillingError('downgrade without subscription', BillingError.TRY_RELOADING)
+    for item in stripe_subscription['items']:
+        # There should only be one item, but we can't index into stripe_subscription['items']
+        stripe_subscriptionitem_id = item.id
+    return stripe_get_invoice_preview_for_downgrade(
+        stripe_customer.id, stripe_subscription.id, stripe_subscriptionitem_id).total
+
+# Return type should be Optional[stripe.Subscription], which throws a mypy error.
+# Will fix once we add type stubs for the Stripe API.
+def extract_current_subscription(stripe_customer: stripe.Customer) -> Any:
+    if not stripe_customer.subscriptions:
+        return None
+    for stripe_subscription in stripe_customer.subscriptions:
+        if stripe_subscription.status != "canceled":
+            return stripe_subscription
+    return None
+
+@catch_stripe_errors
+def do_create_customer(user: UserProfile, stripe_token: Optional[str]=None,
+                       coupon: Optional[Coupon]=None) -> stripe.Customer:
     realm = user.realm
+    stripe_coupon_id = None
+    if coupon is not None:
+        stripe_coupon_id = coupon.stripe_coupon_id
     # We could do a better job of handling race conditions here, but if two
     # people from a realm try to upgrade at exactly the same time, the main
     # bad thing that will happen is that we will create an extra stripe
     # customer that we can delete or ignore.
     stripe_customer = stripe.Customer.create(
         description="%s (%s)" % (realm.string_id, realm.name),
-        email=user.delivery_email,
+        email=user.email,
         metadata={'realm_id': realm.id, 'realm_str': realm.string_id},
-        source=stripe_token)
+        source=stripe_token,
+        coupon=stripe_coupon_id)
+    if PRINT_STRIPE_FIXTURE_DATA:
+        print(''.join(['"create_customer": ', str(stripe_customer), ',']))  # nocoverage
     event_time = timestamp_to_datetime(stripe_customer.created)
     with transaction.atomic():
         RealmAuditLog.objects.create(
@@ -190,309 +187,231 @@ def do_create_stripe_customer(user: UserProfile, stripe_token: Optional[str]=Non
             RealmAuditLog.objects.create(
                 realm=user.realm, acting_user=user, event_type=RealmAuditLog.STRIPE_CARD_CHANGED,
                 event_time=event_time)
-        customer, created = Customer.objects.update_or_create(realm=realm, defaults={
-            'stripe_customer_id': stripe_customer.id})
+        Customer.objects.create(realm=realm, stripe_customer_id=stripe_customer.id)
         user.is_billing_admin = True
         user.save(update_fields=["is_billing_admin"])
-    return customer
+    return stripe_customer
 
 @catch_stripe_errors
-def do_replace_payment_source(user: UserProfile, stripe_token: str,
-                              pay_invoices: bool=False) -> stripe.Customer:
+def do_replace_payment_source(user: UserProfile, stripe_token: str) -> stripe.Customer:
     stripe_customer = stripe_get_customer(Customer.objects.get(realm=user.realm).stripe_customer_id)
     stripe_customer.source = stripe_token
     # Deletes existing card: https://stripe.com/docs/api#update_customer-source
+    # This can also have other side effects, e.g. it will try to pay certain past-due
+    # invoices: https://stripe.com/docs/api#update_customer
     updated_stripe_customer = stripe.Customer.save(stripe_customer)
     RealmAuditLog.objects.create(
         realm=user.realm, acting_user=user, event_type=RealmAuditLog.STRIPE_CARD_CHANGED,
         event_time=timezone_now())
-    if pay_invoices:
-        for stripe_invoice in stripe.Invoice.list(
-                billing='charge_automatically', customer=stripe_customer.id, status='open'):
-            # The user will get either a receipt or a "failed payment" email, but the in-app
-            # messaging could be clearer here (e.g. it could explictly tell the user that there
-            # were payment(s) and that they succeeded or failed).
-            # Worth fixing if we notice that a lot of cards end up failing at this step.
-            stripe.Invoice.pay(stripe_invoice)
     return updated_stripe_customer
 
-# event_time should roughly be timezone_now(). Not designed to handle
-# event_times in the past or future
-def make_end_of_cycle_updates_if_needed(plan: CustomerPlan,
-                                        event_time: datetime) -> Optional[LicenseLedger]:
-    last_ledger_entry = LicenseLedger.objects.filter(plan=plan).order_by('-id').first()
-    last_renewal = LicenseLedger.objects.filter(plan=plan, is_renewal=True) \
-                                        .order_by('-id').first().event_time
-    next_billing_cycle = start_of_next_billing_cycle(plan, last_renewal)
-    if next_billing_cycle <= event_time:
-        if plan.status == CustomerPlan.ACTIVE:
-            return LicenseLedger.objects.create(
-                plan=plan, is_renewal=True, event_time=next_billing_cycle,
-                licenses=last_ledger_entry.licenses_at_next_renewal,
-                licenses_at_next_renewal=last_ledger_entry.licenses_at_next_renewal)
-        if plan.status == CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE:
-            process_downgrade(plan)
-        return None
-    return last_ledger_entry
-
-# Returns Customer instead of stripe_customer so that we don't make a Stripe
-# API call if there's nothing to update
-def update_or_create_stripe_customer(user: UserProfile, stripe_token: Optional[str]=None) -> Customer:
-    realm = user.realm
-    customer = Customer.objects.filter(realm=realm).first()
-    if customer is None or customer.stripe_customer_id is None:
-        return do_create_stripe_customer(user, stripe_token=stripe_token)
-    if stripe_token is not None:
-        do_replace_payment_source(user, stripe_token)
-    return customer
-
-def compute_plan_parameters(
-        automanage_licenses: bool, billing_schedule: int,
-        discount: Optional[Decimal]) -> Tuple[datetime, datetime, datetime, int]:
-    # Everything in Stripe is stored as timestamps with 1 second resolution,
-    # so standardize on 1 second resolution.
-    # TODO talk about leapseconds?
-    billing_cycle_anchor = timezone_now().replace(microsecond=0)
-    if billing_schedule == CustomerPlan.ANNUAL:
-        # TODO use variables to account for Zulip Plus
-        price_per_license = 8000
-        period_end = add_months(billing_cycle_anchor, 12)
-    elif billing_schedule == CustomerPlan.MONTHLY:
-        price_per_license = 800
-        period_end = add_months(billing_cycle_anchor, 1)
-    else:
-        raise AssertionError('Unknown billing_schedule: {}'.format(billing_schedule))
-    if discount is not None:
-        # There are no fractional cents in Stripe, so round down to nearest integer.
-        price_per_license = int(float(price_per_license * (1 - discount / 100)) + .00001)
-    next_invoice_date = period_end
-    if automanage_licenses:
-        next_invoice_date = add_months(billing_cycle_anchor, 1)
-    return billing_cycle_anchor, next_invoice_date, period_end, price_per_license
-
-# Only used for cloud signups
 @catch_stripe_errors
-def process_initial_upgrade(user: UserProfile, licenses: int, automanage_licenses: bool,
-                            billing_schedule: int, stripe_token: Optional[str]) -> None:
-    realm = user.realm
-    customer = update_or_create_stripe_customer(user, stripe_token=stripe_token)
-    if get_current_plan(customer) is not None:
-        # Unlikely race condition from two people upgrading (clicking "Make payment")
-        # at exactly the same time. Doesn't fully resolve the race condition, but having
-        # a check here reduces the likelihood.
-        billing_logger.warning(
-            "Customer {} trying to upgrade, but has an active subscription".format(customer))
+def do_replace_coupon(user: UserProfile, coupon: Coupon) -> stripe.Customer:
+    stripe_customer = stripe_get_customer(Customer.objects.get(realm=user.realm).stripe_customer_id)
+    stripe_customer.coupon = coupon.stripe_coupon_id
+    return stripe.Customer.save(stripe_customer)
+
+@catch_stripe_errors
+def do_subscribe_customer_to_plan(user: UserProfile, stripe_customer: stripe.Customer, stripe_plan_id: str,
+                                  seat_count: int, tax_percent: float) -> None:
+    if extract_current_subscription(stripe_customer) is not None:
+        # Most likely due to two people in the org going to the billing page,
+        # and then both upgrading their plan. We don't send clients
+        # real-time event updates for the billing pages, so this is more
+        # likely than it would be in other parts of the app.
+        billing_logger.error("Stripe customer %s trying to subscribe to %s, "
+                             "but has an active subscription" % (stripe_customer.id, stripe_plan_id))
         raise BillingError('subscribing with existing subscription', BillingError.TRY_RELOADING)
+    customer = Customer.objects.get(stripe_customer_id=stripe_customer.id)
+    # Note that there is a race condition here, where if two users upgrade at exactly the
+    # same time, they will have two subscriptions, and get charged twice. We could try to
+    # reduce the chance of it with a well-designed idempotency_key, but it's not easy since
+    # we also need to be careful not to block the customer from retrying if their
+    # subscription attempt fails (e.g. due to insufficient funds).
 
-    billing_cycle_anchor, next_invoice_date, period_end, price_per_license = compute_plan_parameters(
-        automanage_licenses, billing_schedule, customer.default_discount)
-    # The main design constraint in this function is that if you upgrade with a credit card, and the
-    # charge fails, everything should be rolled back as if nothing had happened. This is because we
-    # expect frequent card failures on initial signup.
-    # Hence, if we're going to charge a card, do it at the beginning, even if we later may have to
-    # adjust the number of licenses.
-    charge_automatically = stripe_token is not None
-    if charge_automatically:
-        stripe_charge = stripe.Charge.create(
-            amount=price_per_license * licenses,
-            currency='usd',
-            customer=customer.stripe_customer_id,
-            description="Upgrade to Zulip Standard, ${} x {}".format(price_per_license/100, licenses),
-            receipt_email=user.delivery_email,
-            statement_descriptor='Zulip Standard')
-        # Not setting a period start and end, but maybe we should? Unclear what will make things
-        # most similar to the renewal case from an accounting perspective.
-        stripe.InvoiceItem.create(
-            amount=price_per_license * licenses * -1,
-            currency='usd',
-            customer=customer.stripe_customer_id,
-            description="Payment (Card ending in {})".format(cast(stripe.Card, stripe_charge.source).last4),
-            discountable=False)
-
-    # TODO: The correctness of this relies on user creation, deactivation, etc being
-    # in a transaction.atomic() with the relevant RealmAuditLog entries
+    # Success here implies the stripe_customer was charged: https://stripe.com/docs/billing/lifecycle#active
+    # Otherwise we should expect it to throw a stripe.error.
+    stripe_subscription = stripe.Subscription.create(
+        customer=stripe_customer.id,
+        billing='charge_automatically',
+        items=[{
+            'plan': stripe_plan_id,
+            'quantity': seat_count,
+        }],
+        prorate=True,
+        tax_percent=tax_percent)
+    if PRINT_STRIPE_FIXTURE_DATA:
+        print(''.join(['"create_subscription": ', str(stripe_subscription), ',']))  # nocoverage
     with transaction.atomic():
-        # billed_licenses can greater than licenses if users are added between the start of
-        # this function (process_initial_upgrade) and now
-        billed_licenses = max(get_latest_seat_count(realm), licenses)
-        plan_params = {
-            'automanage_licenses': automanage_licenses,
-            'charge_automatically': charge_automatically,
-            'price_per_license': price_per_license,
-            'discount': customer.default_discount,
-            'billing_cycle_anchor': billing_cycle_anchor,
-            'billing_schedule': billing_schedule,
-            'tier': CustomerPlan.STANDARD}
-        plan = CustomerPlan.objects.create(
-            customer=customer,
-            next_invoice_date=next_invoice_date,
-            **plan_params)
-        ledger_entry = LicenseLedger.objects.create(
-            plan=plan,
-            is_renewal=True,
-            event_time=billing_cycle_anchor,
-            licenses=billed_licenses,
-            licenses_at_next_renewal=billed_licenses)
-        plan.invoiced_through = ledger_entry
-        plan.save(update_fields=['invoiced_through'])
+        customer.has_billing_relationship = True
+        customer.save(update_fields=['has_billing_relationship'])
+        customer.realm.has_seat_based_plan = True
+        customer.realm.save(update_fields=['has_seat_based_plan'])
         RealmAuditLog.objects.create(
-            realm=realm, acting_user=user, event_time=billing_cycle_anchor,
-            event_type=RealmAuditLog.CUSTOMER_PLAN_CREATED,
-            extra_data=ujson.dumps(plan_params))
-    stripe.InvoiceItem.create(
-        currency='usd',
-        customer=customer.stripe_customer_id,
-        description='Zulip Standard',
-        discountable=False,
-        period = {'start': datetime_to_timestamp(billing_cycle_anchor),
-                  'end': datetime_to_timestamp(period_end)},
-        quantity=billed_licenses,
-        unit_amount=price_per_license)
+            realm=customer.realm,
+            acting_user=user,
+            event_type=RealmAuditLog.STRIPE_PLAN_CHANGED,
+            event_time=timestamp_to_datetime(stripe_subscription.created),
+            extra_data=ujson.dumps({'plan': stripe_plan_id, 'quantity': seat_count}))
 
-    if charge_automatically:
-        billing_method = 'charge_automatically'
-        days_until_due = None
-    else:
-        billing_method = 'send_invoice'
-        days_until_due = DEFAULT_INVOICE_DAYS_UNTIL_DUE
-    stripe_invoice = stripe.Invoice.create(
-        auto_advance=True,
-        billing=billing_method,
-        customer=customer.stripe_customer_id,
-        days_until_due=days_until_due,
-        statement_descriptor='Zulip Standard')
-    stripe.Invoice.finalize_invoice(stripe_invoice)
+        current_seat_count = get_seat_count(customer.realm)
+        if seat_count != current_seat_count:
+            RealmAuditLog.objects.create(
+                realm=customer.realm,
+                event_type=RealmAuditLog.STRIPE_PLAN_QUANTITY_RESET,
+                event_time=timestamp_to_datetime(stripe_subscription.created),
+                requires_billing_update=True,
+                extra_data=ujson.dumps({'quantity': current_seat_count}))
 
-    from zerver.lib.actions import do_change_plan_type
-    do_change_plan_type(realm, Realm.STANDARD)
-
-def update_license_ledger_for_automanaged_plan(realm: Realm, plan: CustomerPlan,
-                                               event_time: datetime) -> None:
-    last_ledger_entry = make_end_of_cycle_updates_if_needed(plan, event_time)
-    if last_ledger_entry is None:
-        return
-    licenses_at_next_renewal = get_latest_seat_count(realm)
-    licenses = max(licenses_at_next_renewal, last_ledger_entry.licenses)
-    LicenseLedger.objects.create(
-        plan=plan, event_time=event_time, licenses=licenses,
-        licenses_at_next_renewal=licenses_at_next_renewal)
-
-def update_license_ledger_if_needed(realm: Realm, event_time: datetime) -> None:
-    customer = Customer.objects.filter(realm=realm).first()
+def process_initial_upgrade(user: UserProfile, plan: Plan, seat_count: int, stripe_token: str) -> None:
+    customer = Customer.objects.filter(realm=user.realm).first()
     if customer is None:
-        return
-    plan = get_current_plan(customer)
-    if plan is None:
-        return
-    if not plan.automanage_licenses:
-        return
-    update_license_ledger_for_automanaged_plan(realm, plan, event_time)
+        stripe_customer = do_create_customer(user, stripe_token=stripe_token)
+    else:
+        stripe_customer = do_replace_payment_source(user, stripe_token)
+    do_subscribe_customer_to_plan(
+        user=user,
+        stripe_customer=stripe_customer,
+        stripe_plan_id=plan.stripe_plan_id,
+        seat_count=seat_count,
+        # TODO: billing address details are passed to us in the request;
+        # use that to calculate taxes.
+        tax_percent=0)
+    do_change_plan_type(user, Realm.STANDARD)
 
-def invoice_plan(plan: CustomerPlan, event_time: datetime) -> None:
-    if plan.invoicing_status == CustomerPlan.STARTED:
-        raise NotImplementedError('Plan with invoicing_status==STARTED needs manual resolution.')
-    make_end_of_cycle_updates_if_needed(plan, event_time)
-    assert(plan.invoiced_through is not None)
-    licenses_base = plan.invoiced_through.licenses
-    invoice_item_created = False
-    for ledger_entry in LicenseLedger.objects.filter(plan=plan, id__gt=plan.invoiced_through.id,
-                                                     event_time__lte=event_time).order_by('id'):
-        price_args = {}  # type: Dict[str, int]
-        if ledger_entry.is_renewal:
-            if plan.fixed_price is not None:
-                price_args = {'amount': plan.fixed_price}
+def attach_discount_to_realm(user: UserProfile, percent_off: int) -> None:
+    coupon = Coupon.objects.get(percent_off=percent_off)
+    customer = Customer.objects.filter(realm=user.realm).first()
+    if customer is None:
+        do_create_customer(user, coupon=coupon)
+    else:
+        do_replace_coupon(user, coupon)
+
+@catch_stripe_errors
+def process_downgrade(user: UserProfile) -> None:
+    stripe_customer = stripe_get_customer(
+        Customer.objects.filter(realm=user.realm).first().stripe_customer_id)
+    subscription_balance = preview_invoice_total_for_downgrade(stripe_customer)
+    # If subscription_balance > 0, they owe us money. This is likely due to
+    # people they added in the last day, so we can just forgive it.
+    # Stripe automatically forgives it when we delete the subscription, so nothing we need to do there.
+    if subscription_balance < 0:
+        stripe_customer.account_balance = stripe_customer.account_balance + subscription_balance
+    stripe_subscription = extract_current_subscription(stripe_customer)
+    # Wish these two could be transaction.atomic
+    stripe_subscription = stripe_subscription.delete()
+    stripe.Customer.save(stripe_customer)
+    with transaction.atomic():
+        user.realm.has_seat_based_plan = False
+        user.realm.save(update_fields=['has_seat_based_plan'])
+        RealmAuditLog.objects.create(
+            realm=user.realm,
+            acting_user=user,
+            event_type=RealmAuditLog.STRIPE_PLAN_CHANGED,
+            event_time=timestamp_to_datetime(stripe_subscription.canceled_at),
+            extra_data=ujson.dumps({'plan': None, 'quantity': stripe_subscription.quantity}))
+    # Doing this last, since it results in user-visible confirmation (via
+    # product changes) that the downgrade succeeded.
+    # Keeping it out of the transaction.atomic block because it will
+    # eventually have a lot of stuff going on.
+    do_change_plan_type(user, Realm.LIMITED)
+
+## Process RealmAuditLog
+
+def do_set_subscription_quantity(
+        customer: Customer, timestamp: int, idempotency_key: str, quantity: int) -> None:
+    stripe_customer = stripe_get_customer(customer.stripe_customer_id)
+    stripe_subscription = extract_current_subscription(stripe_customer)
+    stripe_subscription.quantity = quantity
+    stripe_subscription.proration_date = timestamp
+    stripe_subscription.save(idempotency_key=idempotency_key)
+
+def do_adjust_subscription_quantity(
+        customer: Customer, timestamp: int, idempotency_key: str, delta: int) -> None:
+    stripe_customer = stripe_get_customer(customer.stripe_customer_id)
+    stripe_subscription = extract_current_subscription(stripe_customer)
+    stripe_subscription.quantity = stripe_subscription.quantity + delta
+    stripe_subscription.proration_date = timestamp
+    stripe_subscription.save(idempotency_key=idempotency_key)
+
+def increment_subscription_quantity(
+        customer: Customer, timestamp: int, idempotency_key: str) -> None:
+    return do_adjust_subscription_quantity(customer, timestamp, idempotency_key, 1)
+
+def decrement_subscription_quantity(
+        customer: Customer, timestamp: int, idempotency_key: str) -> None:
+    return do_adjust_subscription_quantity(customer, timestamp, idempotency_key, -1)
+
+@catch_stripe_errors
+def process_billing_log_entry(processor: BillingProcessor, log_row: RealmAuditLog) -> None:
+    processor.state = BillingProcessor.STARTED
+    processor.log_row = log_row
+    processor.save()
+
+    customer = Customer.objects.get(realm=log_row.realm)
+    timestamp = datetime_to_timestamp(log_row.event_time)
+    idempotency_key = 'process_billing_log_entry:%s' % (log_row.id,)
+    extra_args = {}  # type: Dict[str, Any]
+    if log_row.extra_data is not None:
+        extra_args = ujson.loads(log_row.extra_data)
+    processing_functions = {
+        RealmAuditLog.STRIPE_PLAN_QUANTITY_RESET: do_set_subscription_quantity,
+        RealmAuditLog.USER_CREATED: increment_subscription_quantity,
+        RealmAuditLog.USER_ACTIVATED: increment_subscription_quantity,
+        RealmAuditLog.USER_DEACTIVATED: decrement_subscription_quantity,
+        RealmAuditLog.USER_REACTIVATED: increment_subscription_quantity,
+    }  # type: Dict[str, Callable[..., None]]
+    processing_functions[log_row.event_type](customer, timestamp, idempotency_key, **extra_args)
+
+    processor.state = BillingProcessor.DONE
+    processor.save()
+
+def get_next_billing_log_entry(processor: BillingProcessor) -> Optional[RealmAuditLog]:
+    if processor.state == BillingProcessor.STARTED:
+        return processor.log_row
+    assert processor.state != BillingProcessor.STALLED
+    if processor.state not in [BillingProcessor.DONE, BillingProcessor.SKIPPED]:
+        raise BillingError(
+            'unknown processor state',
+            "Check for typos, since this value is sometimes set by hand: %s" % (processor.state,))
+
+    if processor.realm is None:
+        realms_with_processors = BillingProcessor.objects.exclude(
+            realm=None).values_list('realm', flat=True)
+        query = RealmAuditLog.objects.exclude(realm__in=realms_with_processors)
+    else:
+        global_processor = BillingProcessor.objects.get(realm=None)
+        query = RealmAuditLog.objects.filter(
+            realm=processor.realm, id__lt=global_processor.log_row.id)
+    return query.filter(id__gt=processor.log_row.id,
+                        requires_billing_update=True).order_by('id').first()
+
+def run_billing_processor_one_step(processor: BillingProcessor) -> bool:
+    # Returns True if a row was processed, or if processing was attempted
+    log_row = get_next_billing_log_entry(processor)
+    if log_row is None:
+        if processor.realm is not None:
+            processor.delete()
+        return False
+    try:
+        process_billing_log_entry(processor, log_row)
+        return True
+    except Exception as e:
+        # Possible errors include processing subscription quantity entries
+        # after downgrade, since the downgrade code doesn't check that
+        # billing processor is up to date
+        billing_logger.error("Error on log_row.realm=%s, event_type=%s, log_row.id=%s, "
+                             "processor.id=%s, processor.realm=%s" % (
+                                 processor.log_row.realm.string_id, processor.log_row.event_type,
+                                 processor.log_row.id, processor.id, processor.realm))
+        if isinstance(e, StripeCardError):
+            if processor.realm is None:
+                BillingProcessor.objects.create(log_row=processor.log_row,
+                                                realm=processor.log_row.realm,
+                                                state=BillingProcessor.STALLED)
+                processor.state = BillingProcessor.SKIPPED
             else:
-                assert(plan.price_per_license is not None)  # needed for mypy
-                price_args = {'unit_amount': plan.price_per_license,
-                              'quantity': ledger_entry.licenses}
-            description = "Zulip Standard - renewal"
-        elif ledger_entry.licenses != licenses_base:
-            assert(plan.price_per_license)
-            last_renewal = LicenseLedger.objects.filter(
-                plan=plan, is_renewal=True, event_time__lte=ledger_entry.event_time) \
-                .order_by('-id').first().event_time
-            period_end = start_of_next_billing_cycle(plan, ledger_entry.event_time)
-            proration_fraction = (period_end - ledger_entry.event_time) / (period_end - last_renewal)
-            price_args = {'unit_amount': int(plan.price_per_license * proration_fraction + .5),
-                          'quantity': ledger_entry.licenses - licenses_base}
-            description = "Additional license ({} - {})".format(
-                ledger_entry.event_time.strftime('%b %-d, %Y'), period_end.strftime('%b %-d, %Y'))
-
-        if price_args:
-            plan.invoiced_through = ledger_entry
-            plan.invoicing_status = CustomerPlan.STARTED
-            plan.save(update_fields=['invoicing_status', 'invoiced_through'])
-            idempotency_key = 'ledger_entry:{}'.format(ledger_entry.id)  # type: Optional[str]
-            if settings.TEST_SUITE:
-                idempotency_key = None
-            stripe.InvoiceItem.create(
-                currency='usd',
-                customer=plan.customer.stripe_customer_id,
-                description=description,
-                discountable=False,
-                period = {'start': datetime_to_timestamp(ledger_entry.event_time),
-                          'end': datetime_to_timestamp(
-                              start_of_next_billing_cycle(plan, ledger_entry.event_time))},
-                idempotency_key=idempotency_key,
-                **price_args)
-            invoice_item_created = True
-        plan.invoiced_through = ledger_entry
-        plan.invoicing_status = CustomerPlan.DONE
-        plan.save(update_fields=['invoicing_status', 'invoiced_through'])
-        licenses_base = ledger_entry.licenses
-
-    if invoice_item_created:
-        if plan.charge_automatically:
-            billing_method = 'charge_automatically'
-            days_until_due = None
-        else:
-            billing_method = 'send_invoice'
-            days_until_due = DEFAULT_INVOICE_DAYS_UNTIL_DUE
-        stripe_invoice = stripe.Invoice.create(
-            auto_advance=True,
-            billing=billing_method,
-            customer=plan.customer.stripe_customer_id,
-            days_until_due=days_until_due,
-            statement_descriptor='Zulip Standard')
-        stripe.Invoice.finalize_invoice(stripe_invoice)
-
-    plan.next_invoice_date = next_invoice_date(plan)
-    plan.save(update_fields=['next_invoice_date'])
-
-def invoice_plans_as_needed(event_time: datetime=timezone_now()) -> None:
-    for plan in CustomerPlan.objects.filter(next_invoice_date__lte=event_time):
-        invoice_plan(plan, event_time)
-
-def attach_discount_to_realm(realm: Realm, discount: Decimal) -> None:
-    Customer.objects.update_or_create(realm=realm, defaults={'default_discount': discount})
-
-def get_discount_for_realm(realm: Realm) -> Optional[Decimal]:
-    customer = Customer.objects.filter(realm=realm).first()
-    if customer is not None:
-        return customer.default_discount
-    return None
-
-def do_change_plan_status(plan: CustomerPlan, status: int) -> None:
-    plan.status = status
-    plan.save(update_fields=['status'])
-    billing_logger.info('Change plan status: Customer.id: %s, CustomerPlan.id: %s, status: %s' % (
-        plan.customer.id, plan.id, status))
-
-def process_downgrade(plan: CustomerPlan) -> None:
-    from zerver.lib.actions import do_change_plan_type
-    do_change_plan_type(plan.customer.realm, Realm.LIMITED)
-    plan.status = CustomerPlan.ENDED
-    plan.save(update_fields=['status'])
-
-def estimate_annual_recurring_revenue_by_realm() -> Dict[str, int]:  # nocoverage
-    annual_revenue = {}
-    for plan in CustomerPlan.objects.filter(
-            status=CustomerPlan.ACTIVE).select_related('customer__realm'):
-        # TODO: figure out what to do for plans that don't automatically
-        # renew, but which probably will renew
-        renewal_cents = renewal_amount(plan, timezone_now())
-        if plan.billing_schedule == CustomerPlan.MONTHLY:
-            renewal_cents *= 12
-        # TODO: Decimal stuff
-        annual_revenue[plan.customer.realm.string_id] = int(renewal_cents / 100)
-    return annual_revenue
+                processor.state = BillingProcessor.STALLED
+            processor.save()
+            return True
+        raise

corporate/management/commands/process_billing_updates.py

@@ -0,0 +1,47 @@
+"""\
+Run BillingProcessors.
+
+This management command is run via supervisor. Do not run on multiple
+machines, as the code has not been made robust to race conditions from doing
+so.  (Alternatively, you can set `BILLING_PROCESSOR_ENABLED=False` on all but
+one machine to make the command have no effect.)
+"""
+
+import time
+from typing import Any
+
+from django.conf import settings
+from django.core.management.base import BaseCommand
+
+from zerver.lib.context_managers import lockfile
+from zerver.lib.management import sleep_forever
+from corporate.lib.stripe import StripeConnectionError, \
+    run_billing_processor_one_step
+from corporate.models import BillingProcessor
+
+class Command(BaseCommand):
+    help = """Run BillingProcessors, to sync billing-relevant updates into Stripe.
+
+Run this command under supervisor.
+
+Usage: ./manage.py process_billing_updates
+"""
+
+    def handle(self, *args: Any, **options: Any) -> None:
+        if not settings.BILLING_PROCESSOR_ENABLED:
+            sleep_forever()
+
+        with lockfile("/tmp/zulip_billing_processor.lockfile"):
+            while True:
+                for processor in BillingProcessor.objects.exclude(
+                        state=BillingProcessor.STALLED):
+                    try:
+                        entry_processed = run_billing_processor_one_step(processor)
+                    except StripeConnectionError:
+                        time.sleep(5*60)
+                    # Less load on the db during times of activity
+                    # and more responsiveness when the load is low
+                    if entry_processed:
+                        time.sleep(10)
+                    else:
+                        time.sleep(2)

corporate/management/commands/setup_stripe.py

@@ -0,0 +1,55 @@
+from zerver.lib.management import ZulipBaseCommand
+from corporate.models import Plan, Coupon, Customer
+from zproject.settings import get_secret
+
+from typing import Any
+
+import stripe
+stripe.api_key = get_secret('stripe_secret_key')
+
+class Command(ZulipBaseCommand):
+    help = """Script to add the appropriate products and plans to Stripe."""
+
+    def handle(self, *args: Any, **options: Any) -> None:
+        Customer.objects.all().delete()
+        Plan.objects.all().delete()
+        Coupon.objects.all().delete()
+
+        # Zulip Cloud offerings
+        product = stripe.Product.create(
+            name="Zulip Cloud Standard",
+            type='service',
+            statement_descriptor="Zulip Cloud Standard",
+            unit_label="user")
+
+        plan = stripe.Plan.create(
+            currency='usd',
+            interval='month',
+            product=product.id,
+            amount=800,
+            billing_scheme='per_unit',
+            nickname=Plan.CLOUD_MONTHLY,
+            usage_type='licensed')
+        Plan.objects.create(nickname=Plan.CLOUD_MONTHLY, stripe_plan_id=plan.id)
+
+        plan = stripe.Plan.create(
+            currency='usd',
+            interval='year',
+            product=product.id,
+            amount=8000,
+            billing_scheme='per_unit',
+            nickname=Plan.CLOUD_ANNUAL,
+            usage_type='licensed')
+        Plan.objects.create(nickname=Plan.CLOUD_ANNUAL, stripe_plan_id=plan.id)
+
+        coupon = stripe.Coupon.create(
+            duration='forever',
+            name='25% discount',
+            percent_off=25)
+        Coupon.objects.create(percent_off=25, stripe_coupon_id=coupon.id)
+
+        coupon = stripe.Coupon.create(
+            duration='forever',
+            name='85% discount',
+            percent_off=85)
+        Coupon.objects.create(percent_off=85, stripe_coupon_id=coupon.id)

corporate/migrations/0002_customer_default_discount.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-12-12 20:19
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('corporate', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='customer',
-            name='default_discount',
-            field=models.DecimalField(decimal_places=4, max_digits=7, null=True),
-        ),
-    ]

corporate/migrations/0003_customerplan.py

@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-12-22 21:05
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('corporate', '0002_customer_default_discount'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='CustomerPlan',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('licenses', models.IntegerField()),
-                ('automanage_licenses', models.BooleanField(default=False)),
-                ('charge_automatically', models.BooleanField(default=False)),
-                ('price_per_license', models.IntegerField(null=True)),
-                ('fixed_price', models.IntegerField(null=True)),
-                ('discount', models.DecimalField(decimal_places=4, max_digits=6, null=True)),
-                ('billing_cycle_anchor', models.DateTimeField()),
-                ('billing_schedule', models.SmallIntegerField()),
-                ('billed_through', models.DateTimeField()),
-                ('next_billing_date', models.DateTimeField(db_index=True)),
-                ('tier', models.SmallIntegerField()),
-                ('status', models.SmallIntegerField(default=1)),
-                ('customer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='corporate.Customer')),
-            ],
-        ),
-    ]

corporate/migrations/0004_licenseledger.py

@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.18 on 2019-01-19 05:01
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('corporate', '0003_customerplan'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='LicenseLedger',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('is_renewal', models.BooleanField(default=False)),
-                ('event_time', models.DateTimeField()),
-                ('licenses', models.IntegerField()),
-                ('licenses_at_next_renewal', models.IntegerField(null=True)),
-                ('plan', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='corporate.CustomerPlan')),
-            ],
-        ),
-    ]

corporate/migrations/0005_customerplan_invoicing.py

@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.18 on 2019-01-28 13:04
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('corporate', '0004_licenseledger'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='customerplan',
-            old_name='next_billing_date',
-            new_name='next_invoice_date',
-        ),
-        migrations.RemoveField(
-            model_name='customerplan',
-            name='billed_through',
-        ),
-        migrations.AddField(
-            model_name='customerplan',
-            name='invoiced_through',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='corporate.LicenseLedger'),
-        ),
-        migrations.AddField(
-            model_name='customerplan',
-            name='invoicing_status',
-            field=models.SmallIntegerField(default=1),
-        ),
-    ]

corporate/migrations/0006_nullable_stripe_customer_id.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.18 on 2019-01-29 01:46
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('corporate', '0005_customerplan_invoicing'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='customer',
-            name='stripe_customer_id',
-            field=models.CharField(max_length=255, null=True, unique=True),
-        ),
-    ]

corporate/migrations/0007_remove_deprecated_fields.py

@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.18 on 2019-01-31 22:16
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('corporate', '0006_nullable_stripe_customer_id'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='billingprocessor',
-            name='log_row',
-        ),
-        migrations.RemoveField(
-            model_name='billingprocessor',
-            name='realm',
-        ),
-        migrations.DeleteModel(
-            name='Coupon',
-        ),
-        migrations.DeleteModel(
-            name='Plan',
-        ),
-        migrations.RemoveField(
-            model_name='customer',
-            name='has_billing_relationship',
-        ),
-        migrations.RemoveField(
-            model_name='customerplan',
-            name='licenses',
-        ),
-        migrations.DeleteModel(
-            name='BillingProcessor',
-        ),
-    ]

corporate/migrations/0008_nullable_next_invoice_date.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-04-11 00:45
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('corporate', '0007_remove_deprecated_fields'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='customerplan',
-            name='next_invoice_date',
-            field=models.DateTimeField(db_index=True, null=True),
-        ),
-    ]

corporate/models.py

@@ -1,73 +1,46 @@
 import datetime
-from decimal import Decimal
-from typing import Optional
 
 from django.db import models
-from django.db.models import CASCADE
 
-from zerver.models import Realm
+from zerver.models import Realm, RealmAuditLog
 
 class Customer(models.Model):
-    realm = models.OneToOneField(Realm, on_delete=CASCADE)  # type: Realm
-    stripe_customer_id = models.CharField(max_length=255, null=True, unique=True)  # type: str
-    # A percentage, like 85.
-    default_discount = models.DecimalField(decimal_places=4, max_digits=7, null=True)  # type: Optional[Decimal]
+    realm = models.OneToOneField(Realm, on_delete=models.CASCADE)  # type: Realm
+    stripe_customer_id = models.CharField(max_length=255, unique=True)  # type: str
+    # Becomes True the first time a payment successfully goes through, and never
+    # goes back to being False
+    has_billing_relationship = models.BooleanField(default=False)  # type: bool
 
     def __str__(self) -> str:
         return "<Customer %s %s>" % (self.realm, self.stripe_customer_id)
 
-class CustomerPlan(models.Model):
-    customer = models.ForeignKey(Customer, on_delete=CASCADE)  # type: Customer
-    automanage_licenses = models.BooleanField(default=False)  # type: bool
-    charge_automatically = models.BooleanField(default=False)  # type: bool
+class Plan(models.Model):
+    # The two possible values for nickname
+    CLOUD_MONTHLY = 'monthly'
+    CLOUD_ANNUAL = 'annual'
+    nickname = models.CharField(max_length=40, unique=True)  # type: str
 
-    # Both of these are in cents. Exactly one of price_per_license or
-    # fixed_price should be set. fixed_price is only for manual deals, and
-    # can't be set via the self-serve billing system.
-    price_per_license = models.IntegerField(null=True)  # type: Optional[int]
-    fixed_price = models.IntegerField(null=True)  # type: Optional[int]
+    stripe_plan_id = models.CharField(max_length=255, unique=True)  # type: str
 
-    # Discount that was applied. For display purposes only.
-    discount = models.DecimalField(decimal_places=4, max_digits=6, null=True)  # type: Optional[Decimal]
+class Coupon(models.Model):
+    percent_off = models.SmallIntegerField(unique=True)  # type: int
+    stripe_coupon_id = models.CharField(max_length=255, unique=True)  # type: str
 
-    billing_cycle_anchor = models.DateTimeField()  # type: datetime.datetime
-    ANNUAL = 1
-    MONTHLY = 2
-    billing_schedule = models.SmallIntegerField()  # type: int
+    def __str__(self) -> str:
+        return '<Coupon: %s %s %s>' % (self.percent_off, self.stripe_coupon_id, self.id)
 
-    next_invoice_date = models.DateTimeField(db_index=True, null=True)  # type: Optional[datetime.datetime]
-    invoiced_through = models.ForeignKey(
-        'LicenseLedger', null=True, on_delete=CASCADE, related_name='+')  # type: Optional[LicenseLedger]
-    DONE = 1
-    STARTED = 2
-    invoicing_status = models.SmallIntegerField(default=DONE)  # type: int
+class BillingProcessor(models.Model):
+    log_row = models.ForeignKey(RealmAuditLog, on_delete=models.CASCADE)  # RealmAuditLog
+    # Exactly one processor, the global processor, has realm=None.
+    realm = models.OneToOneField(Realm, null=True, on_delete=models.CASCADE)  # type: Realm
 
-    STANDARD = 1
-    PLUS = 2  # not available through self-serve signup
-    ENTERPRISE = 10
-    tier = models.SmallIntegerField()  # type: int
+    DONE = 'done'
+    STARTED = 'started'
+    SKIPPED = 'skipped'  # global processor only
+    STALLED = 'stalled'  # realm processors only
+    state = models.CharField(max_length=20)  # type: str
 
-    ACTIVE = 1
-    DOWNGRADE_AT_END_OF_CYCLE = 2
-    # "Live" plans should have a value < LIVE_STATUS_THRESHOLD.
-    # There should be at most one live plan per customer.
-    LIVE_STATUS_THRESHOLD = 10
-    ENDED = 11
-    NEVER_STARTED = 12
-    status = models.SmallIntegerField(default=ACTIVE)  # type: int
+    last_modified = models.DateTimeField(auto_now=True)  # type: datetime.datetime
 
-    # TODO maybe override setattr to ensure billing_cycle_anchor, etc are immutable
-
-def get_current_plan(customer: Customer) -> Optional[CustomerPlan]:
-    return CustomerPlan.objects.filter(
-        customer=customer, status__lt=CustomerPlan.LIVE_STATUS_THRESHOLD).first()
-
-class LicenseLedger(models.Model):
-    plan = models.ForeignKey(CustomerPlan, on_delete=CASCADE)  # type: CustomerPlan
-    # Also True for the initial upgrade.
-    is_renewal = models.BooleanField(default=False)  # type: bool
-    event_time = models.DateTimeField()  # type: datetime.datetime
-    licenses = models.IntegerField()  # type: int
-    # None means the plan does not automatically renew.
-    # This cannot be None if plan.automanage_licenses.
-    licenses_at_next_renewal = models.IntegerField(null=True)  # type: Optional[int]
+    def __str__(self) -> str:
+        return '<BillingProcessor: %s %s %s>' % (self.realm, self.log_row, self.id)

corporate/tests/stripe_fixtures.json

@@ -0,0 +1,411 @@
+{
+    "create_customer": {
+        "account_balance": 0,
+        "created": 1529990750,
+        "currency": null,
+        "default_source": "card_1Ch9gVGh0CmXqmnwv94RombT",
+        "delinquent": false,
+        "description": "zulip (Zulip Dev)",
+        "discount": {
+            "coupon": {
+                "amount_off": null,
+                "created": 1535002820,
+                "currency": null,
+                "duration": "forever",
+                "duration_in_months": null,
+                "id": "rncBblSZ",
+                "livemode": false,
+                "max_redemptions": null,
+                "metadata": {},
+                "name": "85% discount",
+                "object": "coupon",
+                "percent_off": 85.0,
+                "redeem_by": null,
+                "times_redeemed": 1,
+                "valid": true
+            },
+            "customer": "cus_DT7pd3yW0w8lF1",
+            "end": null,
+            "object": "discount",
+            "start": 1535004909,
+            "subscription": null
+        },
+        "email": "hamlet@zulip.com",
+        "id": "cus_D7OT2jf5YAtZQL",
+        "invoice_prefix": "23ABC45",
+        "livemode": false,
+        "metadata": {
+            "realm_id": "1",
+            "realm_str": "zulip"
+        },
+        "object": "customer",
+        "shipping": null,
+        "sources": {
+            "data": [
+                {
+                    "address_city": "Pacific",
+                    "address_country": "United States",
+                    "address_line1": "Under the sea",
+                    "address_line1_check": "pass",
+                    "address_line2": null,
+                    "address_state": "FL",
+                    "address_zip": "33333",
+                    "address_zip_check": "pass",
+                    "brand": "Visa",
+                    "country": "US",
+                    "customer": "cus_D7OT2jf5YAtZQL",
+                    "cvc_check": "pass",
+                    "dynamic_last4": null,
+                    "exp_month": 3,
+                    "exp_year": 2033,
+                    "fingerprint": "6dAXT9VZvwro65EK",
+                    "funding": "credit",
+                    "id": "card_1Ch9gVGh0CmXqmnwv94RombT",
+                    "last4": "4242",
+                    "metadata": {},
+                    "name": "Ada Starr",
+                    "object": "card",
+                    "tokenization_method": null
+                }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/customers/cus_D7OT2jf5YAtZQL/sources"
+        },
+        "subscriptions": {}
+    },
+    "create_subscription": {
+        "application_fee_percent": null,
+        "billing": "charge_automatically",
+        "billing_cycle_anchor": 1529990751,
+        "cancel_at_period_end": false,
+        "canceled_at": null,
+        "created": 1529990751,
+        "current_period_end": 1561526751,
+        "current_period_start": 1529990751,
+        "customer": "cus_D7OT2jf5YAtZQL",
+        "days_until_due": null,
+        "discount": null,
+        "ended_at": null,
+        "id": "sub_D7OTT8FZbOPxah",
+        "items": {
+            "data": [
+                {
+                    "created": 1529990751,
+                    "id": "si_D7OTEItF5ZLN2R",
+                    "metadata": {},
+                    "object": "subscription_item",
+                    "plan": {
+                        "active": true,
+                        "aggregate_usage": null,
+                        "amount": 8000,
+                        "billing_scheme": "per_unit",
+                        "created": 1529987890,
+                        "currency": "usd",
+                        "id": "plan_Do3xCvbzO89OsR",
+                        "interval": "year",
+                        "interval_count": 1,
+                        "livemode": false,
+                        "metadata": {},
+                        "nickname": "annual",
+                        "object": "plan",
+                        "product": "prod_D7NhmicJvX2edE",
+                        "tiers": null,
+                        "tiers_mode": null,
+                        "transform_usage": null,
+                        "trial_period_days": null,
+                        "usage_type": "licensed"
+                    },
+                    "quantity": 8,
+                    "subscription": "sub_D7OTT8FZbOPxah"
+                }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/subscription_items?subscription=sub_D7OTT8FZbOPxah"
+        },
+        "livemode": false,
+        "metadata": {},
+        "object": "subscription",
+        "plan": {
+            "active": true,
+            "aggregate_usage": null,
+            "amount": 8000,
+            "billing_scheme": "per_unit",
+            "created": 1529987890,
+            "currency": "usd",
+            "id": "plan_Do3xCvbzO89OsR",
+            "interval": "year",
+            "interval_count": 1,
+            "livemode": false,
+            "metadata": {},
+            "nickname": "annual",
+            "object": "plan",
+            "product": "prod_D7NhmicJvX2edE",
+            "tiers": null,
+            "tiers_mode": null,
+            "transform_usage": null,
+            "trial_period_days": null,
+            "usage_type": "licensed"
+        },
+        "quantity": 8,
+        "start": 1529990751,
+        "status": "active",
+        "tax_percent": 0.0,
+        "trial_end": null,
+        "trial_start": null
+    },
+    "customer_with_subscription": {
+        "account_balance": 0,
+        "created": 1529990750,
+        "currency": "usd",
+        "default_source": {
+            "address_city": "Pacific",
+            "address_country": "United States",
+            "address_line1": "Under the sea",
+            "address_line1_check": "pass",
+            "address_line2": null,
+            "address_state": "FL",
+            "address_zip": "33333",
+            "address_zip_check": "pass",
+            "brand": "Visa",
+            "country": "US",
+            "customer": "cus_D7OT2jf5YAtZQL",
+            "cvc_check": "pass",
+            "dynamic_last4": null,
+            "exp_month": 3,
+            "exp_year": 2033,
+            "fingerprint": "6dAXT9VZvwro65EK",
+            "funding": "credit",
+            "id": "card_1Ch9gVGh0CmXqmnwv94RombT",
+            "last4": "4242",
+            "metadata": {},
+            "name": "Ada Starr",
+            "object": "card",
+            "tokenization_method": null
+        },
+        "delinquent": false,
+        "description": "zulip (Zulip Dev)",
+        "discount": null,
+        "email": "hamlet@zulip.com",
+        "id": "cus_D7OT2jf5YAtZQL",
+        "invoice_prefix": "23ABC45",
+        "livemode": false,
+        "metadata": {
+            "realm_id": "1",
+            "realm_str": "zulip"
+        },
+        "object": "customer",
+        "shipping": null,
+        "sources": {
+            "data": [
+                {
+                    "address_city": "Pacific",
+                    "address_country": "United States",
+                    "address_line1": "Under the sea",
+                    "address_line1_check": "pass",
+                    "address_line2": null,
+                    "address_state": "FL",
+                    "address_zip": "33333",
+                    "address_zip_check": "pass",
+                    "brand": "Visa",
+                    "country": "US",
+                    "customer": "cus_D7OT2jf5YAtZQL",
+                    "cvc_check": "pass",
+                    "dynamic_last4": null,
+                    "exp_month": 3,
+                    "exp_year": 2033,
+                    "fingerprint": "6dAXT9VZvwro65EK",
+                    "funding": "credit",
+                    "id": "card_1Ch9gVGh0CmXqmnwv94RombT",
+                    "last4": "4242",
+                    "metadata": {},
+                    "name": "Ada Starr",
+                    "object": "card",
+                    "tokenization_method": null
+                }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/customers/cus_D7OT2jf5YAtZQL/sources"
+        },
+        "subscriptions": {
+            "data": [
+                {
+                    "application_fee_percent": null,
+                    "billing": "charge_automatically",
+                    "billing_cycle_anchor": 1529990751,
+                    "cancel_at_period_end": false,
+                    "canceled_at": null,
+                    "created": 1529990751,
+                    "current_period_end": 1561526751,
+                    "current_period_start": 1529990751,
+                    "customer": "cus_D7OT2jf5YAtZQL",
+                    "days_until_due": null,
+                    "discount": null,
+                    "ended_at": null,
+                    "id": "sub_D7OTT8FZbOPxah",
+                    "items": {
+                        "data": [
+                            {
+                                "created": 1529990751,
+                                "id": "si_D7OTEItF5ZLN2R",
+                                "metadata": {},
+                                "object": "subscription_item",
+                                "plan": {
+                                    "active": true,
+                                    "aggregate_usage": null,
+                                    "amount": 8000,
+                                    "billing_scheme": "per_unit",
+                                    "created": 1529987890,
+                                    "currency": "usd",
+                                    "id": "plan_Do3xCvbzO89OsR",
+                                    "interval": "year",
+                                    "interval_count": 1,
+                                    "livemode": false,
+                                    "metadata": {},
+                                    "nickname": "annual",
+                                    "object": "plan",
+                                    "product": "prod_D7NhmicJvX2edE",
+                                    "tiers": null,
+                                    "tiers_mode": null,
+                                    "transform_usage": null,
+                                    "trial_period_days": null,
+                                    "usage_type": "licensed"
+                                },
+                                "quantity": 8,
+                                "subscription": "sub_D7OTT8FZbOPxah"
+                            }
+                        ],
+                        "has_more": false,
+                        "object": "list",
+                        "total_count": 1,
+                        "url": "/v1/subscription_items?subscription=sub_D7OTT8FZbOPxah"
+                    },
+                    "livemode": false,
+                    "metadata": {},
+                    "object": "subscription",
+                    "plan": {
+                        "active": true,
+                        "aggregate_usage": null,
+                        "amount": 8000,
+                        "billing_scheme": "per_unit",
+                        "created": 1529987890,
+                        "currency": "usd",
+                        "id": "plan_Do3xCvbzO89OsR",
+                        "interval": "year",
+                        "interval_count": 1,
+                        "livemode": false,
+                        "metadata": {},
+                        "nickname": "annual",
+                        "object": "plan",
+                        "product": "prod_D7NhmicJvX2edE",
+                        "tiers": null,
+                        "tiers_mode": null,
+                        "transform_usage": null,
+                        "trial_period_days": null,
+                        "usage_type": "licensed"
+                    },
+                    "quantity": 8,
+                    "start": 1529990751,
+                    "status": "active",
+                    "tax_percent": 0.0,
+                    "trial_end": null,
+                    "trial_start": null
+                }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/customers/cus_D7OT2jf5YAtZQL/subscriptions"
+        }
+    },
+    "upcoming_invoice": {
+        "amount_due": 64000,
+        "amount_paid": 0,
+        "amount_remaining": 64000,
+        "application_fee": null,
+        "attempt_count": 0,
+        "attempted": false,
+        "billing": "charge_automatically",
+        "billing_reason": "upcoming",
+        "charge": null,
+        "closed": false,
+        "currency": "usd",
+        "customer": "cus_D7OT2jf5YAtZQL",
+        "date": 1561526751,
+        "description": "",
+        "discount": null,
+        "due_date": null,
+        "ending_balance": null,
+        "forgiven": false,
+        "lines": {
+            "data": [
+                {
+                    "amount": 64000,
+                    "currency": "usd",
+                    "description": "8 user \u00d7 Zulip Cloud Standard (at $80.00 / year)",
+                    "discountable": true,
+                    "id": "sub_D7OTT8FZbOPxah",
+                    "livemode": false,
+                    "metadata": {},
+                    "object": "line_item",
+                    "period": {
+                        "end": 1593149151,
+                        "start": 1561526751
+                    },
+                    "plan": {
+                        "active": true,
+                        "aggregate_usage": null,
+                        "amount": 8000,
+                        "billing_scheme": "per_unit",
+                        "created": 1529987890,
+                        "currency": "usd",
+                        "id": "plan_Do3xCvbzO89OsR",
+                        "interval": "year",
+                        "interval_count": 1,
+                        "livemode": false,
+                        "metadata": {},
+                        "nickname": "annual",
+                        "object": "plan",
+                        "product": "prod_D7NhmicJvX2edE",
+                        "tiers": null,
+                        "tiers_mode": null,
+                        "transform_usage": null,
+                        "trial_period_days": null,
+                        "usage_type": "licensed"
+                    },
+                    "proration": false,
+                    "quantity": 8,
+                    "subscription": null,
+                    "subscription_item": "si_D7OTEItF5ZLN2R",
+                    "type": "subscription"
+                }
+            ],
+            "has_more": false,
+            "object": "list",
+            "total_count": 1,
+            "url": "/v1/invoices/upcoming/lines?customer=cus_D7OT2jf5YAtZQL"
+        },
+        "livemode": false,
+        "metadata": {},
+        "next_payment_attempt": 1561530351,
+        "number": "23ABC45-0002",
+        "object": "invoice",
+        "paid": false,
+        "period_end": 1561526751,
+        "period_start": 1529990751,
+        "receipt_number": null,
+        "starting_balance": 0,
+        "statement_descriptor": null,
+        "subscription": "sub_D7OTT8FZbOPxah",
+        "subtotal": 64000,
+        "tax": 0,
+        "tax_percent": 0.0,
+        "total": 64000,
+        "webhooks_delivered_at": null
+    },
+}

corporate/tests/stripe_fixtures/attach_discount_to_realm--Charge.create.1.json

@@ -1,112 +0,0 @@
-{
-  "amount": 7200,
-  "amount_refunded": 0,
-  "application": null,
-  "application_fee": null,
-  "application_fee_amount": null,
-  "balance_transaction": "txn_NORMALIZED00000000000001",
-  "billing_details": {
-    "address": {
-      "city": "Pacific",
-      "country": "United States",
-      "line1": "Under the sea,",
-      "line2": null,
-      "postal_code": "33333",
-      "state": null
-    },
-    "email": null,
-    "name": "Ada Starr",
-    "phone": null
-  },
-  "captured": true,
-  "created": 1000000000,
-  "currency": "usd",
-  "customer": "cus_NORMALIZED0001",
-  "description": "Upgrade to Zulip Standard, $12.0 x 6",
-  "destination": null,
-  "dispute": null,
-  "failure_code": null,
-  "failure_message": null,
-  "fraud_details": {},
-  "id": "ch_NORMALIZED00000000000001",
-  "invoice": null,
-  "livemode": false,
-  "metadata": {},
-  "object": "charge",
-  "on_behalf_of": null,
-  "order": null,
-  "outcome": {
-    "network_status": "approved_by_network",
-    "reason": null,
-    "risk_level": "normal",
-    "risk_score": 00,
-    "seller_message": "Payment complete.",
-    "type": "authorized"
-  },
-  "paid": true,
-  "payment_intent": null,
-  "payment_method": "card_NORMALIZED00000000000001",
-  "payment_method_details": {
-    "card": {
-      "brand": "visa",
-      "checks": {
-        "address_line1_check": "pass",
-        "address_postal_code_check": "pass",
-        "cvc_check": "pass"
-      },
-      "country": "US",
-      "exp_month": 3,
-      "exp_year": 2033,
-      "fingerprint": "NORMALIZED000001",
-      "funding": "credit",
-      "last4": "4242",
-      "three_d_secure": null,
-      "wallet": null
-    },
-    "type": "card"
-  },
-  "receipt_email": "hamlet@zulip.com",
-  "receipt_number": null,
-  "receipt_url": "https://pay.stripe.com/receipts/acct_NORMALIZED000001/ch_NORMALIZED00000000000001/rcpt_NORMALIZED000000000000000000001",
-  "refunded": false,
-  "refunds": {
-    "data": [],
-    "has_more": false,
-    "object": "list",
-    "total_count": 0,
-    "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
-  },
-  "review": null,
-  "shipping": null,
-  "source": {
-    "address_city": "Pacific",
-    "address_country": "United States",
-    "address_line1": "Under the sea,",
-    "address_line1_check": "pass",
-    "address_line2": null,
-    "address_state": null,
-    "address_zip": "33333",
-    "address_zip_check": "pass",
-    "brand": "Visa",
-    "country": "US",
-    "customer": "cus_NORMALIZED0001",
-    "cvc_check": "pass",
-    "dynamic_last4": null,
-    "exp_month": 3,
-    "exp_year": 2033,
-    "fingerprint": "NORMALIZED000001",
-    "funding": "credit",
-    "id": "card_NORMALIZED00000000000001",
-    "last4": "4242",
-    "metadata": {},
-    "name": "Ada Starr",
-    "object": "card",
-    "tokenization_method": null
-  },
-  "source_transfer": null,
-  "statement_descriptor": "Zulip Standard",
-  "statement_descriptor_suffix": "Zulip Standard",
-  "status": "succeeded",
-  "transfer_data": null,
-  "transfer_group": null
-}

corporate/tests/stripe_fixtures/attach_discount_to_realm--Charge.create.2.json

@@ -1,112 +0,0 @@
-{
-  "amount": 36000,
-  "amount_refunded": 0,
-  "application": null,
-  "application_fee": null,
-  "application_fee_amount": null,
-  "balance_transaction": "txn_NORMALIZED00000000000002",
-  "billing_details": {
-    "address": {
-      "city": "Pacific",
-      "country": "United States",
-      "line1": "Under the sea,",
-      "line2": null,
-      "postal_code": "33333",
-      "state": null
-    },
-    "email": null,
-    "name": "Ada Starr",
-    "phone": null
-  },
-  "captured": true,
-  "created": 1000000000,
-  "currency": "usd",
-  "customer": "cus_NORMALIZED0001",
-  "description": "Upgrade to Zulip Standard, $60.0 x 6",
-  "destination": null,
-  "dispute": null,
-  "failure_code": null,
-  "failure_message": null,
-  "fraud_details": {},
-  "id": "ch_NORMALIZED00000000000002",
-  "invoice": null,
-  "livemode": false,
-  "metadata": {},
-  "object": "charge",
-  "on_behalf_of": null,
-  "order": null,
-  "outcome": {
-    "network_status": "approved_by_network",
-    "reason": null,
-    "risk_level": "normal",
-    "risk_score": 00,
-    "seller_message": "Payment complete.",
-    "type": "authorized"
-  },
-  "paid": true,
-  "payment_intent": null,
-  "payment_method": "card_NORMALIZED00000000000002",
-  "payment_method_details": {
-    "card": {
-      "brand": "visa",
-      "checks": {
-        "address_line1_check": "pass",
-        "address_postal_code_check": "pass",
-        "cvc_check": "pass"
-      },
-      "country": "US",
-      "exp_month": 3,
-      "exp_year": 2033,
-      "fingerprint": "NORMALIZED000001",
-      "funding": "credit",
-      "last4": "4242",
-      "three_d_secure": null,
-      "wallet": null
-    },
-    "type": "card"
-  },
-  "receipt_email": "hamlet@zulip.com",
-  "receipt_number": null,
-  "receipt_url": "https://pay.stripe.com/receipts/acct_NORMALIZED000001/ch_NORMALIZED00000000000002/rcpt_NORMALIZED000000000000000000002",
-  "refunded": false,
-  "refunds": {
-    "data": [],
-    "has_more": false,
-    "object": "list",
-    "total_count": 0,
-    "url": "/v1/charges/ch_NORMALIZED00000000000002/refunds"
-  },
-  "review": null,
-  "shipping": null,
-  "source": {
-    "address_city": "Pacific",
-    "address_country": "United States",
-    "address_line1": "Under the sea,",
-    "address_line1_check": "pass",
-    "address_line2": null,
-    "address_state": null,
-    "address_zip": "33333",
-    "address_zip_check": "pass",
-    "brand": "Visa",
-    "country": "US",
-    "customer": "cus_NORMALIZED0001",
-    "cvc_check": "pass",
-    "dynamic_last4": null,
-    "exp_month": 3,
-    "exp_year": 2033,
-    "fingerprint": "NORMALIZED000001",
-    "funding": "credit",
-    "id": "card_NORMALIZED00000000000002",
-    "last4": "4242",
-    "metadata": {},
-    "name": "Ada Starr",
-    "object": "card",
-    "tokenization_method": null
-  },
-  "source_transfer": null,
-  "statement_descriptor": "Zulip Standard",
-  "statement_descriptor_suffix": "Zulip Standard",
-  "status": "succeeded",
-  "transfer_data": null,
-  "transfer_group": null
-}

corporate/tests/stripe_fixtures/attach_discount_to_realm--Charge.list.1.json

@@ -1,113 +0,0 @@
-{
-  "data": [
-    {
-      "amount": 7200,
-      "amount_refunded": 0,
-      "application": null,
-      "application_fee": null,
-      "application_fee_amount": null,
-      "balance_transaction": "txn_NORMALIZED00000000000001",
-      "billing_details": {
-        "address": {
-          "city": "Pacific",
-          "country": "United States",
-          "line1": "Under the sea,",
-          "line2": null,
-          "postal_code": "33333",
-          "state": null
-        },
-        "email": null,
-        "name": "Ada Starr",
-        "phone": null
-      },
-      "captured": true,
-      "created": 1000000000,
-      "currency": "usd",
-      "customer": "cus_NORMALIZED0001",
-      "description": "Upgrade to Zulip Standard, $12.0 x 6",
-      "destination": null,
-      "dispute": null,
-      "failure_code": null,
-      "failure_message": null,
-      "fraud_details": {},
-      "id": "ch_NORMALIZED00000000000001",
-      "invoice": null,
-      "livemode": false,
-      "metadata": {},
-      "object": "charge",
-      "on_behalf_of": null,
-      "order": null,
-      "outcome": {
-        "network_status": "approved_by_network",
-        "reason": null,
-        "risk_level": "normal",
-        "risk_score": 00,
-        "seller_message": "Payment complete.",
-        "type": "authorized"
-      },
-      "paid": true,
-      "payment_intent": null,
-      "payment_method": "card_NORMALIZED00000000000001",
-      "payment_method_details": {
-        "card": {
-          "brand": "visa",
-          "checks": {
-            "address_line1_check": "pass",
-            "address_postal_code_check": "pass",
-            "cvc_check": "pass"
-          },
-          "country": "US",
-          "exp_month": 3,
-          "exp_year": 2033,
-          "fingerprint": "NORMALIZED000001",
-          "funding": "credit",
-          "last4": "4242",
-          "three_d_secure": null,
-          "wallet": null
-        },
-        "type": "card"
-      },
-      "receipt_email": "hamlet@zulip.com",
-      "receipt_number": null,
-      "receipt_url": "https://pay.stripe.com/receipts/acct_NORMALIZED000001/ch_NORMALIZED00000000000001/rcpt_NORMALIZED000000000000000000001",
-      "refunded": false,
-      "refunds": {},
-      "review": null,
-      "shipping": null,
-      "source": {
-        "address_city": "Pacific",
-        "address_country": "United States",
-        "address_line1": "Under the sea,",
-        "address_line1_check": "pass",
-        "address_line2": null,
-        "address_state": null,
-        "address_zip": "33333",
-        "address_zip_check": "pass",
-        "brand": "Visa",
-        "country": "US",
-        "customer": "cus_NORMALIZED0001",
-        "cvc_check": "pass",
-        "dynamic_last4": null,
-        "exp_month": 3,
-        "exp_year": 2033,
-        "fingerprint": "NORMALIZED000001",
-        "funding": "credit",
-        "id": "card_NORMALIZED00000000000001",
-        "last4": "4242",
-        "metadata": {},
-        "name": "Ada Starr",
-        "object": "card",
-        "tokenization_method": null
-      },
-      "source_transfer": null,
-      "statement_descriptor": "Zulip Standard",
-      "statement_descriptor_suffix": "Zulip Standard",
-      "status": "succeeded",
-      "transfer_data": null,
-      "transfer_group": null
-    }
-  ],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/charges"
-}

corporate/tests/stripe_fixtures/attach_discount_to_realm--Charge.list.2.json

@@ -1,219 +0,0 @@
-{
-  "data": [
-    {
-      "amount": 36000,
-      "amount_refunded": 0,
-      "application": null,
-      "application_fee": null,
-      "application_fee_amount": null,
-      "balance_transaction": "txn_NORMALIZED00000000000002",
-      "billing_details": {
-        "address": {
-          "city": "Pacific",
-          "country": "United States",
-          "line1": "Under the sea,",
-          "line2": null,
-          "postal_code": "33333",
-          "state": null
-        },
-        "email": null,
-        "name": "Ada Starr",
-        "phone": null
-      },
-      "captured": true,
-      "created": 1000000000,
-      "currency": "usd",
-      "customer": "cus_NORMALIZED0001",
-      "description": "Upgrade to Zulip Standard, $60.0 x 6",
-      "destination": null,
-      "dispute": null,
-      "failure_code": null,
-      "failure_message": null,
-      "fraud_details": {},
-      "id": "ch_NORMALIZED00000000000002",
-      "invoice": null,
-      "livemode": false,
-      "metadata": {},
-      "object": "charge",
-      "on_behalf_of": null,
-      "order": null,
-      "outcome": {
-        "network_status": "approved_by_network",
-        "reason": null,
-        "risk_level": "normal",
-        "risk_score": 00,
-        "seller_message": "Payment complete.",
-        "type": "authorized"
-      },
-      "paid": true,
-      "payment_intent": null,
-      "payment_method": "card_NORMALIZED00000000000002",
-      "payment_method_details": {
-        "card": {
-          "brand": "visa",
-          "checks": {
-            "address_line1_check": "pass",
-            "address_postal_code_check": "pass",
-            "cvc_check": "pass"
-          },
-          "country": "US",
-          "exp_month": 3,
-          "exp_year": 2033,
-          "fingerprint": "NORMALIZED000001",
-          "funding": "credit",
-          "last4": "4242",
-          "three_d_secure": null,
-          "wallet": null
-        },
-        "type": "card"
-      },
-      "receipt_email": "hamlet@zulip.com",
-      "receipt_number": null,
-      "receipt_url": "https://pay.stripe.com/receipts/acct_NORMALIZED000001/ch_NORMALIZED00000000000002/rcpt_NORMALIZED000000000000000000002",
-      "refunded": false,
-      "refunds": {},
-      "review": null,
-      "shipping": null,
-      "source": {
-        "address_city": "Pacific",
-        "address_country": "United States",
-        "address_line1": "Under the sea,",
-        "address_line1_check": "pass",
-        "address_line2": null,
-        "address_state": null,
-        "address_zip": "33333",
-        "address_zip_check": "pass",
-        "brand": "Visa",
-        "country": "US",
-        "customer": "cus_NORMALIZED0001",
-        "cvc_check": "pass",
-        "dynamic_last4": null,
-        "exp_month": 3,
-        "exp_year": 2033,
-        "fingerprint": "NORMALIZED000001",
-        "funding": "credit",
-        "id": "card_NORMALIZED00000000000002",
-        "last4": "4242",
-        "metadata": {},
-        "name": "Ada Starr",
-        "object": "card",
-        "tokenization_method": null
-      },
-      "source_transfer": null,
-      "statement_descriptor": "Zulip Standard",
-      "statement_descriptor_suffix": "Zulip Standard",
-      "status": "succeeded",
-      "transfer_data": null,
-      "transfer_group": null
-    },
-    {
-      "amount": 7200,
-      "amount_refunded": 0,
-      "application": null,
-      "application_fee": null,
-      "application_fee_amount": null,
-      "balance_transaction": "txn_NORMALIZED00000000000001",
-      "billing_details": {
-        "address": {
-          "city": "Pacific",
-          "country": "United States",
-          "line1": "Under the sea,",
-          "line2": null,
-          "postal_code": "33333",
-          "state": null
-        },
-        "email": null,
-        "name": "Ada Starr",
-        "phone": null
-      },
-      "captured": true,
-      "created": 1000000000,
-      "currency": "usd",
-      "customer": "cus_NORMALIZED0001",
-      "description": "Upgrade to Zulip Standard, $12.0 x 6",
-      "destination": null,
-      "dispute": null,
-      "failure_code": null,
-      "failure_message": null,
-      "fraud_details": {},
-      "id": "ch_NORMALIZED00000000000001",
-      "invoice": null,
-      "livemode": false,
-      "metadata": {},
-      "object": "charge",
-      "on_behalf_of": null,
-      "order": null,
-      "outcome": {
-        "network_status": "approved_by_network",
-        "reason": null,
-        "risk_level": "normal",
-        "risk_score": 00,
-        "seller_message": "Payment complete.",
-        "type": "authorized"
-      },
-      "paid": true,
-      "payment_intent": null,
-      "payment_method": "card_NORMALIZED00000000000001",
-      "payment_method_details": {
-        "card": {
-          "brand": "visa",
-          "checks": {
-            "address_line1_check": "pass",
-            "address_postal_code_check": "pass",
-            "cvc_check": "pass"
-          },
-          "country": "US",
-          "exp_month": 3,
-          "exp_year": 2033,
-          "fingerprint": "NORMALIZED000001",
-          "funding": "credit",
-          "last4": "4242",
-          "three_d_secure": null,
-          "wallet": null
-        },
-        "type": "card"
-      },
-      "receipt_email": "hamlet@zulip.com",
-      "receipt_number": null,
-      "receipt_url": "https://pay.stripe.com/receipts/acct_NORMALIZED000001/ch_NORMALIZED00000000000001/rcpt_NORMALIZED000000000000000000001",
-      "refunded": false,
-      "refunds": {},
-      "review": null,
-      "shipping": null,
-      "source": {
-        "address_city": "Pacific",
-        "address_country": "United States",
-        "address_line1": "Under the sea,",
-        "address_line1_check": "pass",
-        "address_line2": null,
-        "address_state": null,
-        "address_zip": "33333",
-        "address_zip_check": "pass",
-        "brand": "Visa",
-        "country": "US",
-        "customer": "cus_NORMALIZED0001",
-        "cvc_check": "pass",
-        "dynamic_last4": null,
-        "exp_month": 3,
-        "exp_year": 2033,
-        "fingerprint": "NORMALIZED000001",
-        "funding": "credit",
-        "id": "card_NORMALIZED00000000000001",
-        "last4": "4242",
-        "metadata": {},
-        "name": "Ada Starr",
-        "object": "card",
-        "tokenization_method": null
-      },
-      "source_transfer": null,
-      "statement_descriptor": "Zulip Standard",
-      "statement_descriptor_suffix": "Zulip Standard",
-      "status": "succeeded",
-      "transfer_data": null,
-      "transfer_group": null
-    }
-  ],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/charges"
-}

corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.retrieve.1.json

@@ -1,103 +0,0 @@
-{
-  "account_balance": 0,
-  "address": null,
-  "balance": 0,
-  "created": 1000000000,
-  "currency": "usd",
-  "default_source": {
-    "address_city": "Pacific",
-    "address_country": "United States",
-    "address_line1": "Under the sea,",
-    "address_line1_check": "pass",
-    "address_line2": null,
-    "address_state": null,
-    "address_zip": "33333",
-    "address_zip_check": "pass",
-    "brand": "Visa",
-    "country": "US",
-    "customer": "cus_NORMALIZED0001",
-    "cvc_check": "pass",
-    "dynamic_last4": null,
-    "exp_month": 3,
-    "exp_year": 2033,
-    "fingerprint": "NORMALIZED000001",
-    "funding": "credit",
-    "id": "card_NORMALIZED00000000000001",
-    "last4": "4242",
-    "metadata": {},
-    "name": "Ada Starr",
-    "object": "card",
-    "tokenization_method": null
-  },
-  "delinquent": false,
-  "description": "zulip (Zulip Dev)",
-  "discount": null,
-  "email": "hamlet@zulip.com",
-  "id": "cus_NORMALIZED0001",
-  "invoice_prefix": "NORMA01",
-  "invoice_settings": {
-    "custom_fields": null,
-    "default_payment_method": null,
-    "footer": null
-  },
-  "livemode": false,
-  "metadata": {
-    "realm_id": "1",
-    "realm_str": "zulip"
-  },
-  "name": null,
-  "object": "customer",
-  "phone": null,
-  "preferred_locales": [],
-  "shipping": null,
-  "sources": {
-    "data": [
-      {
-        "address_city": "Pacific",
-        "address_country": "United States",
-        "address_line1": "Under the sea,",
-        "address_line1_check": "pass",
-        "address_line2": null,
-        "address_state": null,
-        "address_zip": "33333",
-        "address_zip_check": "pass",
-        "brand": "Visa",
-        "country": "US",
-        "customer": "cus_NORMALIZED0001",
-        "cvc_check": "pass",
-        "dynamic_last4": null,
-        "exp_month": 3,
-        "exp_year": 2033,
-        "fingerprint": "NORMALIZED000001",
-        "funding": "credit",
-        "id": "card_NORMALIZED00000000000001",
-        "last4": "4242",
-        "metadata": {},
-        "name": "Ada Starr",
-        "object": "card",
-        "tokenization_method": null
-      }
-    ],
-    "has_more": false,
-    "object": "list",
-    "total_count": 1,
-    "url": "/v1/customers/cus_NORMALIZED0001/sources"
-  },
-  "subscriptions": {
-    "data": [],
-    "has_more": false,
-    "object": "list",
-    "total_count": 0,
-    "url": "/v1/customers/cus_NORMALIZED0001/subscriptions"
-  },
-  "tax_exempt": "none",
-  "tax_ids": {
-    "data": [],
-    "has_more": false,
-    "object": "list",
-    "total_count": 0,
-    "url": "/v1/customers/cus_NORMALIZED0001/tax_ids"
-  },
-  "tax_info": null,
-  "tax_info_verification": null
-}

corporate/tests/stripe_fixtures/attach_discount_to_realm--Customer.save.1.json

@@ -1,79 +0,0 @@
-{
-  "account_balance": 0,
-  "address": null,
-  "balance": 0,
-  "created": 1000000000,
-  "currency": "usd",
-  "default_source": "card_NORMALIZED00000000000002",
-  "delinquent": false,
-  "description": "zulip (Zulip Dev)",
-  "discount": null,
-  "email": "hamlet@zulip.com",
-  "id": "cus_NORMALIZED0001",
-  "invoice_prefix": "NORMA01",
-  "invoice_settings": {
-    "custom_fields": null,
-    "default_payment_method": null,
-    "footer": null
-  },
-  "livemode": false,
-  "metadata": {
-    "realm_id": "1",
-    "realm_str": "zulip"
-  },
-  "name": null,
-  "object": "customer",
-  "phone": null,
-  "preferred_locales": [],
-  "shipping": null,
-  "sources": {
-    "data": [
-      {
-        "address_city": "Pacific",
-        "address_country": "United States",
-        "address_line1": "Under the sea,",
-        "address_line1_check": "pass",
-        "address_line2": null,
-        "address_state": null,
-        "address_zip": "33333",
-        "address_zip_check": "pass",
-        "brand": "Visa",
-        "country": "US",
-        "customer": "cus_NORMALIZED0001",
-        "cvc_check": "pass",
-        "dynamic_last4": null,
-        "exp_month": 3,
-        "exp_year": 2033,
-        "fingerprint": "NORMALIZED000001",
-        "funding": "credit",
-        "id": "card_NORMALIZED00000000000002",
-        "last4": "4242",
-        "metadata": {},
-        "name": "Ada Starr",
-        "object": "card",
-        "tokenization_method": null
-      }
-    ],
-    "has_more": false,
-    "object": "list",
-    "total_count": 1,
-    "url": "/v1/customers/cus_NORMALIZED0001/sources"
-  },
-  "subscriptions": {
-    "data": [],
-    "has_more": false,
-    "object": "list",
-    "total_count": 0,
-    "url": "/v1/customers/cus_NORMALIZED0001/subscriptions"
-  },
-  "tax_exempt": "none",
-  "tax_ids": {
-    "data": [],
-    "has_more": false,
-    "object": "list",
-    "total_count": 0,
-    "url": "/v1/customers/cus_NORMALIZED0001/tax_ids"
-  },
-  "tax_info": null,
-  "tax_info_verification": null
-}

corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.1.json

@@ -1,117 +0,0 @@
-{
-  "account_country": "US",
-  "account_name": "Dev account",
-  "amount_due": 0,
-  "amount_paid": 0,
-  "amount_remaining": 0,
-  "application_fee_amount": null,
-  "attempt_count": 0,
-  "attempted": false,
-  "auto_advance": true,
-  "billing": "charge_automatically",
-  "billing_reason": "manual",
-  "charge": null,
-  "collection_method": "charge_automatically",
-  "created": 1000000000,
-  "currency": "usd",
-  "custom_fields": null,
-  "customer": "cus_NORMALIZED0001",
-  "customer_address": null,
-  "customer_email": "hamlet@zulip.com",
-  "customer_name": null,
-  "customer_phone": null,
-  "customer_shipping": null,
-  "customer_tax_exempt": "none",
-  "customer_tax_ids": [],
-  "default_payment_method": null,
-  "default_source": null,
-  "default_tax_rates": [],
-  "description": "",
-  "discount": null,
-  "due_date": null,
-  "ending_balance": null,
-  "footer": null,
-  "hosted_invoice_url": null,
-  "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": null,
-  "lines": {
-    "data": [
-      {
-        "amount": 7200,
-        "currency": "usd",
-        "description": "Zulip Standard",
-        "discountable": false,
-        "id": "ii_NORMALIZED00000000000001",
-        "invoice_item": "ii_NORMALIZED00000000000001",
-        "livemode": false,
-        "metadata": {},
-        "object": "line_item",
-        "period": {
-          "end": 1000000000,
-          "start": 1000000000
-        },
-        "plan": null,
-        "proration": false,
-        "quantity": 6,
-        "subscription": null,
-        "tax_amounts": [],
-        "tax_rates": [],
-        "type": "invoiceitem"
-      },
-      {
-        "amount": -7200,
-        "currency": "usd",
-        "description": "Payment (Card ending in 4242)",
-        "discountable": false,
-        "id": "ii_NORMALIZED00000000000002",
-        "invoice_item": "ii_NORMALIZED00000000000002",
-        "livemode": false,
-        "metadata": {},
-        "object": "line_item",
-        "period": {
-          "end": 1000000000,
-          "start": 1000000000
-        },
-        "plan": null,
-        "proration": false,
-        "quantity": 1,
-        "subscription": null,
-        "tax_amounts": [],
-        "tax_rates": [],
-        "type": "invoiceitem"
-      }
-    ],
-    "has_more": false,
-    "object": "list",
-    "total_count": 2,
-    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-  },
-  "livemode": false,
-  "metadata": {},
-  "next_payment_attempt": 1000000000,
-  "number": "NORMALI-0001",
-  "object": "invoice",
-  "paid": false,
-  "payment_intent": null,
-  "period_end": 1000000000,
-  "period_start": 1000000000,
-  "post_payment_credit_notes_amount": 0,
-  "pre_payment_credit_notes_amount": 0,
-  "receipt_number": null,
-  "starting_balance": 0,
-  "statement_descriptor": "Zulip Standard",
-  "status": "draft",
-  "status_transitions": {
-    "finalized_at": null,
-    "marked_uncollectible_at": null,
-    "paid_at": null,
-    "voided_at": null
-  },
-  "subscription": null,
-  "subtotal": 0,
-  "tax": null,
-  "tax_percent": null,
-  "total": 0,
-  "total_tax_amounts": [],
-  "webhooks_delivered_at": null
-}

corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.create.2.json

@@ -1,117 +0,0 @@
-{
-  "account_country": "US",
-  "account_name": "Dev account",
-  "amount_due": 0,
-  "amount_paid": 0,
-  "amount_remaining": 0,
-  "application_fee_amount": null,
-  "attempt_count": 0,
-  "attempted": false,
-  "auto_advance": true,
-  "billing": "charge_automatically",
-  "billing_reason": "manual",
-  "charge": null,
-  "collection_method": "charge_automatically",
-  "created": 1000000000,
-  "currency": "usd",
-  "custom_fields": null,
-  "customer": "cus_NORMALIZED0001",
-  "customer_address": null,
-  "customer_email": "hamlet@zulip.com",
-  "customer_name": null,
-  "customer_phone": null,
-  "customer_shipping": null,
-  "customer_tax_exempt": "none",
-  "customer_tax_ids": [],
-  "default_payment_method": null,
-  "default_source": null,
-  "default_tax_rates": [],
-  "description": "",
-  "discount": null,
-  "due_date": null,
-  "ending_balance": null,
-  "footer": null,
-  "hosted_invoice_url": null,
-  "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": null,
-  "lines": {
-    "data": [
-      {
-        "amount": 36000,
-        "currency": "usd",
-        "description": "Zulip Standard",
-        "discountable": false,
-        "id": "ii_NORMALIZED00000000000003",
-        "invoice_item": "ii_NORMALIZED00000000000003",
-        "livemode": false,
-        "metadata": {},
-        "object": "line_item",
-        "period": {
-          "end": 1000000000,
-          "start": 1000000000
-        },
-        "plan": null,
-        "proration": false,
-        "quantity": 6,
-        "subscription": null,
-        "tax_amounts": [],
-        "tax_rates": [],
-        "type": "invoiceitem"
-      },
-      {
-        "amount": -36000,
-        "currency": "usd",
-        "description": "Payment (Card ending in 4242)",
-        "discountable": false,
-        "id": "ii_NORMALIZED00000000000004",
-        "invoice_item": "ii_NORMALIZED00000000000004",
-        "livemode": false,
-        "metadata": {},
-        "object": "line_item",
-        "period": {
-          "end": 1000000000,
-          "start": 1000000000
-        },
-        "plan": null,
-        "proration": false,
-        "quantity": 1,
-        "subscription": null,
-        "tax_amounts": [],
-        "tax_rates": [],
-        "type": "invoiceitem"
-      }
-    ],
-    "has_more": false,
-    "object": "list",
-    "total_count": 2,
-    "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
-  },
-  "livemode": false,
-  "metadata": {},
-  "next_payment_attempt": 1000000000,
-  "number": "NORMALI-0002",
-  "object": "invoice",
-  "paid": false,
-  "payment_intent": null,
-  "period_end": 1000000000,
-  "period_start": 1000000000,
-  "post_payment_credit_notes_amount": 0,
-  "pre_payment_credit_notes_amount": 0,
-  "receipt_number": null,
-  "starting_balance": 0,
-  "statement_descriptor": "Zulip Standard",
-  "status": "draft",
-  "status_transitions": {
-    "finalized_at": null,
-    "marked_uncollectible_at": null,
-    "paid_at": null,
-    "voided_at": null
-  },
-  "subscription": null,
-  "subtotal": 0,
-  "tax": null,
-  "tax_percent": null,
-  "total": 0,
-  "total_tax_amounts": [],
-  "webhooks_delivered_at": null
-}

corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.1.json

@@ -1,117 +0,0 @@
-{
-  "account_country": "US",
-  "account_name": "Dev account",
-  "amount_due": 0,
-  "amount_paid": 0,
-  "amount_remaining": 0,
-  "application_fee_amount": null,
-  "attempt_count": 0,
-  "attempted": true,
-  "auto_advance": false,
-  "billing": "charge_automatically",
-  "billing_reason": "manual",
-  "charge": null,
-  "collection_method": "charge_automatically",
-  "created": 1000000000,
-  "currency": "usd",
-  "custom_fields": null,
-  "customer": "cus_NORMALIZED0001",
-  "customer_address": null,
-  "customer_email": "hamlet@zulip.com",
-  "customer_name": null,
-  "customer_phone": null,
-  "customer_shipping": null,
-  "customer_tax_exempt": "none",
-  "customer_tax_ids": [],
-  "default_payment_method": null,
-  "default_source": null,
-  "default_tax_rates": [],
-  "description": "",
-  "discount": null,
-  "due_date": 1000000000,
-  "ending_balance": 0,
-  "footer": null,
-  "hosted_invoice_url": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000001",
-  "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000001/pdf",
-  "lines": {
-    "data": [
-      {
-        "amount": 7200,
-        "currency": "usd",
-        "description": "Zulip Standard",
-        "discountable": false,
-        "id": "ii_NORMALIZED00000000000001",
-        "invoice_item": "ii_NORMALIZED00000000000001",
-        "livemode": false,
-        "metadata": {},
-        "object": "line_item",
-        "period": {
-          "end": 1000000000,
-          "start": 1000000000
-        },
-        "plan": null,
-        "proration": false,
-        "quantity": 6,
-        "subscription": null,
-        "tax_amounts": [],
-        "tax_rates": [],
-        "type": "invoiceitem"
-      },
-      {
-        "amount": -7200,
-        "currency": "usd",
-        "description": "Payment (Card ending in 4242)",
-        "discountable": false,
-        "id": "ii_NORMALIZED00000000000002",
-        "invoice_item": "ii_NORMALIZED00000000000002",
-        "livemode": false,
-        "metadata": {},
-        "object": "line_item",
-        "period": {
-          "end": 1000000000,
-          "start": 1000000000
-        },
-        "plan": null,
-        "proration": false,
-        "quantity": 1,
-        "subscription": null,
-        "tax_amounts": [],
-        "tax_rates": [],
-        "type": "invoiceitem"
-      }
-    ],
-    "has_more": false,
-    "object": "list",
-    "total_count": 2,
-    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-  },
-  "livemode": false,
-  "metadata": {},
-  "next_payment_attempt": null,
-  "number": "NORMALI-0001",
-  "object": "invoice",
-  "paid": true,
-  "payment_intent": null,
-  "period_end": 1000000000,
-  "period_start": 1000000000,
-  "post_payment_credit_notes_amount": 0,
-  "pre_payment_credit_notes_amount": 0,
-  "receipt_number": null,
-  "starting_balance": 0,
-  "statement_descriptor": "Zulip Standard",
-  "status": "paid",
-  "status_transitions": {
-    "finalized_at": 1000000000,
-    "marked_uncollectible_at": null,
-    "paid_at": 1000000000,
-    "voided_at": null
-  },
-  "subscription": null,
-  "subtotal": 0,
-  "tax": null,
-  "tax_percent": null,
-  "total": 0,
-  "total_tax_amounts": [],
-  "webhooks_delivered_at": 1000000000
-}

corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.finalize_invoice.2.json

@@ -1,117 +0,0 @@
-{
-  "account_country": "US",
-  "account_name": "Dev account",
-  "amount_due": 0,
-  "amount_paid": 0,
-  "amount_remaining": 0,
-  "application_fee_amount": null,
-  "attempt_count": 0,
-  "attempted": true,
-  "auto_advance": false,
-  "billing": "charge_automatically",
-  "billing_reason": "manual",
-  "charge": null,
-  "collection_method": "charge_automatically",
-  "created": 1000000000,
-  "currency": "usd",
-  "custom_fields": null,
-  "customer": "cus_NORMALIZED0001",
-  "customer_address": null,
-  "customer_email": "hamlet@zulip.com",
-  "customer_name": null,
-  "customer_phone": null,
-  "customer_shipping": null,
-  "customer_tax_exempt": "none",
-  "customer_tax_ids": [],
-  "default_payment_method": null,
-  "default_source": null,
-  "default_tax_rates": [],
-  "description": "",
-  "discount": null,
-  "due_date": 1000000000,
-  "ending_balance": 0,
-  "footer": null,
-  "hosted_invoice_url": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000002",
-  "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000002/pdf",
-  "lines": {
-    "data": [
-      {
-        "amount": 36000,
-        "currency": "usd",
-        "description": "Zulip Standard",
-        "discountable": false,
-        "id": "ii_NORMALIZED00000000000003",
-        "invoice_item": "ii_NORMALIZED00000000000003",
-        "livemode": false,
-        "metadata": {},
-        "object": "line_item",
-        "period": {
-          "end": 1000000000,
-          "start": 1000000000
-        },
-        "plan": null,
-        "proration": false,
-        "quantity": 6,
-        "subscription": null,
-        "tax_amounts": [],
-        "tax_rates": [],
-        "type": "invoiceitem"
-      },
-      {
-        "amount": -36000,
-        "currency": "usd",
-        "description": "Payment (Card ending in 4242)",
-        "discountable": false,
-        "id": "ii_NORMALIZED00000000000004",
-        "invoice_item": "ii_NORMALIZED00000000000004",
-        "livemode": false,
-        "metadata": {},
-        "object": "line_item",
-        "period": {
-          "end": 1000000000,
-          "start": 1000000000
-        },
-        "plan": null,
-        "proration": false,
-        "quantity": 1,
-        "subscription": null,
-        "tax_amounts": [],
-        "tax_rates": [],
-        "type": "invoiceitem"
-      }
-    ],
-    "has_more": false,
-    "object": "list",
-    "total_count": 2,
-    "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
-  },
-  "livemode": false,
-  "metadata": {},
-  "next_payment_attempt": null,
-  "number": "NORMALI-0002",
-  "object": "invoice",
-  "paid": true,
-  "payment_intent": null,
-  "period_end": 1000000000,
-  "period_start": 1000000000,
-  "post_payment_credit_notes_amount": 0,
-  "pre_payment_credit_notes_amount": 0,
-  "receipt_number": null,
-  "starting_balance": 0,
-  "statement_descriptor": "Zulip Standard",
-  "status": "paid",
-  "status_transitions": {
-    "finalized_at": 1000000000,
-    "marked_uncollectible_at": null,
-    "paid_at": 1000000000,
-    "voided_at": null
-  },
-  "subscription": null,
-  "subtotal": 0,
-  "tax": null,
-  "tax_percent": null,
-  "total": 0,
-  "total_tax_amounts": [],
-  "webhooks_delivered_at": 1000000000
-}

corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.1.json

@@ -1,124 +0,0 @@
-{
-  "data": [
-    {
-      "account_country": "US",
-      "account_name": "Dev account",
-      "amount_due": 0,
-      "amount_paid": 0,
-      "amount_remaining": 0,
-      "application_fee_amount": null,
-      "attempt_count": 0,
-      "attempted": true,
-      "auto_advance": false,
-      "billing": "charge_automatically",
-      "billing_reason": "manual",
-      "charge": null,
-      "collection_method": "charge_automatically",
-      "created": 1000000000,
-      "currency": "usd",
-      "custom_fields": null,
-      "customer": "cus_NORMALIZED0001",
-      "customer_address": null,
-      "customer_email": "hamlet@zulip.com",
-      "customer_name": null,
-      "customer_phone": null,
-      "customer_shipping": null,
-      "customer_tax_exempt": "none",
-      "customer_tax_ids": [],
-      "default_payment_method": null,
-      "default_source": null,
-      "default_tax_rates": [],
-      "description": "",
-      "discount": null,
-      "due_date": 1000000000,
-      "ending_balance": 0,
-      "footer": null,
-      "hosted_invoice_url": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000001",
-      "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000001/pdf",
-      "lines": {
-        "data": [
-          {
-            "amount": 7200,
-            "currency": "usd",
-            "description": "Zulip Standard",
-            "discountable": false,
-            "id": "ii_NORMALIZED00000000000001",
-            "invoice_item": "ii_NORMALIZED00000000000001",
-            "livemode": false,
-            "metadata": {},
-            "object": "line_item",
-            "period": {
-              "end": 1000000000,
-              "start": 1000000000
-            },
-            "plan": null,
-            "proration": false,
-            "quantity": 6,
-            "subscription": null,
-            "tax_amounts": [],
-            "tax_rates": [],
-            "type": "invoiceitem"
-          },
-          {
-            "amount": -7200,
-            "currency": "usd",
-            "description": "Payment (Card ending in 4242)",
-            "discountable": false,
-            "id": "ii_NORMALIZED00000000000002",
-            "invoice_item": "ii_NORMALIZED00000000000002",
-            "livemode": false,
-            "metadata": {},
-            "object": "line_item",
-            "period": {
-              "end": 1000000000,
-              "start": 1000000000
-            },
-            "plan": null,
-            "proration": false,
-            "quantity": 1,
-            "subscription": null,
-            "tax_amounts": [],
-            "tax_rates": [],
-            "type": "invoiceitem"
-          }
-        ],
-        "has_more": false,
-        "object": "list",
-        "total_count": 2,
-        "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-      },
-      "livemode": false,
-      "metadata": {},
-      "next_payment_attempt": null,
-      "number": "NORMALI-0001",
-      "object": "invoice",
-      "paid": true,
-      "payment_intent": null,
-      "period_end": 1000000000,
-      "period_start": 1000000000,
-      "post_payment_credit_notes_amount": 0,
-      "pre_payment_credit_notes_amount": 0,
-      "receipt_number": null,
-      "starting_balance": 0,
-      "statement_descriptor": "Zulip Standard",
-      "status": "paid",
-      "status_transitions": {
-        "finalized_at": 1000000000,
-        "marked_uncollectible_at": null,
-        "paid_at": 1000000000,
-        "voided_at": null
-      },
-      "subscription": null,
-      "subtotal": 0,
-      "tax": null,
-      "tax_percent": null,
-      "total": 0,
-      "total_tax_amounts": [],
-      "webhooks_delivered_at": 1000000000
-    }
-  ],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/invoices"
-}

corporate/tests/stripe_fixtures/attach_discount_to_realm--Invoice.list.2.json

@@ -1,241 +0,0 @@
-{
-  "data": [
-    {
-      "account_country": "US",
-      "account_name": "Dev account",
-      "amount_due": 0,
-      "amount_paid": 0,
-      "amount_remaining": 0,
-      "application_fee_amount": null,
-      "attempt_count": 0,
-      "attempted": true,
-      "auto_advance": false,
-      "billing": "charge_automatically",
-      "billing_reason": "manual",
-      "charge": null,
-      "collection_method": "charge_automatically",
-      "created": 1000000000,
-      "currency": "usd",
-      "custom_fields": null,
-      "customer": "cus_NORMALIZED0001",
-      "customer_address": null,
-      "customer_email": "hamlet@zulip.com",
-      "customer_name": null,
-      "customer_phone": null,
-      "customer_shipping": null,
-      "customer_tax_exempt": "none",
-      "customer_tax_ids": [],
-      "default_payment_method": null,
-      "default_source": null,
-      "default_tax_rates": [],
-      "description": "",
-      "discount": null,
-      "due_date": 1000000000,
-      "ending_balance": 0,
-      "footer": null,
-      "hosted_invoice_url": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000002",
-      "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000002/pdf",
-      "lines": {
-        "data": [
-          {
-            "amount": 36000,
-            "currency": "usd",
-            "description": "Zulip Standard",
-            "discountable": false,
-            "id": "ii_NORMALIZED00000000000003",
-            "invoice_item": "ii_NORMALIZED00000000000003",
-            "livemode": false,
-            "metadata": {},
-            "object": "line_item",
-            "period": {
-              "end": 1000000000,
-              "start": 1000000000
-            },
-            "plan": null,
-            "proration": false,
-            "quantity": 6,
-            "subscription": null,
-            "tax_amounts": [],
-            "tax_rates": [],
-            "type": "invoiceitem"
-          },
-          {
-            "amount": -36000,
-            "currency": "usd",
-            "description": "Payment (Card ending in 4242)",
-            "discountable": false,
-            "id": "ii_NORMALIZED00000000000004",
-            "invoice_item": "ii_NORMALIZED00000000000004",
-            "livemode": false,
-            "metadata": {},
-            "object": "line_item",
-            "period": {
-              "end": 1000000000,
-              "start": 1000000000
-            },
-            "plan": null,
-            "proration": false,
-            "quantity": 1,
-            "subscription": null,
-            "tax_amounts": [],
-            "tax_rates": [],
-            "type": "invoiceitem"
-          }
-        ],
-        "has_more": false,
-        "object": "list",
-        "total_count": 2,
-        "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
-      },
-      "livemode": false,
-      "metadata": {},
-      "next_payment_attempt": null,
-      "number": "NORMALI-0002",
-      "object": "invoice",
-      "paid": true,
-      "payment_intent": null,
-      "period_end": 1000000000,
-      "period_start": 1000000000,
-      "post_payment_credit_notes_amount": 0,
-      "pre_payment_credit_notes_amount": 0,
-      "receipt_number": null,
-      "starting_balance": 0,
-      "statement_descriptor": "Zulip Standard",
-      "status": "paid",
-      "status_transitions": {
-        "finalized_at": 1000000000,
-        "marked_uncollectible_at": null,
-        "paid_at": 1000000000,
-        "voided_at": null
-      },
-      "subscription": null,
-      "subtotal": 0,
-      "tax": null,
-      "tax_percent": null,
-      "total": 0,
-      "total_tax_amounts": [],
-      "webhooks_delivered_at": 1000000000
-    },
-    {
-      "account_country": "US",
-      "account_name": "Dev account",
-      "amount_due": 0,
-      "amount_paid": 0,
-      "amount_remaining": 0,
-      "application_fee_amount": null,
-      "attempt_count": 0,
-      "attempted": true,
-      "auto_advance": false,
-      "billing": "charge_automatically",
-      "billing_reason": "manual",
-      "charge": null,
-      "collection_method": "charge_automatically",
-      "created": 1000000000,
-      "currency": "usd",
-      "custom_fields": null,
-      "customer": "cus_NORMALIZED0001",
-      "customer_address": null,
-      "customer_email": "hamlet@zulip.com",
-      "customer_name": null,
-      "customer_phone": null,
-      "customer_shipping": null,
-      "customer_tax_exempt": "none",
-      "customer_tax_ids": [],
-      "default_payment_method": null,
-      "default_source": null,
-      "default_tax_rates": [],
-      "description": "",
-      "discount": null,
-      "due_date": 1000000000,
-      "ending_balance": 0,
-      "footer": null,
-      "hosted_invoice_url": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000001",
-      "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000001/pdf",
-      "lines": {
-        "data": [
-          {
-            "amount": 7200,
-            "currency": "usd",
-            "description": "Zulip Standard",
-            "discountable": false,
-            "id": "ii_NORMALIZED00000000000001",
-            "invoice_item": "ii_NORMALIZED00000000000001",
-            "livemode": false,
-            "metadata": {},
-            "object": "line_item",
-            "period": {
-              "end": 1000000000,
-              "start": 1000000000
-            },
-            "plan": null,
-            "proration": false,
-            "quantity": 6,
-            "subscription": null,
-            "tax_amounts": [],
-            "tax_rates": [],
-            "type": "invoiceitem"
-          },
-          {
-            "amount": -7200,
-            "currency": "usd",
-            "description": "Payment (Card ending in 4242)",
-            "discountable": false,
-            "id": "ii_NORMALIZED00000000000002",
-            "invoice_item": "ii_NORMALIZED00000000000002",
-            "livemode": false,
-            "metadata": {},
-            "object": "line_item",
-            "period": {
-              "end": 1000000000,
-              "start": 1000000000
-            },
-            "plan": null,
-            "proration": false,
-            "quantity": 1,
-            "subscription": null,
-            "tax_amounts": [],
-            "tax_rates": [],
-            "type": "invoiceitem"
-          }
-        ],
-        "has_more": false,
-        "object": "list",
-        "total_count": 2,
-        "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-      },
-      "livemode": false,
-      "metadata": {},
-      "next_payment_attempt": null,
-      "number": "NORMALI-0001",
-      "object": "invoice",
-      "paid": true,
-      "payment_intent": null,
-      "period_end": 1000000000,
-      "period_start": 1000000000,
-      "post_payment_credit_notes_amount": 0,
-      "pre_payment_credit_notes_amount": 0,
-      "receipt_number": null,
-      "starting_balance": 0,
-      "statement_descriptor": "Zulip Standard",
-      "status": "paid",
-      "status_transitions": {
-        "finalized_at": 1000000000,
-        "marked_uncollectible_at": null,
-        "paid_at": 1000000000,
-        "voided_at": null
-      },
-      "subscription": null,
-      "subtotal": 0,
-      "tax": null,
-      "tax_percent": null,
-      "total": 0,
-      "total_tax_amounts": [],
-      "webhooks_delivered_at": 1000000000
-    }
-  ],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/invoices"
-}

corporate/tests/stripe_fixtures/attach_discount_to_realm--InvoiceItem.create.1.json

@@ -1,23 +0,0 @@
-{
-  "amount": -7200,
-  "currency": "usd",
-  "customer": "cus_NORMALIZED0001",
-  "date": 1000000000,
-  "description": "Payment (Card ending in 4242)",
-  "discountable": false,
-  "id": "ii_NORMALIZED00000000000002",
-  "invoice": null,
-  "livemode": false,
-  "metadata": {},
-  "object": "invoiceitem",
-  "period": {
-    "end": 1000000000,
-    "start": 1000000000
-  },
-  "plan": null,
-  "proration": false,
-  "quantity": 1,
-  "subscription": null,
-  "tax_rates": [],
-  "unit_amount": -7200
-}

corporate/tests/stripe_fixtures/attach_discount_to_realm--InvoiceItem.create.2.json

@@ -1,23 +0,0 @@
-{
-  "amount": 7200,
-  "currency": "usd",
-  "customer": "cus_NORMALIZED0001",
-  "date": 1000000000,
-  "description": "Zulip Standard",
-  "discountable": false,
-  "id": "ii_NORMALIZED00000000000001",
-  "invoice": null,
-  "livemode": false,
-  "metadata": {},
-  "object": "invoiceitem",
-  "period": {
-    "end": 1000000000,
-    "start": 1000000000
-  },
-  "plan": null,
-  "proration": false,
-  "quantity": 6,
-  "subscription": null,
-  "tax_rates": [],
-  "unit_amount": 1200
-}

corporate/tests/stripe_fixtures/attach_discount_to_realm--InvoiceItem.create.3.json

@@ -1,23 +0,0 @@
-{
-  "amount": -36000,
-  "currency": "usd",
-  "customer": "cus_NORMALIZED0001",
-  "date": 1000000000,
-  "description": "Payment (Card ending in 4242)",
-  "discountable": false,
-  "id": "ii_NORMALIZED00000000000004",
-  "invoice": null,
-  "livemode": false,
-  "metadata": {},
-  "object": "invoiceitem",
-  "period": {
-    "end": 1000000000,
-    "start": 1000000000
-  },
-  "plan": null,
-  "proration": false,
-  "quantity": 1,
-  "subscription": null,
-  "tax_rates": [],
-  "unit_amount": -36000
-}

corporate/tests/stripe_fixtures/attach_discount_to_realm--InvoiceItem.create.4.json

@@ -1,23 +0,0 @@
-{
-  "amount": 36000,
-  "currency": "usd",
-  "customer": "cus_NORMALIZED0001",
-  "date": 1000000000,
-  "description": "Zulip Standard",
-  "discountable": false,
-  "id": "ii_NORMALIZED00000000000003",
-  "invoice": null,
-  "livemode": false,
-  "metadata": {},
-  "object": "invoiceitem",
-  "period": {
-    "end": 1000000000,
-    "start": 1000000000
-  },
-  "plan": null,
-  "proration": false,
-  "quantity": 6,
-  "subscription": null,
-  "tax_rates": [],
-  "unit_amount": 6000
-}

corporate/tests/stripe_fixtures/attach_discount_to_realm--Token.create.1.json

@@ -1,33 +0,0 @@
-{
-  "card": {
-    "address_city": "Pacific",
-    "address_country": "United States",
-    "address_line1": "Under the sea,",
-    "address_line1_check": "unchecked",
-    "address_line2": null,
-    "address_state": null,
-    "address_zip": "33333",
-    "address_zip_check": "unchecked",
-    "brand": "Visa",
-    "country": "US",
-    "cvc_check": "unchecked",
-    "dynamic_last4": null,
-    "exp_month": 3,
-    "exp_year": 2033,
-    "fingerprint": "NORMALIZED000001",
-    "funding": "credit",
-    "id": "card_NORMALIZED00000000000001",
-    "last4": "4242",
-    "metadata": {},
-    "name": "Ada Starr",
-    "object": "card",
-    "tokenization_method": null
-  },
-  "client_ip": "0.0.0.0",
-  "created": 1000000000,
-  "id": "tok_NORMALIZED00000000000001",
-  "livemode": false,
-  "object": "token",
-  "type": "card",
-  "used": false
-}

corporate/tests/stripe_fixtures/billing_page_permissions--Charge.create.1.json

@@ -1,112 +0,0 @@
-{
-  "amount": 48000,
-  "amount_refunded": 0,
-  "application": null,
-  "application_fee": null,
-  "application_fee_amount": null,
-  "balance_transaction": "txn_NORMALIZED00000000000001",
-  "billing_details": {
-    "address": {
-      "city": "Pacific",
-      "country": "United States",
-      "line1": "Under the sea,",
-      "line2": null,
-      "postal_code": "33333",
-      "state": null
-    },
-    "email": null,
-    "name": "Ada Starr",
-    "phone": null
-  },
-  "captured": true,
-  "created": 1000000000,
-  "currency": "usd",
-  "customer": "cus_NORMALIZED0001",
-  "description": "Upgrade to Zulip Standard, $80.0 x 6",
-  "destination": null,
-  "dispute": null,
-  "failure_code": null,
-  "failure_message": null,
-  "fraud_details": {},
-  "id": "ch_NORMALIZED00000000000001",
-  "invoice": null,
-  "livemode": false,
-  "metadata": {},
-  "object": "charge",
-  "on_behalf_of": null,
-  "order": null,
-  "outcome": {
-    "network_status": "approved_by_network",
-    "reason": null,
-    "risk_level": "normal",
-    "risk_score": 00,
-    "seller_message": "Payment complete.",
-    "type": "authorized"
-  },
-  "paid": true,
-  "payment_intent": null,
-  "payment_method": "card_NORMALIZED00000000000001",
-  "payment_method_details": {
-    "card": {
-      "brand": "visa",
-      "checks": {
-        "address_line1_check": "pass",
-        "address_postal_code_check": "pass",
-        "cvc_check": "pass"
-      },
-      "country": "US",
-      "exp_month": 3,
-      "exp_year": 2033,
-      "fingerprint": "NORMALIZED000001",
-      "funding": "credit",
-      "last4": "4242",
-      "three_d_secure": null,
-      "wallet": null
-    },
-    "type": "card"
-  },
-  "receipt_email": "hamlet@zulip.com",
-  "receipt_number": null,
-  "receipt_url": "https://pay.stripe.com/receipts/acct_NORMALIZED000001/ch_NORMALIZED00000000000001/rcpt_NORMALIZED000000000000000000001",
-  "refunded": false,
-  "refunds": {
-    "data": [],
-    "has_more": false,
-    "object": "list",
-    "total_count": 0,
-    "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
-  },
-  "review": null,
-  "shipping": null,
-  "source": {
-    "address_city": "Pacific",
-    "address_country": "United States",
-    "address_line1": "Under the sea,",
-    "address_line1_check": "pass",
-    "address_line2": null,
-    "address_state": null,
-    "address_zip": "33333",
-    "address_zip_check": "pass",
-    "brand": "Visa",
-    "country": "US",
-    "customer": "cus_NORMALIZED0001",
-    "cvc_check": "pass",
-    "dynamic_last4": null,
-    "exp_month": 3,
-    "exp_year": 2033,
-    "fingerprint": "NORMALIZED000001",
-    "funding": "credit",
-    "id": "card_NORMALIZED00000000000001",
-    "last4": "4242",
-    "metadata": {},
-    "name": "Ada Starr",
-    "object": "card",
-    "tokenization_method": null
-  },
-  "source_transfer": null,
-  "statement_descriptor": "Zulip Standard",
-  "statement_descriptor_suffix": "Zulip Standard",
-  "status": "succeeded",
-  "transfer_data": null,
-  "transfer_group": null
-}

corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.1.json

@@ -1,103 +0,0 @@
-{
-  "account_balance": 0,
-  "address": null,
-  "balance": 0,
-  "created": 1000000000,
-  "currency": "usd",
-  "default_source": {
-    "address_city": "Pacific",
-    "address_country": "United States",
-    "address_line1": "Under the sea,",
-    "address_line1_check": "pass",
-    "address_line2": null,
-    "address_state": null,
-    "address_zip": "33333",
-    "address_zip_check": "pass",
-    "brand": "Visa",
-    "country": "US",
-    "customer": "cus_NORMALIZED0001",
-    "cvc_check": "pass",
-    "dynamic_last4": null,
-    "exp_month": 3,
-    "exp_year": 2033,
-    "fingerprint": "NORMALIZED000001",
-    "funding": "credit",
-    "id": "card_NORMALIZED00000000000001",
-    "last4": "4242",
-    "metadata": {},
-    "name": "Ada Starr",
-    "object": "card",
-    "tokenization_method": null
-  },
-  "delinquent": false,
-  "description": "zulip (Zulip Dev)",
-  "discount": null,
-  "email": "hamlet@zulip.com",
-  "id": "cus_NORMALIZED0001",
-  "invoice_prefix": "NORMA01",
-  "invoice_settings": {
-    "custom_fields": null,
-    "default_payment_method": null,
-    "footer": null
-  },
-  "livemode": false,
-  "metadata": {
-    "realm_id": "1",
-    "realm_str": "zulip"
-  },
-  "name": null,
-  "object": "customer",
-  "phone": null,
-  "preferred_locales": [],
-  "shipping": null,
-  "sources": {
-    "data": [
-      {
-        "address_city": "Pacific",
-        "address_country": "United States",
-        "address_line1": "Under the sea,",
-        "address_line1_check": "pass",
-        "address_line2": null,
-        "address_state": null,
-        "address_zip": "33333",
-        "address_zip_check": "pass",
-        "brand": "Visa",
-        "country": "US",
-        "customer": "cus_NORMALIZED0001",
-        "cvc_check": "pass",
-        "dynamic_last4": null,
-        "exp_month": 3,
-        "exp_year": 2033,
-        "fingerprint": "NORMALIZED000001",
-        "funding": "credit",
-        "id": "card_NORMALIZED00000000000001",
-        "last4": "4242",
-        "metadata": {},
-        "name": "Ada Starr",
-        "object": "card",
-        "tokenization_method": null
-      }
-    ],
-    "has_more": false,
-    "object": "list",
-    "total_count": 1,
-    "url": "/v1/customers/cus_NORMALIZED0001/sources"
-  },
-  "subscriptions": {
-    "data": [],
-    "has_more": false,
-    "object": "list",
-    "total_count": 0,
-    "url": "/v1/customers/cus_NORMALIZED0001/subscriptions"
-  },
-  "tax_exempt": "none",
-  "tax_ids": {
-    "data": [],
-    "has_more": false,
-    "object": "list",
-    "total_count": 0,
-    "url": "/v1/customers/cus_NORMALIZED0001/tax_ids"
-  },
-  "tax_info": null,
-  "tax_info_verification": null
-}

corporate/tests/stripe_fixtures/billing_page_permissions--Customer.retrieve.2.json

@@ -1,103 +0,0 @@
-{
-  "account_balance": 0,
-  "address": null,
-  "balance": 0,
-  "created": 1000000000,
-  "currency": "usd",
-  "default_source": {
-    "address_city": "Pacific",
-    "address_country": "United States",
-    "address_line1": "Under the sea,",
-    "address_line1_check": "pass",
-    "address_line2": null,
-    "address_state": null,
-    "address_zip": "33333",
-    "address_zip_check": "pass",
-    "brand": "Visa",
-    "country": "US",
-    "customer": "cus_NORMALIZED0001",
-    "cvc_check": "pass",
-    "dynamic_last4": null,
-    "exp_month": 3,
-    "exp_year": 2033,
-    "fingerprint": "NORMALIZED000001",
-    "funding": "credit",
-    "id": "card_NORMALIZED00000000000001",
-    "last4": "4242",
-    "metadata": {},
-    "name": "Ada Starr",
-    "object": "card",
-    "tokenization_method": null
-  },
-  "delinquent": false,
-  "description": "zulip (Zulip Dev)",
-  "discount": null,
-  "email": "hamlet@zulip.com",
-  "id": "cus_NORMALIZED0001",
-  "invoice_prefix": "NORMA01",
-  "invoice_settings": {
-    "custom_fields": null,
-    "default_payment_method": null,
-    "footer": null
-  },
-  "livemode": false,
-  "metadata": {
-    "realm_id": "1",
-    "realm_str": "zulip"
-  },
-  "name": null,
-  "object": "customer",
-  "phone": null,
-  "preferred_locales": [],
-  "shipping": null,
-  "sources": {
-    "data": [
-      {
-        "address_city": "Pacific",
-        "address_country": "United States",
-        "address_line1": "Under the sea,",
-        "address_line1_check": "pass",
-        "address_line2": null,
-        "address_state": null,
-        "address_zip": "33333",
-        "address_zip_check": "pass",
-        "brand": "Visa",
-        "country": "US",
-        "customer": "cus_NORMALIZED0001",
-        "cvc_check": "pass",
-        "dynamic_last4": null,
-        "exp_month": 3,
-        "exp_year": 2033,
-        "fingerprint": "NORMALIZED000001",
-        "funding": "credit",
-        "id": "card_NORMALIZED00000000000001",
-        "last4": "4242",
-        "metadata": {},
-        "name": "Ada Starr",
-        "object": "card",
-        "tokenization_method": null
-      }
-    ],
-    "has_more": false,
-    "object": "list",
-    "total_count": 1,
-    "url": "/v1/customers/cus_NORMALIZED0001/sources"
-  },
-  "subscriptions": {
-    "data": [],
-    "has_more": false,
-    "object": "list",
-    "total_count": 0,
-    "url": "/v1/customers/cus_NORMALIZED0001/subscriptions"
-  },
-  "tax_exempt": "none",
-  "tax_ids": {
-    "data": [],
-    "has_more": false,
-    "object": "list",
-    "total_count": 0,
-    "url": "/v1/customers/cus_NORMALIZED0001/tax_ids"
-  },
-  "tax_info": null,
-  "tax_info_verification": null
-}

corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.create.1.json

@@ -1,117 +0,0 @@
-{
-  "account_country": "US",
-  "account_name": "Dev account",
-  "amount_due": 0,
-  "amount_paid": 0,
-  "amount_remaining": 0,
-  "application_fee_amount": null,
-  "attempt_count": 0,
-  "attempted": false,
-  "auto_advance": true,
-  "billing": "charge_automatically",
-  "billing_reason": "manual",
-  "charge": null,
-  "collection_method": "charge_automatically",
-  "created": 1000000000,
-  "currency": "usd",
-  "custom_fields": null,
-  "customer": "cus_NORMALIZED0001",
-  "customer_address": null,
-  "customer_email": "hamlet@zulip.com",
-  "customer_name": null,
-  "customer_phone": null,
-  "customer_shipping": null,
-  "customer_tax_exempt": "none",
-  "customer_tax_ids": [],
-  "default_payment_method": null,
-  "default_source": null,
-  "default_tax_rates": [],
-  "description": "",
-  "discount": null,
-  "due_date": null,
-  "ending_balance": null,
-  "footer": null,
-  "hosted_invoice_url": null,
-  "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": null,
-  "lines": {
-    "data": [
-      {
-        "amount": 48000,
-        "currency": "usd",
-        "description": "Zulip Standard",
-        "discountable": false,
-        "id": "ii_NORMALIZED00000000000001",
-        "invoice_item": "ii_NORMALIZED00000000000001",
-        "livemode": false,
-        "metadata": {},
-        "object": "line_item",
-        "period": {
-          "end": 1000000000,
-          "start": 1000000000
-        },
-        "plan": null,
-        "proration": false,
-        "quantity": 6,
-        "subscription": null,
-        "tax_amounts": [],
-        "tax_rates": [],
-        "type": "invoiceitem"
-      },
-      {
-        "amount": -48000,
-        "currency": "usd",
-        "description": "Payment (Card ending in 4242)",
-        "discountable": false,
-        "id": "ii_NORMALIZED00000000000002",
-        "invoice_item": "ii_NORMALIZED00000000000002",
-        "livemode": false,
-        "metadata": {},
-        "object": "line_item",
-        "period": {
-          "end": 1000000000,
-          "start": 1000000000
-        },
-        "plan": null,
-        "proration": false,
-        "quantity": 1,
-        "subscription": null,
-        "tax_amounts": [],
-        "tax_rates": [],
-        "type": "invoiceitem"
-      }
-    ],
-    "has_more": false,
-    "object": "list",
-    "total_count": 2,
-    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-  },
-  "livemode": false,
-  "metadata": {},
-  "next_payment_attempt": 1000000000,
-  "number": "NORMALI-0001",
-  "object": "invoice",
-  "paid": false,
-  "payment_intent": null,
-  "period_end": 1000000000,
-  "period_start": 1000000000,
-  "post_payment_credit_notes_amount": 0,
-  "pre_payment_credit_notes_amount": 0,
-  "receipt_number": null,
-  "starting_balance": 0,
-  "statement_descriptor": "Zulip Standard",
-  "status": "draft",
-  "status_transitions": {
-    "finalized_at": null,
-    "marked_uncollectible_at": null,
-    "paid_at": null,
-    "voided_at": null
-  },
-  "subscription": null,
-  "subtotal": 0,
-  "tax": null,
-  "tax_percent": null,
-  "total": 0,
-  "total_tax_amounts": [],
-  "webhooks_delivered_at": null
-}

corporate/tests/stripe_fixtures/billing_page_permissions--Invoice.finalize_invoice.1.json

@@ -1,117 +0,0 @@
-{
-  "account_country": "US",
-  "account_name": "Dev account",
-  "amount_due": 0,
-  "amount_paid": 0,
-  "amount_remaining": 0,
-  "application_fee_amount": null,
-  "attempt_count": 0,
-  "attempted": true,
-  "auto_advance": false,
-  "billing": "charge_automatically",
-  "billing_reason": "manual",
-  "charge": null,
-  "collection_method": "charge_automatically",
-  "created": 1000000000,
-  "currency": "usd",
-  "custom_fields": null,
-  "customer": "cus_NORMALIZED0001",
-  "customer_address": null,
-  "customer_email": "hamlet@zulip.com",
-  "customer_name": null,
-  "customer_phone": null,
-  "customer_shipping": null,
-  "customer_tax_exempt": "none",
-  "customer_tax_ids": [],
-  "default_payment_method": null,
-  "default_source": null,
-  "default_tax_rates": [],
-  "description": "",
-  "discount": null,
-  "due_date": 1000000000,
-  "ending_balance": 0,
-  "footer": null,
-  "hosted_invoice_url": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000001",
-  "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000001/pdf",
-  "lines": {
-    "data": [
-      {
-        "amount": 48000,
-        "currency": "usd",
-        "description": "Zulip Standard",
-        "discountable": false,
-        "id": "ii_NORMALIZED00000000000001",
-        "invoice_item": "ii_NORMALIZED00000000000001",
-        "livemode": false,
-        "metadata": {},
-        "object": "line_item",
-        "period": {
-          "end": 1000000000,
-          "start": 1000000000
-        },
-        "plan": null,
-        "proration": false,
-        "quantity": 6,
-        "subscription": null,
-        "tax_amounts": [],
-        "tax_rates": [],
-        "type": "invoiceitem"
-      },
-      {
-        "amount": -48000,
-        "currency": "usd",
-        "description": "Payment (Card ending in 4242)",
-        "discountable": false,
-        "id": "ii_NORMALIZED00000000000002",
-        "invoice_item": "ii_NORMALIZED00000000000002",
-        "livemode": false,
-        "metadata": {},
-        "object": "line_item",
-        "period": {
-          "end": 1000000000,
-          "start": 1000000000
-        },
-        "plan": null,
-        "proration": false,
-        "quantity": 1,
-        "subscription": null,
-        "tax_amounts": [],
-        "tax_rates": [],
-        "type": "invoiceitem"
-      }
-    ],
-    "has_more": false,
-    "object": "list",
-    "total_count": 2,
-    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-  },
-  "livemode": false,
-  "metadata": {},
-  "next_payment_attempt": null,
-  "number": "NORMALI-0001",
-  "object": "invoice",
-  "paid": true,
-  "payment_intent": null,
-  "period_end": 1000000000,
-  "period_start": 1000000000,
-  "post_payment_credit_notes_amount": 0,
-  "pre_payment_credit_notes_amount": 0,
-  "receipt_number": null,
-  "starting_balance": 0,
-  "statement_descriptor": "Zulip Standard",
-  "status": "paid",
-  "status_transitions": {
-    "finalized_at": 1000000000,
-    "marked_uncollectible_at": null,
-    "paid_at": 1000000000,
-    "voided_at": null
-  },
-  "subscription": null,
-  "subtotal": 0,
-  "tax": null,
-  "tax_percent": null,
-  "total": 0,
-  "total_tax_amounts": [],
-  "webhooks_delivered_at": 1000000000
-}

corporate/tests/stripe_fixtures/billing_page_permissions--InvoiceItem.create.1.json

@@ -1,23 +0,0 @@
-{
-  "amount": -48000,
-  "currency": "usd",
-  "customer": "cus_NORMALIZED0001",
-  "date": 1000000000,
-  "description": "Payment (Card ending in 4242)",
-  "discountable": false,
-  "id": "ii_NORMALIZED00000000000002",
-  "invoice": null,
-  "livemode": false,
-  "metadata": {},
-  "object": "invoiceitem",
-  "period": {
-    "end": 1000000000,
-    "start": 1000000000
-  },
-  "plan": null,
-  "proration": false,
-  "quantity": 1,
-  "subscription": null,
-  "tax_rates": [],
-  "unit_amount": -48000
-}

corporate/tests/stripe_fixtures/billing_page_permissions--InvoiceItem.create.2.json

@@ -1,23 +0,0 @@
-{
-  "amount": 48000,
-  "currency": "usd",
-  "customer": "cus_NORMALIZED0001",
-  "date": 1000000000,
-  "description": "Zulip Standard",
-  "discountable": false,
-  "id": "ii_NORMALIZED00000000000001",
-  "invoice": null,
-  "livemode": false,
-  "metadata": {},
-  "object": "invoiceitem",
-  "period": {
-    "end": 1000000000,
-    "start": 1000000000
-  },
-  "plan": null,
-  "proration": false,
-  "quantity": 6,
-  "subscription": null,
-  "tax_rates": [],
-  "unit_amount": 8000
-}

corporate/tests/stripe_fixtures/billing_page_permissions:Customer.create.1.json

@@ -1,21 +1,17 @@
 {
   "account_balance": 0,
-  "created": 1548695523,
+  "created": 1539881153,
   "currency": null,
-  "default_source": "card_1DxdeRGh0CmXqmnwu3BibWtM",
+  "default_source": "card_1DMedAGh0CmXqmnwDLwrAV1v",
   "delinquent": false,
   "description": "zulip (Zulip Dev)",
   "discount": null,
   "email": "hamlet@zulip.com",
-  "id": "cus_EQUd48LphR5ahk",
-  "invoice_prefix": "9F53235",
-  "invoice_settings": {
-    "custom_fields": null,
-    "footer": null
-  },
+  "id": "cus_DoHBcS2dBGOP9t",
+  "invoice_prefix": "3B3F5D6",
   "livemode": false,
   "metadata": {
-    "realm_id": "2",
+    "realm_id": "1",
     "realm_str": "zulip"
   },
   "object": "customer",
@@ -33,14 +29,14 @@
         "address_zip_check": "pass",
         "brand": "Visa",
         "country": "US",
-        "customer": "cus_EQUd48LphR5ahk",
+        "customer": "cus_DoHBcS2dBGOP9t",
         "cvc_check": "pass",
         "dynamic_last4": null,
         "exp_month": 3,
         "exp_year": 2033,
         "fingerprint": "6dAXT9VZvwro65EK",
         "funding": "credit",
-        "id": "card_1DxdeRGh0CmXqmnwu3BibWtM",
+        "id": "card_1DMedAGh0CmXqmnwDLwrAV1v",
         "last4": "4242",
         "metadata": {},
         "name": "Ada Starr",
@@ -51,14 +47,14 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/customers/cus_EQUd48LphR5ahk/sources"
+    "url": "/v1/customers/cus_DoHBcS2dBGOP9t/sources"
   },
   "subscriptions": {
     "data": [],
     "has_more": false,
     "object": "list",
     "total_count": 0,
-    "url": "/v1/customers/cus_EQUd48LphR5ahk/subscriptions"
+    "url": "/v1/customers/cus_DoHBcS2dBGOP9t/subscriptions"
   },
   "tax_info": null,
   "tax_info_verification": null

corporate/tests/stripe_fixtures/billing_page_permissions:Customer.retrieve.1.json

@@ -0,0 +1,168 @@
+{
+  "account_balance": 0,
+  "created": 1539881153,
+  "currency": "usd",
+  "default_source": {
+    "address_city": "Pacific",
+    "address_country": "United States",
+    "address_line1": "Under the sea,",
+    "address_line1_check": "pass",
+    "address_line2": null,
+    "address_state": null,
+    "address_zip": "33333",
+    "address_zip_check": "pass",
+    "brand": "Visa",
+    "country": "US",
+    "customer": "cus_DoHBcS2dBGOP9t",
+    "cvc_check": "pass",
+    "dynamic_last4": null,
+    "exp_month": 3,
+    "exp_year": 2033,
+    "fingerprint": "6dAXT9VZvwro65EK",
+    "funding": "credit",
+    "id": "card_1DMedAGh0CmXqmnwDLwrAV1v",
+    "last4": "4242",
+    "metadata": {},
+    "name": "Ada Starr",
+    "object": "card",
+    "tokenization_method": null
+  },
+  "delinquent": false,
+  "description": "zulip (Zulip Dev)",
+  "discount": null,
+  "email": "hamlet@zulip.com",
+  "id": "cus_DoHBcS2dBGOP9t",
+  "invoice_prefix": "3B3F5D6",
+  "livemode": false,
+  "metadata": {
+    "realm_id": "1",
+    "realm_str": "zulip"
+  },
+  "object": "customer",
+  "shipping": null,
+  "sources": {
+    "data": [
+      {
+        "address_city": "Pacific",
+        "address_country": "United States",
+        "address_line1": "Under the sea,",
+        "address_line1_check": "pass",
+        "address_line2": null,
+        "address_state": null,
+        "address_zip": "33333",
+        "address_zip_check": "pass",
+        "brand": "Visa",
+        "country": "US",
+        "customer": "cus_DoHBcS2dBGOP9t",
+        "cvc_check": "pass",
+        "dynamic_last4": null,
+        "exp_month": 3,
+        "exp_year": 2033,
+        "fingerprint": "6dAXT9VZvwro65EK",
+        "funding": "credit",
+        "id": "card_1DMedAGh0CmXqmnwDLwrAV1v",
+        "last4": "4242",
+        "metadata": {},
+        "name": "Ada Starr",
+        "object": "card",
+        "tokenization_method": null
+      }
+    ],
+    "has_more": false,
+    "object": "list",
+    "total_count": 1,
+    "url": "/v1/customers/cus_DoHBcS2dBGOP9t/sources"
+  },
+  "subscriptions": {
+    "data": [
+      {
+        "application_fee_percent": null,
+        "billing": "charge_automatically",
+        "billing_cycle_anchor": 1539881154,
+        "cancel_at_period_end": false,
+        "canceled_at": null,
+        "created": 1539881154,
+        "current_period_end": 1571417154,
+        "current_period_start": 1539881154,
+        "customer": "cus_DoHBcS2dBGOP9t",
+        "days_until_due": null,
+        "discount": null,
+        "ended_at": null,
+        "id": "sub_DoHBD49xn11qGo",
+        "items": {
+          "data": [
+            {
+              "created": 1539881154,
+              "id": "si_DoHB9flY9e7zrZ",
+              "metadata": {},
+              "object": "subscription_item",
+              "plan": {
+                "active": true,
+                "aggregate_usage": null,
+                "amount": 8000,
+                "billing_scheme": "per_unit",
+                "created": 1539831971,
+                "currency": "usd",
+                "id": "plan_Do3xCvbzO89OsR",
+                "interval": "year",
+                "interval_count": 1,
+                "livemode": false,
+                "metadata": {},
+                "nickname": "annual",
+                "object": "plan",
+                "product": "prod_Do3x494SetTDpx",
+                "tiers": null,
+                "tiers_mode": null,
+                "transform_usage": null,
+                "trial_period_days": null,
+                "usage_type": "licensed"
+              },
+              "quantity": 8,
+              "subscription": "sub_DoHBD49xn11qGo"
+            }
+          ],
+          "has_more": false,
+          "object": "list",
+          "total_count": 1,
+          "url": "/v1/subscription_items?subscription=sub_DoHBD49xn11qGo"
+        },
+        "livemode": false,
+        "metadata": {},
+        "object": "subscription",
+        "plan": {
+          "active": true,
+          "aggregate_usage": null,
+          "amount": 8000,
+          "billing_scheme": "per_unit",
+          "created": 1539831971,
+          "currency": "usd",
+          "id": "plan_Do3xCvbzO89OsR",
+          "interval": "year",
+          "interval_count": 1,
+          "livemode": false,
+          "metadata": {},
+          "nickname": "annual",
+          "object": "plan",
+          "product": "prod_Do3x494SetTDpx",
+          "tiers": null,
+          "tiers_mode": null,
+          "transform_usage": null,
+          "trial_period_days": null,
+          "usage_type": "licensed"
+        },
+        "quantity": 8,
+        "start": 1539881154,
+        "status": "active",
+        "tax_percent": 0.0,
+        "trial_end": null,
+        "trial_start": null
+      }
+    ],
+    "has_more": false,
+    "object": "list",
+    "total_count": 1,
+    "url": "/v1/customers/cus_DoHBcS2dBGOP9t/subscriptions"
+  },
+  "tax_info": null,
+  "tax_info_verification": null
+}

corporate/tests/stripe_fixtures/billing_page_permissions:Customer.retrieve.2.json

@@ -0,0 +1,168 @@
+{
+  "account_balance": 0,
+  "created": 1539881153,
+  "currency": "usd",
+  "default_source": {
+    "address_city": "Pacific",
+    "address_country": "United States",
+    "address_line1": "Under the sea,",
+    "address_line1_check": "pass",
+    "address_line2": null,
+    "address_state": null,
+    "address_zip": "33333",
+    "address_zip_check": "pass",
+    "brand": "Visa",
+    "country": "US",
+    "customer": "cus_DoHBcS2dBGOP9t",
+    "cvc_check": "pass",
+    "dynamic_last4": null,
+    "exp_month": 3,
+    "exp_year": 2033,
+    "fingerprint": "6dAXT9VZvwro65EK",
+    "funding": "credit",
+    "id": "card_1DMedAGh0CmXqmnwDLwrAV1v",
+    "last4": "4242",
+    "metadata": {},
+    "name": "Ada Starr",
+    "object": "card",
+    "tokenization_method": null
+  },
+  "delinquent": false,
+  "description": "zulip (Zulip Dev)",
+  "discount": null,
+  "email": "hamlet@zulip.com",
+  "id": "cus_DoHBcS2dBGOP9t",
+  "invoice_prefix": "3B3F5D6",
+  "livemode": false,
+  "metadata": {
+    "realm_id": "1",
+    "realm_str": "zulip"
+  },
+  "object": "customer",
+  "shipping": null,
+  "sources": {
+    "data": [
+      {
+        "address_city": "Pacific",
+        "address_country": "United States",
+        "address_line1": "Under the sea,",
+        "address_line1_check": "pass",
+        "address_line2": null,
+        "address_state": null,
+        "address_zip": "33333",
+        "address_zip_check": "pass",
+        "brand": "Visa",
+        "country": "US",
+        "customer": "cus_DoHBcS2dBGOP9t",
+        "cvc_check": "pass",
+        "dynamic_last4": null,
+        "exp_month": 3,
+        "exp_year": 2033,
+        "fingerprint": "6dAXT9VZvwro65EK",
+        "funding": "credit",
+        "id": "card_1DMedAGh0CmXqmnwDLwrAV1v",
+        "last4": "4242",
+        "metadata": {},
+        "name": "Ada Starr",
+        "object": "card",
+        "tokenization_method": null
+      }
+    ],
+    "has_more": false,
+    "object": "list",
+    "total_count": 1,
+    "url": "/v1/customers/cus_DoHBcS2dBGOP9t/sources"
+  },
+  "subscriptions": {
+    "data": [
+      {
+        "application_fee_percent": null,
+        "billing": "charge_automatically",
+        "billing_cycle_anchor": 1539881154,
+        "cancel_at_period_end": false,
+        "canceled_at": null,
+        "created": 1539881154,
+        "current_period_end": 1571417154,
+        "current_period_start": 1539881154,
+        "customer": "cus_DoHBcS2dBGOP9t",
+        "days_until_due": null,
+        "discount": null,
+        "ended_at": null,
+        "id": "sub_DoHBD49xn11qGo",
+        "items": {
+          "data": [
+            {
+              "created": 1539881154,
+              "id": "si_DoHB9flY9e7zrZ",
+              "metadata": {},
+              "object": "subscription_item",
+              "plan": {
+                "active": true,
+                "aggregate_usage": null,
+                "amount": 8000,
+                "billing_scheme": "per_unit",
+                "created": 1539831971,
+                "currency": "usd",
+                "id": "plan_Do3xCvbzO89OsR",
+                "interval": "year",
+                "interval_count": 1,
+                "livemode": false,
+                "metadata": {},
+                "nickname": "annual",
+                "object": "plan",
+                "product": "prod_Do3x494SetTDpx",
+                "tiers": null,
+                "tiers_mode": null,
+                "transform_usage": null,
+                "trial_period_days": null,
+                "usage_type": "licensed"
+              },
+              "quantity": 8,
+              "subscription": "sub_DoHBD49xn11qGo"
+            }
+          ],
+          "has_more": false,
+          "object": "list",
+          "total_count": 1,
+          "url": "/v1/subscription_items?subscription=sub_DoHBD49xn11qGo"
+        },
+        "livemode": false,
+        "metadata": {},
+        "object": "subscription",
+        "plan": {
+          "active": true,
+          "aggregate_usage": null,
+          "amount": 8000,
+          "billing_scheme": "per_unit",
+          "created": 1539831971,
+          "currency": "usd",
+          "id": "plan_Do3xCvbzO89OsR",
+          "interval": "year",
+          "interval_count": 1,
+          "livemode": false,
+          "metadata": {},
+          "nickname": "annual",
+          "object": "plan",
+          "product": "prod_Do3x494SetTDpx",
+          "tiers": null,
+          "tiers_mode": null,
+          "transform_usage": null,
+          "trial_period_days": null,
+          "usage_type": "licensed"
+        },
+        "quantity": 8,
+        "start": 1539881154,
+        "status": "active",
+        "tax_percent": 0.0,
+        "trial_end": null,
+        "trial_start": null
+      }
+    ],
+    "has_more": false,
+    "object": "list",
+    "total_count": 1,
+    "url": "/v1/customers/cus_DoHBcS2dBGOP9t/subscriptions"
+  },
+  "tax_info": null,
+  "tax_info_verification": null
+}

corporate/tests/stripe_fixtures/billing_page_permissions:Invoice.upcoming.1.json

@@ -0,0 +1,85 @@
+{
+  "amount_due": 64000,
+  "amount_paid": 0,
+  "amount_remaining": 64000,
+  "application_fee": null,
+  "attempt_count": 0,
+  "attempted": false,
+  "billing": "charge_automatically",
+  "billing_reason": "upcoming",
+  "charge": null,
+  "closed": false,
+  "currency": "usd",
+  "customer": "cus_DoHBcS2dBGOP9t",
+  "date": 1571417154,
+  "description": "",
+  "discount": null,
+  "due_date": null,
+  "ending_balance": 0,
+  "forgiven": false,
+  "lines": {
+    "data": [
+      {
+        "amount": 64000,
+        "currency": "usd",
+        "description": "8 user \u00d7 Zulip Cloud Standard (at $80.00 / year)",
+        "discountable": true,
+        "id": "sli_31180ead97e161",
+        "livemode": false,
+        "metadata": {},
+        "object": "line_item",
+        "period": {
+          "end": 1603039554,
+          "start": 1571417154
+        },
+        "plan": {
+          "active": true,
+          "aggregate_usage": null,
+          "amount": 8000,
+          "billing_scheme": "per_unit",
+          "created": 1539831971,
+          "currency": "usd",
+          "id": "plan_Do3xCvbzO89OsR",
+          "interval": "year",
+          "interval_count": 1,
+          "livemode": false,
+          "metadata": {},
+          "nickname": "annual",
+          "object": "plan",
+          "product": "prod_Do3x494SetTDpx",
+          "tiers": null,
+          "tiers_mode": null,
+          "transform_usage": null,
+          "trial_period_days": null,
+          "usage_type": "licensed"
+        },
+        "proration": false,
+        "quantity": 8,
+        "subscription": "sub_DoHBD49xn11qGo",
+        "subscription_item": "si_DoHB9flY9e7zrZ",
+        "type": "subscription"
+      }
+    ],
+    "has_more": false,
+    "object": "list",
+    "total_count": 1,
+    "url": "/v1/invoices/upcoming/lines?customer=cus_DoHBcS2dBGOP9t"
+  },
+  "livemode": false,
+  "metadata": {},
+  "next_payment_attempt": 1571420754,
+  "number": "3B3F5D6-0002",
+  "object": "invoice",
+  "paid": false,
+  "period_end": 1571417154,
+  "period_start": 1539881154,
+  "receipt_number": null,
+  "starting_balance": 0,
+  "statement_descriptor": null,
+  "subscription": "sub_DoHBD49xn11qGo",
+  "subtotal": 64000,
+  "tax": 0,
+  "tax_percent": 0.0,
+  "total": 64000,
+  "webhooks_delivered_at": null
+}

corporate/tests/stripe_fixtures/billing_page_permissions:Invoice.upcoming.2.json

@@ -0,0 +1,85 @@
+{
+  "amount_due": 64000,
+  "amount_paid": 0,
+  "amount_remaining": 64000,
+  "application_fee": null,
+  "attempt_count": 0,
+  "attempted": false,
+  "billing": "charge_automatically",
+  "billing_reason": "upcoming",
+  "charge": null,
+  "closed": false,
+  "currency": "usd",
+  "customer": "cus_DoHBcS2dBGOP9t",
+  "date": 1571417154,
+  "description": "",
+  "discount": null,
+  "due_date": null,
+  "ending_balance": 0,
+  "forgiven": false,
+  "lines": {
+    "data": [
+      {
+        "amount": 64000,
+        "currency": "usd",
+        "description": "8 user \u00d7 Zulip Cloud Standard (at $80.00 / year)",
+        "discountable": true,
+        "id": "sli_31180ead97e161",
+        "livemode": false,
+        "metadata": {},
+        "object": "line_item",
+        "period": {
+          "end": 1603039554,
+          "start": 1571417154
+        },
+        "plan": {
+          "active": true,
+          "aggregate_usage": null,
+          "amount": 8000,
+          "billing_scheme": "per_unit",
+          "created": 1539831971,
+          "currency": "usd",
+          "id": "plan_Do3xCvbzO89OsR",
+          "interval": "year",
+          "interval_count": 1,
+          "livemode": false,
+          "metadata": {},
+          "nickname": "annual",
+          "object": "plan",
+          "product": "prod_Do3x494SetTDpx",
+          "tiers": null,
+          "tiers_mode": null,
+          "transform_usage": null,
+          "trial_period_days": null,
+          "usage_type": "licensed"
+        },
+        "proration": false,
+        "quantity": 8,
+        "subscription": "sub_DoHBD49xn11qGo",
+        "subscription_item": "si_DoHB9flY9e7zrZ",
+        "type": "subscription"
+      }
+    ],
+    "has_more": false,
+    "object": "list",
+    "total_count": 1,
+    "url": "/v1/invoices/upcoming/lines?customer=cus_DoHBcS2dBGOP9t"
+  },
+  "livemode": false,
+  "metadata": {},
+  "next_payment_attempt": 1571420754,
+  "number": "3B3F5D6-0002",
+  "object": "invoice",
+  "paid": false,
+  "period_end": 1571417154,
+  "period_start": 1539881154,
+  "receipt_number": null,
+  "starting_balance": 0,
+  "statement_descriptor": null,
+  "subscription": "sub_DoHBD49xn11qGo",
+  "subtotal": 64000,
+  "tax": 0,
+  "tax_percent": 0.0,
+  "total": 64000,
+  "webhooks_delivered_at": null
+}

corporate/tests/stripe_fixtures/billing_page_permissions:Subscription.create.1.json

@@ -0,0 +1,82 @@
+{
+  "application_fee_percent": null,
+  "billing": "charge_automatically",
+  "billing_cycle_anchor": 1539881154,
+  "cancel_at_period_end": false,
+  "canceled_at": null,
+  "created": 1539881154,
+  "current_period_end": 1571417154,
+  "current_period_start": 1539881154,
+  "customer": "cus_DoHBcS2dBGOP9t",
+  "days_until_due": null,
+  "discount": null,
+  "ended_at": null,
+  "id": "sub_DoHBD49xn11qGo",
+  "items": {
+    "data": [
+      {
+        "created": 1539881154,
+        "id": "si_DoHB9flY9e7zrZ",
+        "metadata": {},
+        "object": "subscription_item",
+        "plan": {
+          "active": true,
+          "aggregate_usage": null,
+          "amount": 8000,
+          "billing_scheme": "per_unit",
+          "created": 1539831971,
+          "currency": "usd",
+          "id": "plan_Do3xCvbzO89OsR",
+          "interval": "year",
+          "interval_count": 1,
+          "livemode": false,
+          "metadata": {},
+          "nickname": "annual",
+          "object": "plan",
+          "product": "prod_Do3x494SetTDpx",
+          "tiers": null,
+          "tiers_mode": null,
+          "transform_usage": null,
+          "trial_period_days": null,
+          "usage_type": "licensed"
+        },
+        "quantity": 8,
+        "subscription": "sub_DoHBD49xn11qGo"
+      }
+    ],
+    "has_more": false,
+    "object": "list",
+    "total_count": 1,
+    "url": "/v1/subscription_items?subscription=sub_DoHBD49xn11qGo"
+  },
+  "livemode": false,
+  "metadata": {},
+  "object": "subscription",
+  "plan": {
+    "active": true,
+    "aggregate_usage": null,
+    "amount": 8000,
+    "billing_scheme": "per_unit",
+    "created": 1539831971,
+    "currency": "usd",
+    "id": "plan_Do3xCvbzO89OsR",
+    "interval": "year",
+    "interval_count": 1,
+    "livemode": false,
+    "metadata": {},
+    "nickname": "annual",
+    "object": "plan",
+    "product": "prod_Do3x494SetTDpx",
+    "tiers": null,
+    "tiers_mode": null,
+    "transform_usage": null,
+    "trial_period_days": null,
+    "usage_type": "licensed"
+  },
+  "quantity": 8,
+  "start": 1539881154,
+  "status": "active",
+  "tax_percent": 0.0,
+  "trial_end": null,
+  "trial_start": null
+}

corporate/tests/stripe_fixtures/billing_page_permissions:Token.create.1.json

@@ -16,7 +16,7 @@
     "exp_year": 2033,
     "fingerprint": "6dAXT9VZvwro65EK",
     "funding": "credit",
-    "id": "card_1DxdeRGh0CmXqmnwu3BibWtM",
+    "id": "card_1DMedAGh0CmXqmnwDLwrAV1v",
     "last4": "4242",
     "metadata": {},
     "name": "Ada Starr",
@@ -24,8 +24,8 @@
     "tokenization_method": null
   },
   "client_ip": "107.202.144.213",
-  "created": 1548695523,
-  "id": "tok_1DxdeRGh0CmXqmnw5X6CeYnC",
+  "created": 1539881152,
+  "id": "tok_1DMedAGh0CmXqmnwduQE6C3S",
   "livemode": false,
   "object": "token",
   "type": "card",

corporate/tests/stripe_fixtures/fixed_price_plans--Customer.create.1.json

@@ -1,53 +0,0 @@
-{
-  "account_balance": 0,
-  "address": null,
-  "balance": 0,
-  "created": 1000000000,
-  "currency": null,
-  "default_source": null,
-  "delinquent": false,
-  "description": "zulip (Zulip Dev)",
-  "discount": null,
-  "email": "hamlet@zulip.com",
-  "id": "cus_NORMALIZED0001",
-  "invoice_prefix": "NORMA01",
-  "invoice_settings": {
-    "custom_fields": null,
-    "default_payment_method": null,
-    "footer": null
-  },
-  "livemode": false,
-  "metadata": {
-    "realm_id": "1",
-    "realm_str": "zulip"
-  },
-  "name": null,
-  "object": "customer",
-  "phone": null,
-  "preferred_locales": [],
-  "shipping": null,
-  "sources": {
-    "data": [],
-    "has_more": false,
-    "object": "list",
-    "total_count": 0,
-    "url": "/v1/customers/cus_NORMALIZED0001/sources"
-  },
-  "subscriptions": {
-    "data": [],
-    "has_more": false,
-    "object": "list",
-    "total_count": 0,
-    "url": "/v1/customers/cus_NORMALIZED0001/subscriptions"
-  },
-  "tax_exempt": "none",
-  "tax_ids": {
-    "data": [],
-    "has_more": false,
-    "object": "list",
-    "total_count": 0,
-    "url": "/v1/customers/cus_NORMALIZED0001/tax_ids"
-  },
-  "tax_info": null,
-  "tax_info_verification": null
-}

corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.create.1.json

@@ -1,95 +0,0 @@
-{
-  "account_country": "US",
-  "account_name": "Dev account",
-  "amount_due": 984000,
-  "amount_paid": 0,
-  "amount_remaining": 984000,
-  "application_fee_amount": null,
-  "attempt_count": 0,
-  "attempted": false,
-  "auto_advance": true,
-  "billing": "send_invoice",
-  "billing_reason": "manual",
-  "charge": null,
-  "collection_method": "send_invoice",
-  "created": 1000000000,
-  "currency": "usd",
-  "custom_fields": null,
-  "customer": "cus_NORMALIZED0001",
-  "customer_address": null,
-  "customer_email": "hamlet@zulip.com",
-  "customer_name": null,
-  "customer_phone": null,
-  "customer_shipping": null,
-  "customer_tax_exempt": "none",
-  "customer_tax_ids": [],
-  "default_payment_method": null,
-  "default_source": null,
-  "default_tax_rates": [],
-  "description": "",
-  "discount": null,
-  "due_date": 1000000000,
-  "ending_balance": null,
-  "footer": null,
-  "hosted_invoice_url": null,
-  "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": null,
-  "lines": {
-    "data": [
-      {
-        "amount": 984000,
-        "currency": "usd",
-        "description": "Zulip Standard",
-        "discountable": false,
-        "id": "ii_NORMALIZED00000000000001",
-        "invoice_item": "ii_NORMALIZED00000000000001",
-        "livemode": false,
-        "metadata": {},
-        "object": "line_item",
-        "period": {
-          "end": 1357095845,
-          "start": 1325473445
-        },
-        "plan": null,
-        "proration": false,
-        "quantity": 123,
-        "subscription": null,
-        "tax_amounts": [],
-        "tax_rates": [],
-        "type": "invoiceitem"
-      }
-    ],
-    "has_more": false,
-    "object": "list",
-    "total_count": 1,
-    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-  },
-  "livemode": false,
-  "metadata": {},
-  "next_payment_attempt": null,
-  "number": "NORMALI-0001",
-  "object": "invoice",
-  "paid": false,
-  "payment_intent": null,
-  "period_end": 1000000000,
-  "period_start": 1000000000,
-  "post_payment_credit_notes_amount": 0,
-  "pre_payment_credit_notes_amount": 0,
-  "receipt_number": null,
-  "starting_balance": 0,
-  "statement_descriptor": "Zulip Standard",
-  "status": "draft",
-  "status_transitions": {
-    "finalized_at": null,
-    "marked_uncollectible_at": null,
-    "paid_at": null,
-    "voided_at": null
-  },
-  "subscription": null,
-  "subtotal": 984000,
-  "tax": null,
-  "tax_percent": null,
-  "total": 984000,
-  "total_tax_amounts": [],
-  "webhooks_delivered_at": null
-}

corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.create.2.json

@@ -1,95 +0,0 @@
-{
-  "account_country": "US",
-  "account_name": "Dev account",
-  "amount_due": 100,
-  "amount_paid": 0,
-  "amount_remaining": 100,
-  "application_fee_amount": null,
-  "attempt_count": 0,
-  "attempted": false,
-  "auto_advance": true,
-  "billing": "send_invoice",
-  "billing_reason": "manual",
-  "charge": null,
-  "collection_method": "send_invoice",
-  "created": 1000000000,
-  "currency": "usd",
-  "custom_fields": null,
-  "customer": "cus_NORMALIZED0001",
-  "customer_address": null,
-  "customer_email": "hamlet@zulip.com",
-  "customer_name": null,
-  "customer_phone": null,
-  "customer_shipping": null,
-  "customer_tax_exempt": "none",
-  "customer_tax_ids": [],
-  "default_payment_method": null,
-  "default_source": null,
-  "default_tax_rates": [],
-  "description": "",
-  "discount": null,
-  "due_date": 1000000000,
-  "ending_balance": null,
-  "footer": null,
-  "hosted_invoice_url": null,
-  "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": null,
-  "lines": {
-    "data": [
-      {
-        "amount": 100,
-        "currency": "usd",
-        "description": "Zulip Standard - renewal",
-        "discountable": false,
-        "id": "ii_NORMALIZED00000000000002",
-        "invoice_item": "ii_NORMALIZED00000000000002",
-        "livemode": false,
-        "metadata": {},
-        "object": "line_item",
-        "period": {
-          "end": 1388631845,
-          "start": 1357095845
-        },
-        "plan": null,
-        "proration": false,
-        "quantity": 1,
-        "subscription": null,
-        "tax_amounts": [],
-        "tax_rates": [],
-        "type": "invoiceitem"
-      }
-    ],
-    "has_more": false,
-    "object": "list",
-    "total_count": 1,
-    "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
-  },
-  "livemode": false,
-  "metadata": {},
-  "next_payment_attempt": null,
-  "number": "NORMALI-0002",
-  "object": "invoice",
-  "paid": false,
-  "payment_intent": null,
-  "period_end": 1000000000,
-  "period_start": 1000000000,
-  "post_payment_credit_notes_amount": 0,
-  "pre_payment_credit_notes_amount": 0,
-  "receipt_number": null,
-  "starting_balance": 0,
-  "statement_descriptor": "Zulip Standard",
-  "status": "draft",
-  "status_transitions": {
-    "finalized_at": null,
-    "marked_uncollectible_at": null,
-    "paid_at": null,
-    "voided_at": null
-  },
-  "subscription": null,
-  "subtotal": 100,
-  "tax": null,
-  "tax_percent": null,
-  "total": 100,
-  "total_tax_amounts": [],
-  "webhooks_delivered_at": null
-}

corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.finalize_invoice.1.json

@@ -1,95 +0,0 @@
-{
-  "account_country": "US",
-  "account_name": "Dev account",
-  "amount_due": 984000,
-  "amount_paid": 0,
-  "amount_remaining": 984000,
-  "application_fee_amount": null,
-  "attempt_count": 0,
-  "attempted": false,
-  "auto_advance": true,
-  "billing": "send_invoice",
-  "billing_reason": "manual",
-  "charge": null,
-  "collection_method": "send_invoice",
-  "created": 1000000000,
-  "currency": "usd",
-  "custom_fields": null,
-  "customer": "cus_NORMALIZED0001",
-  "customer_address": null,
-  "customer_email": "hamlet@zulip.com",
-  "customer_name": null,
-  "customer_phone": null,
-  "customer_shipping": null,
-  "customer_tax_exempt": "none",
-  "customer_tax_ids": [],
-  "default_payment_method": null,
-  "default_source": null,
-  "default_tax_rates": [],
-  "description": "",
-  "discount": null,
-  "due_date": 1000000000,
-  "ending_balance": 0,
-  "footer": null,
-  "hosted_invoice_url": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000001",
-  "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000001/pdf",
-  "lines": {
-    "data": [
-      {
-        "amount": 984000,
-        "currency": "usd",
-        "description": "Zulip Standard",
-        "discountable": false,
-        "id": "ii_NORMALIZED00000000000001",
-        "invoice_item": "ii_NORMALIZED00000000000001",
-        "livemode": false,
-        "metadata": {},
-        "object": "line_item",
-        "period": {
-          "end": 1357095845,
-          "start": 1325473445
-        },
-        "plan": null,
-        "proration": false,
-        "quantity": 123,
-        "subscription": null,
-        "tax_amounts": [],
-        "tax_rates": [],
-        "type": "invoiceitem"
-      }
-    ],
-    "has_more": false,
-    "object": "list",
-    "total_count": 1,
-    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-  },
-  "livemode": false,
-  "metadata": {},
-  "next_payment_attempt": null,
-  "number": "NORMALI-0001",
-  "object": "invoice",
-  "paid": false,
-  "payment_intent": "pi_1F96B0Gh0CmXqmnwFFVAGxWQ",
-  "period_end": 1000000000,
-  "period_start": 1000000000,
-  "post_payment_credit_notes_amount": 0,
-  "pre_payment_credit_notes_amount": 0,
-  "receipt_number": null,
-  "starting_balance": 0,
-  "statement_descriptor": "Zulip Standard",
-  "status": "open",
-  "status_transitions": {
-    "finalized_at": 1000000000,
-    "marked_uncollectible_at": null,
-    "paid_at": null,
-    "voided_at": null
-  },
-  "subscription": null,
-  "subtotal": 984000,
-  "tax": null,
-  "tax_percent": null,
-  "total": 984000,
-  "total_tax_amounts": [],
-  "webhooks_delivered_at": 1000000000
-}

corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.finalize_invoice.2.json

@@ -1,95 +0,0 @@
-{
-  "account_country": "US",
-  "account_name": "Dev account",
-  "amount_due": 100,
-  "amount_paid": 0,
-  "amount_remaining": 100,
-  "application_fee_amount": null,
-  "attempt_count": 0,
-  "attempted": false,
-  "auto_advance": true,
-  "billing": "send_invoice",
-  "billing_reason": "manual",
-  "charge": null,
-  "collection_method": "send_invoice",
-  "created": 1000000000,
-  "currency": "usd",
-  "custom_fields": null,
-  "customer": "cus_NORMALIZED0001",
-  "customer_address": null,
-  "customer_email": "hamlet@zulip.com",
-  "customer_name": null,
-  "customer_phone": null,
-  "customer_shipping": null,
-  "customer_tax_exempt": "none",
-  "customer_tax_ids": [],
-  "default_payment_method": null,
-  "default_source": null,
-  "default_tax_rates": [],
-  "description": "",
-  "discount": null,
-  "due_date": 1000000000,
-  "ending_balance": 0,
-  "footer": null,
-  "hosted_invoice_url": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000002",
-  "id": "in_NORMALIZED00000000000002",
-  "invoice_pdf": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000002/pdf",
-  "lines": {
-    "data": [
-      {
-        "amount": 100,
-        "currency": "usd",
-        "description": "Zulip Standard - renewal",
-        "discountable": false,
-        "id": "ii_NORMALIZED00000000000002",
-        "invoice_item": "ii_NORMALIZED00000000000002",
-        "livemode": false,
-        "metadata": {},
-        "object": "line_item",
-        "period": {
-          "end": 1388631845,
-          "start": 1357095845
-        },
-        "plan": null,
-        "proration": false,
-        "quantity": 1,
-        "subscription": null,
-        "tax_amounts": [],
-        "tax_rates": [],
-        "type": "invoiceitem"
-      }
-    ],
-    "has_more": false,
-    "object": "list",
-    "total_count": 1,
-    "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
-  },
-  "livemode": false,
-  "metadata": {},
-  "next_payment_attempt": null,
-  "number": "NORMALI-0002",
-  "object": "invoice",
-  "paid": false,
-  "payment_intent": "pi_1F96B2Gh0CmXqmnwZLKqLOFy",
-  "period_end": 1000000000,
-  "period_start": 1000000000,
-  "post_payment_credit_notes_amount": 0,
-  "pre_payment_credit_notes_amount": 0,
-  "receipt_number": null,
-  "starting_balance": 0,
-  "statement_descriptor": "Zulip Standard",
-  "status": "open",
-  "status_transitions": {
-    "finalized_at": 1000000000,
-    "marked_uncollectible_at": null,
-    "paid_at": null,
-    "voided_at": null
-  },
-  "subscription": null,
-  "subtotal": 100,
-  "tax": null,
-  "tax_percent": null,
-  "total": 100,
-  "total_tax_amounts": [],
-  "webhooks_delivered_at": 1000000000
-}

corporate/tests/stripe_fixtures/fixed_price_plans--Invoice.list.1.json

@@ -1,197 +0,0 @@
-{
-  "data": [
-    {
-      "account_country": "US",
-      "account_name": "Dev account",
-      "amount_due": 100,
-      "amount_paid": 0,
-      "amount_remaining": 100,
-      "application_fee_amount": null,
-      "attempt_count": 0,
-      "attempted": false,
-      "auto_advance": true,
-      "billing": "send_invoice",
-      "billing_reason": "manual",
-      "charge": null,
-      "collection_method": "send_invoice",
-      "created": 1000000000,
-      "currency": "usd",
-      "custom_fields": null,
-      "customer": "cus_NORMALIZED0001",
-      "customer_address": null,
-      "customer_email": "hamlet@zulip.com",
-      "customer_name": null,
-      "customer_phone": null,
-      "customer_shipping": null,
-      "customer_tax_exempt": "none",
-      "customer_tax_ids": [],
-      "default_payment_method": null,
-      "default_source": null,
-      "default_tax_rates": [],
-      "description": "",
-      "discount": null,
-      "due_date": 1000000000,
-      "ending_balance": 0,
-      "footer": null,
-      "hosted_invoice_url": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000002",
-      "id": "in_NORMALIZED00000000000002",
-      "invoice_pdf": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000002/pdf",
-      "lines": {
-        "data": [
-          {
-            "amount": 100,
-            "currency": "usd",
-            "description": "Zulip Standard - renewal",
-            "discountable": false,
-            "id": "ii_NORMALIZED00000000000002",
-            "invoice_item": "ii_NORMALIZED00000000000002",
-            "livemode": false,
-            "metadata": {},
-            "object": "line_item",
-            "period": {
-              "end": 1388631845,
-              "start": 1357095845
-            },
-            "plan": null,
-            "proration": false,
-            "quantity": 1,
-            "subscription": null,
-            "tax_amounts": [],
-            "tax_rates": [],
-            "type": "invoiceitem"
-          }
-        ],
-        "has_more": false,
-        "object": "list",
-        "total_count": 1,
-        "url": "/v1/invoices/in_NORMALIZED00000000000002/lines"
-      },
-      "livemode": false,
-      "metadata": {},
-      "next_payment_attempt": null,
-      "number": "NORMALI-0002",
-      "object": "invoice",
-      "paid": false,
-      "payment_intent": "pi_1F96B2Gh0CmXqmnwZLKqLOFy",
-      "period_end": 1000000000,
-      "period_start": 1000000000,
-      "post_payment_credit_notes_amount": 0,
-      "pre_payment_credit_notes_amount": 0,
-      "receipt_number": null,
-      "starting_balance": 0,
-      "statement_descriptor": "Zulip Standard",
-      "status": "open",
-      "status_transitions": {
-        "finalized_at": 1000000000,
-        "marked_uncollectible_at": null,
-        "paid_at": null,
-        "voided_at": null
-      },
-      "subscription": null,
-      "subtotal": 100,
-      "tax": null,
-      "tax_percent": null,
-      "total": 100,
-      "total_tax_amounts": [],
-      "webhooks_delivered_at": 1000000000
-    },
-    {
-      "account_country": "US",
-      "account_name": "Dev account",
-      "amount_due": 984000,
-      "amount_paid": 0,
-      "amount_remaining": 984000,
-      "application_fee_amount": null,
-      "attempt_count": 0,
-      "attempted": false,
-      "auto_advance": true,
-      "billing": "send_invoice",
-      "billing_reason": "manual",
-      "charge": null,
-      "collection_method": "send_invoice",
-      "created": 1000000000,
-      "currency": "usd",
-      "custom_fields": null,
-      "customer": "cus_NORMALIZED0001",
-      "customer_address": null,
-      "customer_email": "hamlet@zulip.com",
-      "customer_name": null,
-      "customer_phone": null,
-      "customer_shipping": null,
-      "customer_tax_exempt": "none",
-      "customer_tax_ids": [],
-      "default_payment_method": null,
-      "default_source": null,
-      "default_tax_rates": [],
-      "description": "",
-      "discount": null,
-      "due_date": 1000000000,
-      "ending_balance": 0,
-      "footer": null,
-      "hosted_invoice_url": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000001",
-      "id": "in_NORMALIZED00000000000001",
-      "invoice_pdf": "https://pay.stripe.com/invoice/invst_NORMALIZED0000000000000001/pdf",
-      "lines": {
-        "data": [
-          {
-            "amount": 984000,
-            "currency": "usd",
-            "description": "Zulip Standard",
-            "discountable": false,
-            "id": "ii_NORMALIZED00000000000001",
-            "invoice_item": "ii_NORMALIZED00000000000001",
-            "livemode": false,
-            "metadata": {},
-            "object": "line_item",
-            "period": {
-              "end": 1357095845,
-              "start": 1325473445
-            },
-            "plan": null,
-            "proration": false,
-            "quantity": 123,
-            "subscription": null,
-            "tax_amounts": [],
-            "tax_rates": [],
-            "type": "invoiceitem"
-          }
-        ],
-        "has_more": false,
-        "object": "list",
-        "total_count": 1,
-        "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-      },
-      "livemode": false,
-      "metadata": {},
-      "next_payment_attempt": null,
-      "number": "NORMALI-0001",
-      "object": "invoice",
-      "paid": false,
-      "payment_intent": "pi_1F96B0Gh0CmXqmnwFFVAGxWQ",
-      "period_end": 1000000000,
-      "period_start": 1000000000,
-      "post_payment_credit_notes_amount": 0,
-      "pre_payment_credit_notes_amount": 0,
-      "receipt_number": null,
-      "starting_balance": 0,
-      "statement_descriptor": "Zulip Standard",
-      "status": "open",
-      "status_transitions": {
-        "finalized_at": 1000000000,
-        "marked_uncollectible_at": null,
-        "paid_at": null,
-        "voided_at": null
-      },
-      "subscription": null,
-      "subtotal": 984000,
-      "tax": null,
-      "tax_percent": null,
-      "total": 984000,
-      "total_tax_amounts": [],
-      "webhooks_delivered_at": 1000000000
-    }
-  ],
-  "has_more": false,
-  "object": "list",
-  "url": "/v1/invoices"
-}

corporate/tests/stripe_fixtures/fixed_price_plans--InvoiceItem.create.1.json

@@ -1,23 +0,0 @@
-{
-  "amount": 984000,
-  "currency": "usd",
-  "customer": "cus_NORMALIZED0001",
-  "date": 1000000000,
-  "description": "Zulip Standard",
-  "discountable": false,
-  "id": "ii_NORMALIZED00000000000001",
-  "invoice": null,
-  "livemode": false,
-  "metadata": {},
-  "object": "invoiceitem",
-  "period": {
-    "end": 1357095845,
-    "start": 1325473445
-  },
-  "plan": null,
-  "proration": false,
-  "quantity": 123,
-  "subscription": null,
-  "tax_rates": [],
-  "unit_amount": 8000
-}

corporate/tests/stripe_fixtures/fixed_price_plans--InvoiceItem.create.2.json

@@ -1,23 +0,0 @@
-{
-  "amount": 100,
-  "currency": "usd",
-  "customer": "cus_NORMALIZED0001",
-  "date": 1000000000,
-  "description": "Zulip Standard - renewal",
-  "discountable": false,
-  "id": "ii_NORMALIZED00000000000002",
-  "invoice": null,
-  "livemode": false,
-  "metadata": {},
-  "object": "invoiceitem",
-  "period": {
-    "end": 1388631845,
-    "start": 1357095845
-  },
-  "plan": null,
-  "proration": false,
-  "quantity": 1,
-  "subscription": null,
-  "tax_rates": [],
-  "unit_amount": 100
-}

corporate/tests/stripe_fixtures/initial_upgrade:Customer.create.1.json

@@ -1,30 +1,20 @@
 {
   "account_balance": 0,
-  "address": null,
-  "balance": 0,
-  "created": 1000000000,
+  "created": 1539832157,
   "currency": null,
-  "default_source": "card_NORMALIZED00000000000001",
+  "default_source": "card_1DMRsvGh0CmXqmnwRFN7yRRD",
   "delinquent": false,
   "description": "zulip (Zulip Dev)",
   "discount": null,
   "email": "hamlet@zulip.com",
-  "id": "cus_NORMALIZED0001",
-  "invoice_prefix": "NORMA01",
-  "invoice_settings": {
-    "custom_fields": null,
-    "default_payment_method": null,
-    "footer": null
-  },
+  "id": "cus_Do40UO0WhJ4ZIl",
+  "invoice_prefix": "7783290",
   "livemode": false,
   "metadata": {
     "realm_id": "1",
     "realm_str": "zulip"
   },
-  "name": null,
   "object": "customer",
-  "phone": null,
-  "preferred_locales": [],
   "shipping": null,
   "sources": {
     "data": [
@@ -39,14 +29,14 @@
         "address_zip_check": "pass",
         "brand": "Visa",
         "country": "US",
-        "customer": "cus_NORMALIZED0001",
+        "customer": "cus_Do40UO0WhJ4ZIl",
         "cvc_check": "pass",
         "dynamic_last4": null,
         "exp_month": 3,
         "exp_year": 2033,
-        "fingerprint": "NORMALIZED000001",
+        "fingerprint": "6dAXT9VZvwro65EK",
         "funding": "credit",
-        "id": "card_NORMALIZED00000000000001",
+        "id": "card_1DMRsvGh0CmXqmnwRFN7yRRD",
         "last4": "4242",
         "metadata": {},
         "name": "Ada Starr",
@@ -57,22 +47,14 @@
     "has_more": false,
     "object": "list",
     "total_count": 1,
-    "url": "/v1/customers/cus_NORMALIZED0001/sources"
+    "url": "/v1/customers/cus_Do40UO0WhJ4ZIl/sources"
   },
   "subscriptions": {
     "data": [],
     "has_more": false,
     "object": "list",
     "total_count": 0,
-    "url": "/v1/customers/cus_NORMALIZED0001/subscriptions"
-  },
-  "tax_exempt": "none",
-  "tax_ids": {
-    "data": [],
-    "has_more": false,
-    "object": "list",
-    "total_count": 0,
-    "url": "/v1/customers/cus_NORMALIZED0001/tax_ids"
+    "url": "/v1/customers/cus_Do40UO0WhJ4ZIl/subscriptions"
   },
   "tax_info": null,
   "tax_info_verification": null

corporate/tests/stripe_fixtures/initial_upgrade:Customer.retrieve.1.json

@@ -0,0 +1,168 @@
+{
+  "account_balance": 0,
+  "created": 1539832157,
+  "currency": "usd",
+  "default_source": {
+    "address_city": "Pacific",
+    "address_country": "United States",
+    "address_line1": "Under the sea,",
+    "address_line1_check": "pass",
+    "address_line2": null,
+    "address_state": null,
+    "address_zip": "33333",
+    "address_zip_check": "pass",
+    "brand": "Visa",
+    "country": "US",
+    "customer": "cus_Do40UO0WhJ4ZIl",
+    "cvc_check": "pass",
+    "dynamic_last4": null,
+    "exp_month": 3,
+    "exp_year": 2033,
+    "fingerprint": "6dAXT9VZvwro65EK",
+    "funding": "credit",
+    "id": "card_1DMRsvGh0CmXqmnwRFN7yRRD",
+    "last4": "4242",
+    "metadata": {},
+    "name": "Ada Starr",
+    "object": "card",
+    "tokenization_method": null
+  },
+  "delinquent": false,
+  "description": "zulip (Zulip Dev)",
+  "discount": null,
+  "email": "hamlet@zulip.com",
+  "id": "cus_Do40UO0WhJ4ZIl",
+  "invoice_prefix": "7783290",
+  "livemode": false,
+  "metadata": {
+    "realm_id": "1",
+    "realm_str": "zulip"
+  },
+  "object": "customer",
+  "shipping": null,
+  "sources": {
+    "data": [
+      {
+        "address_city": "Pacific",
+        "address_country": "United States",
+        "address_line1": "Under the sea,",
+        "address_line1_check": "pass",
+        "address_line2": null,
+        "address_state": null,
+        "address_zip": "33333",
+        "address_zip_check": "pass",
+        "brand": "Visa",
+        "country": "US",
+        "customer": "cus_Do40UO0WhJ4ZIl",
+        "cvc_check": "pass",
+        "dynamic_last4": null,
+        "exp_month": 3,
+        "exp_year": 2033,
+        "fingerprint": "6dAXT9VZvwro65EK",
+        "funding": "credit",
+        "id": "card_1DMRsvGh0CmXqmnwRFN7yRRD",
+        "last4": "4242",
+        "metadata": {},
+        "name": "Ada Starr",
+        "object": "card",
+        "tokenization_method": null
+      }
+    ],
+    "has_more": false,
+    "object": "list",
+    "total_count": 1,
+    "url": "/v1/customers/cus_Do40UO0WhJ4ZIl/sources"
+  },
+  "subscriptions": {
+    "data": [
+      {
+        "application_fee_percent": null,
+        "billing": "charge_automatically",
+        "billing_cycle_anchor": 1539832158,
+        "cancel_at_period_end": false,
+        "canceled_at": null,
+        "created": 1539832158,
+        "current_period_end": 1571368158,
+        "current_period_start": 1539832158,
+        "customer": "cus_Do40UO0WhJ4ZIl",
+        "days_until_due": null,
+        "discount": null,
+        "ended_at": null,
+        "id": "sub_Do40s9CYZB3Ib8",
+        "items": {
+          "data": [
+            {
+              "created": 1539832159,
+              "id": "si_Do40INfOLVpONR",
+              "metadata": {},
+              "object": "subscription_item",
+              "plan": {
+                "active": true,
+                "aggregate_usage": null,
+                "amount": 8000,
+                "billing_scheme": "per_unit",
+                "created": 1539831971,
+                "currency": "usd",
+                "id": "plan_Do3xCvbzO89OsR",
+                "interval": "year",
+                "interval_count": 1,
+                "livemode": false,
+                "metadata": {},
+                "nickname": "annual",
+                "object": "plan",
+                "product": "prod_Do3x494SetTDpx",
+                "tiers": null,
+                "tiers_mode": null,
+                "transform_usage": null,
+                "trial_period_days": null,
+                "usage_type": "licensed"
+              },
+              "quantity": 8,
+              "subscription": "sub_Do40s9CYZB3Ib8"
+            }
+          ],
+          "has_more": false,
+          "object": "list",
+          "total_count": 1,
+          "url": "/v1/subscription_items?subscription=sub_Do40s9CYZB3Ib8"
+        },
+        "livemode": false,
+        "metadata": {},
+        "object": "subscription",
+        "plan": {
+          "active": true,
+          "aggregate_usage": null,
+          "amount": 8000,
+          "billing_scheme": "per_unit",
+          "created": 1539831971,
+          "currency": "usd",
+          "id": "plan_Do3xCvbzO89OsR",
+          "interval": "year",
+          "interval_count": 1,
+          "livemode": false,
+          "metadata": {},
+          "nickname": "annual",
+          "object": "plan",
+          "product": "prod_Do3x494SetTDpx",
+          "tiers": null,
+          "tiers_mode": null,
+          "transform_usage": null,
+          "trial_period_days": null,
+          "usage_type": "licensed"
+        },
+        "quantity": 8,
+        "start": 1539832158,
+        "status": "active",
+        "tax_percent": 0.0,
+        "trial_end": null,
+        "trial_start": null
+      }
+    ],
+    "has_more": false,
+    "object": "list",
+    "total_count": 1,
+    "url": "/v1/customers/cus_Do40UO0WhJ4ZIl/subscriptions"
+  },
+  "tax_info": null,
+  "tax_info_verification": null
+}

corporate/tests/stripe_fixtures/initial_upgrade:Subscription.create.1.json

@@ -0,0 +1,82 @@
+{
+  "application_fee_percent": null,
+  "billing": "charge_automatically",
+  "billing_cycle_anchor": 1539832158,
+  "cancel_at_period_end": false,
+  "canceled_at": null,
+  "created": 1539832158,
+  "current_period_end": 1571368158,
+  "current_period_start": 1539832158,
+  "customer": "cus_Do40UO0WhJ4ZIl",
+  "days_until_due": null,
+  "discount": null,
+  "ended_at": null,
+  "id": "sub_Do40s9CYZB3Ib8",
+  "items": {
+    "data": [
+      {
+        "created": 1539832159,
+        "id": "si_Do40INfOLVpONR",
+        "metadata": {},
+        "object": "subscription_item",
+        "plan": {
+          "active": true,
+          "aggregate_usage": null,
+          "amount": 8000,
+          "billing_scheme": "per_unit",
+          "created": 1539831971,
+          "currency": "usd",
+          "id": "plan_Do3xCvbzO89OsR",
+          "interval": "year",
+          "interval_count": 1,
+          "livemode": false,
+          "metadata": {},
+          "nickname": "annual",
+          "object": "plan",
+          "product": "prod_Do3x494SetTDpx",
+          "tiers": null,
+          "tiers_mode": null,
+          "transform_usage": null,
+          "trial_period_days": null,
+          "usage_type": "licensed"
+        },
+        "quantity": 8,
+        "subscription": "sub_Do40s9CYZB3Ib8"
+      }
+    ],
+    "has_more": false,
+    "object": "list",
+    "total_count": 1,
+    "url": "/v1/subscription_items?subscription=sub_Do40s9CYZB3Ib8"
+  },
+  "livemode": false,
+  "metadata": {},
+  "object": "subscription",
+  "plan": {
+    "active": true,
+    "aggregate_usage": null,
+    "amount": 8000,
+    "billing_scheme": "per_unit",
+    "created": 1539831971,
+    "currency": "usd",
+    "id": "plan_Do3xCvbzO89OsR",
+    "interval": "year",
+    "interval_count": 1,
+    "livemode": false,
+    "metadata": {},
+    "nickname": "annual",
+    "object": "plan",
+    "product": "prod_Do3x494SetTDpx",
+    "tiers": null,
+    "tiers_mode": null,
+    "transform_usage": null,
+    "trial_period_days": null,
+    "usage_type": "licensed"
+  },
+  "quantity": 8,
+  "start": 1539832158,
+  "status": "active",
+  "tax_percent": 0.0,
+  "trial_end": null,
+  "trial_start": null
+}

corporate/tests/stripe_fixtures/initial_upgrade:Token.create.1.json

@@ -14,18 +14,18 @@
     "dynamic_last4": null,
     "exp_month": 3,
     "exp_year": 2033,
-    "fingerprint": "NORMALIZED000001",
+    "fingerprint": "6dAXT9VZvwro65EK",
     "funding": "credit",
-    "id": "card_NORMALIZED00000000000002",
+    "id": "card_1DMRsvGh0CmXqmnwRFN7yRRD",
     "last4": "4242",
     "metadata": {},
     "name": "Ada Starr",
     "object": "card",
     "tokenization_method": null
   },
-  "client_ip": "0.0.0.0",
-  "created": 1000000000,
-  "id": "tok_NORMALIZED00000000000002",
+  "client_ip": "107.202.144.213",
+  "created": 1539832157,
+  "id": "tok_1DMRsvGh0CmXqmnwO80yZKru",
   "livemode": false,
   "object": "token",
   "type": "card",

corporate/tests/stripe_fixtures/invoice_plan--Charge.create.1.json

@@ -1,112 +0,0 @@
-{
-  "amount": 48000,
-  "amount_refunded": 0,
-  "application": null,
-  "application_fee": null,
-  "application_fee_amount": null,
-  "balance_transaction": "txn_NORMALIZED00000000000001",
-  "billing_details": {
-    "address": {
-      "city": "Pacific",
-      "country": "United States",
-      "line1": "Under the sea,",
-      "line2": null,
-      "postal_code": "33333",
-      "state": null
-    },
-    "email": null,
-    "name": "Ada Starr",
-    "phone": null
-  },
-  "captured": true,
-  "created": 1000000000,
-  "currency": "usd",
-  "customer": "cus_NORMALIZED0001",
-  "description": "Upgrade to Zulip Standard, $80.0 x 6",
-  "destination": null,
-  "dispute": null,
-  "failure_code": null,
-  "failure_message": null,
-  "fraud_details": {},
-  "id": "ch_NORMALIZED00000000000001",
-  "invoice": null,
-  "livemode": false,
-  "metadata": {},
-  "object": "charge",
-  "on_behalf_of": null,
-  "order": null,
-  "outcome": {
-    "network_status": "approved_by_network",
-    "reason": null,
-    "risk_level": "normal",
-    "risk_score": 00,
-    "seller_message": "Payment complete.",
-    "type": "authorized"
-  },
-  "paid": true,
-  "payment_intent": null,
-  "payment_method": "card_NORMALIZED00000000000001",
-  "payment_method_details": {
-    "card": {
-      "brand": "visa",
-      "checks": {
-        "address_line1_check": "pass",
-        "address_postal_code_check": "pass",
-        "cvc_check": "pass"
-      },
-      "country": "US",
-      "exp_month": 3,
-      "exp_year": 2033,
-      "fingerprint": "NORMALIZED000001",
-      "funding": "credit",
-      "last4": "4242",
-      "three_d_secure": null,
-      "wallet": null
-    },
-    "type": "card"
-  },
-  "receipt_email": "hamlet@zulip.com",
-  "receipt_number": null,
-  "receipt_url": "https://pay.stripe.com/receipts/acct_NORMALIZED000001/ch_NORMALIZED00000000000001/rcpt_NORMALIZED000000000000000000001",
-  "refunded": false,
-  "refunds": {
-    "data": [],
-    "has_more": false,
-    "object": "list",
-    "total_count": 0,
-    "url": "/v1/charges/ch_NORMALIZED00000000000001/refunds"
-  },
-  "review": null,
-  "shipping": null,
-  "source": {
-    "address_city": "Pacific",
-    "address_country": "United States",
-    "address_line1": "Under the sea,",
-    "address_line1_check": "pass",
-    "address_line2": null,
-    "address_state": null,
-    "address_zip": "33333",
-    "address_zip_check": "pass",
-    "brand": "Visa",
-    "country": "US",
-    "customer": "cus_NORMALIZED0001",
-    "cvc_check": "pass",
-    "dynamic_last4": null,
-    "exp_month": 3,
-    "exp_year": 2033,
-    "fingerprint": "NORMALIZED000001",
-    "funding": "credit",
-    "id": "card_NORMALIZED00000000000001",
-    "last4": "4242",
-    "metadata": {},
-    "name": "Ada Starr",
-    "object": "card",
-    "tokenization_method": null
-  },
-  "source_transfer": null,
-  "statement_descriptor": "Zulip Standard",
-  "statement_descriptor_suffix": "Zulip Standard",
-  "status": "succeeded",
-  "transfer_data": null,
-  "transfer_group": null
-}

corporate/tests/stripe_fixtures/invoice_plan--Invoice.create.1.json

@@ -1,117 +0,0 @@
-{
-  "account_country": "US",
-  "account_name": "Dev account",
-  "amount_due": 0,
-  "amount_paid": 0,
-  "amount_remaining": 0,
-  "application_fee_amount": null,
-  "attempt_count": 0,
-  "attempted": false,
-  "auto_advance": true,
-  "billing": "charge_automatically",
-  "billing_reason": "manual",
-  "charge": null,
-  "collection_method": "charge_automatically",
-  "created": 1000000000,
-  "currency": "usd",
-  "custom_fields": null,
-  "customer": "cus_NORMALIZED0001",
-  "customer_address": null,
-  "customer_email": "hamlet@zulip.com",
-  "customer_name": null,
-  "customer_phone": null,
-  "customer_shipping": null,
-  "customer_tax_exempt": "none",
-  "customer_tax_ids": [],
-  "default_payment_method": null,
-  "default_source": null,
-  "default_tax_rates": [],
-  "description": "",
-  "discount": null,
-  "due_date": null,
-  "ending_balance": null,
-  "footer": null,
-  "hosted_invoice_url": null,
-  "id": "in_NORMALIZED00000000000001",
-  "invoice_pdf": null,
-  "lines": {
-    "data": [
-      {
-        "amount": 48000,
-        "currency": "usd",
-        "description": "Zulip Standard",
-        "discountable": false,
-        "id": "ii_NORMALIZED00000000000001",
-        "invoice_item": "ii_NORMALIZED00000000000001",
-        "livemode": false,
-        "metadata": {},
-        "object": "line_item",
-        "period": {
-          "end": 1357095845,
-          "start": 1325473445
-        },
-        "plan": null,
-        "proration": false,
-        "quantity": 6,
-        "subscription": null,
-        "tax_amounts": [],
-        "tax_rates": [],
-        "type": "invoiceitem"
-      },
-      {
-        "amount": -48000,
-        "currency": "usd",
-        "description": "Payment (Card ending in 4242)",
-        "discountable": false,
-        "id": "ii_NORMALIZED00000000000002",
-        "invoice_item": "ii_NORMALIZED00000000000002",
-        "livemode": false,
-        "metadata": {},
-        "object": "line_item",
-        "period": {
-          "end": 1000000000,
-          "start": 1000000000
-        },
-        "plan": null,
-        "proration": false,
-        "quantity": 1,
-        "subscription": null,
-        "tax_amounts": [],
-        "tax_rates": [],
-        "type": "invoiceitem"
-      }
-    ],
-    "has_more": false,
-    "object": "list",
-    "total_count": 2,
-    "url": "/v1/invoices/in_NORMALIZED00000000000001/lines"
-  },
-  "livemode": false,
-  "metadata": {},
-  "next_payment_attempt": 1000000000,
-  "number": "NORMALI-0001",
-  "object": "invoice",
-  "paid": false,
-  "payment_intent": null,
-  "period_end": 1000000000,
-  "period_start": 1000000000,
-  "post_payment_credit_notes_amount": 0,
-  "pre_payment_credit_notes_amount": 0,
-  "receipt_number": null,
-  "starting_balance": 0,
-  "statement_descriptor": "Zulip Standard",
-  "status": "draft",
-  "status_transitions": {
-    "finalized_at": null,
-    "marked_uncollectible_at": null,
-    "paid_at": null,
-    "voided_at": null
-  },
-  "subscription": null,
-  "subtotal": 0,
-  "tax": null,
-  "tax_percent": null,
-  "total": 0,
-  "total_tax_amounts": [],
-  "webhooks_delivered_at": null
-}