Align dev with master

CHANGELOG.md

@@ -8,13 +8,18 @@ All notable changes to this project will be documented in this file. The format
 
 ### General
 
+- Added:
+
+  - Added backend/proxy ([#1380](https://github.com/bloom-housing/bloom/pull/1380))
+
 ### Backend
 
 - Fixed:
 
   - Poor TypeORM performance in `/applications` endpoint ([#1131](https://github.com/bloom-housing/bloom/issues/1131)) (Michał Plebański)
   - POST `/users` endpoint response from StatusDTO to UserBasicDto (Michał Plebański)
   - Replaces `toPrecision` function on `units-transformations` to `toFixed` ([#1304](https://github.com/bloom-housing/bloom/pull/1304)) (Marcin Jędras)
+  - "totalFlagged" computation and a race condition on Application insertion ([#1366](https://github.com/bloom-housing/bloom/pull/1366))
 
 - Added:
 
@@ -24,6 +29,8 @@ All notable changes to this project will be documented in this file. The format
   - `/assets` endpoints (create and createPresignedUploadMetadata)
   - "noEmailConfirmation" query param to `POST /users` endpoint
   - POST `/users` endpoint response from StatusDTO to UserBasicDto (Michał Plebański)
+  - `/jurisdictions` endpoint and DB schema ([#1391](https://github.com/bloom-housing/bloom/pull/1391))
+  - `/reservedCommunityTypes` endpoint and DB schema ([#1395](https://github.com/bloom-housing/bloom/pull/1395))
 
 - Changed:
 
@@ -53,11 +60,8 @@ All notable changes to this project will be documented in this file. The format
   - Fix repetition of select text on preferences ([#1270](https://github.com/bloom-housing/bloom/pull/1270)) (Emily Jablonski)
   - Fix aplication submission and broken test ([#1270](https://github.com/bloom-housing/bloom/pull/1282)) (Dominik Barcikowski)
   - Fix broken application search in Partners ([#1301](https://github.com/bloom-housing/bloom/pull/1301)) (Dominik Barcikowski)
-    <<<<<<< HEAD
-    =======
   - Fix multiple unit rows in summaries, sorting issues ([#1306](https://github.com/bloom-housing/bloom/pull/1306)) (Emily Jablonski)
   - Fix partners application submission ([#1340](https://github.com/bloom-housing/bloom/pull/1340)) (Dominik Barcikowski)
-    > > > > > > > upstream/master
 
 - Changed:
 

CONTRIBUTING.md

@@ -1,15 +1,12 @@
-# Contributing to HousingBayArea and Bloom
+# Contributing to Bloom
 
-Contributions to this Bay Area local site, as well as the core Bloom applications and services are welcomed. To help us meet the project's goals around quality and maintainability, we ask that all contributors read, understand, and agree to these guidelines.
-
-It's important to know that this project is a local fork of the [core Bloom framework](https://github.com/bloom-housing/bloom).
-If you're planning to contribute, make sure to think through if it's a Bay Area-specific set of code, in which case it should be submitted here, or if it's a general improvement to the framework that would benefit all users and should be submitted to the core upstream project.
+Contributions to the core Bloom applications and services are welcomed. To help us meet the project's goals around quality and maintainability, we ask that all contributors read, understand, and agree to these guidelines.
 
 ## Reporting an Issue
 
 We use GitHub issues to track both bugs and feature ideas, and encourage all developers working with Bloom to file issues for consideration.
 
-This site tracks implementation-specific issues about the Bay Area sites for Alameda County, San Mateo County, and the City of San Jose only.
+Please note that implementation-specific issues with individual Bloom sites should be tracked in the repositories for those sites. Our issue tracker is for issues with the core software and reference implementations only.
 
 ## Pull Requests
 
@@ -30,3 +27,4 @@ Bloom uses the Circle CI system to automatically run tests on any pull requests.
 We use the ESlint linting system and the automatic code formatter Prettier (which the linter also enforces). **All** pull requests must pass linting to be accepted, so they don't create fix work for future contributors. If you're not using an IDE that integrates with these tools, please run eslint + prettier from the cli on all added or changed code before you submit a pull request.
 
 As much as we'll try to keep current, the linting rules can become out of date, and in this case you should file an issue with the adjustments you're looking for. We'll be looking for a resulting PR with a minimum of two commits - one to adjust the rules or tooling, and another that updates the codebase to match. If the latter changes are complex, please discuss in advance and break up the work into reasonably reviewable commits.
+

README.md

@@ -88,23 +88,3 @@ We are using [lerna](https://lerna.js.org/) as a package versioning tool. It hel
 ## Contributing
 
 Contributions to the core Bloom applications and services are welcomed. To help us meet the project's goals around quality and maintainability, we ask that all contributors read, understand, and agree to these guidelines.
-
-## Pulling changes from core repository
-
-Add a new remote origin:
-
-```
-git remote add upstream https://github.com/bloom-housing/bloom.git
-```
-
-Fetch newest indices from it:
-
-```
-git fetch upstream
-```
-
-Merge remote into your local branch:
-
-```
-git merge upstream/master
-``

backend/core/README.md

@@ -69,6 +69,24 @@ To have launch Redis as background service and restart at login:
 Test if Redis is working:
 `redis-cli ping`
 
+### Debugging
+
+You can connect a debugger to the backend by starting the backend server with `yarn debug`.
+
+To connect to it from VS Code, add a configuration to launch.json that looks like
+```shell script
+{
+  "name": "Attach to Backend",
+  "port": 9229,
+  "request": "attach",
+  "skipFiles": [
+    "<node_internals>/**"
+  ],
+  "type": "node",
+  "restart": true
+},
+```
+
 ### Running Tests
 
 End-to-end tests:

backend/core/archer.ts

@@ -301,9 +301,6 @@ export const ArcherListing: Listing = {
       // referenceType: "Listing",
       // TODO confirm not used anywhere
       // referenceId: "Uvbk5qurpB2WI9V6WnNdH",
-      id: "id",
-      createdAt: new Date(),
-      updatedAt: new Date(),
       label: "building",
       fileId:
         "https://regional-dahlia-staging.s3-us-west-1.amazonaws.com/listings/archer/archer-studios.jpg",