- 600cd52 - (Simon) Make sure the version ID gets taken into consideration for report details and flow objects
- 6a22b03 - (Simon) Style fixes in activity controller
- 60c47d6 - (Tim Martin) Merged in feature/OCT-logic-changes (pull request #723)
OCT logic changes
HPC-2408: Ensure data cleanup on import
- 33020b0 - (Tim Martin) Merged in bug/HPC-2325-created-and-updated-user-for-new-versions-of-a-flow (pull request #721)
Fix versioning assigning to a user, some style fixes
- 41e7a7b - (Mark Boyd) HPC-2411: change logic for decision date on OCT flows
- 15a835b - (Mark Boyd) change source year to one less than fiscal year for opening balance OCT records
- 5ad75ae - (Mark Boyd) HPC-2410: remove donor budget year and use fiscal year for source usage year on OCT flows
- 9320e46 - (Mark Boyd) remove logic blocking flow object attachment for original pledge flows
- fceb3ae - (Mark Boyd) Revert "remove logic preventing flow objects for original pledge flows"
This reverts commit 27b452cf47cb9e526f32bc89e046e41765737d01.
- 27b452c - (Mark Boyd) remove logic preventing flow objects for original pledge flows
- b559616 - (Mark Boyd) add code to helper for saving flow links to cleanup any old data
- beea37e - (Mark Boyd) change helper function for associating imported flow objects to always delete invalid flow objects
- 2586bf2 - (Mark Boyd) update function signature for attachFlowObjects to pass callback as separate parameter
- e658c95 - (Mark Boyd) separate method for removing flow objects that are no longer valid
- 4e7ede3 - (Simon) Fix versioning assigning to a user, some style fixes
- 62b9e43 - (Simon) Simplify seed, use promise, fix emergencies not being defined
- 56c2849 - (Tim Martin) Merged in feature/HPC-2319-add-xml-EDRIS (pull request #718)
HPC-2319: Create and attach EDRIS XML source data to flow
- b76154f - (Simon) Fixes to docker-compose for tests
- 7464e9c - (Simon) Fix migrations to only run if exist
- 8a74b83 - (Tim Martin) Added mime type to properties
- ff012ab - (Tim Martin) Added function to base to add XML file attachments to reportDetails
- f1eae19 - (Tim Martin) Merged in bug/HPC-1925-public-emergencies-api (pull request #715)
HPC-1925: Classic API error handling and documentation
- 85557f5 - (Mark Boyd) add new helper for flow import to reset all object categories at once
- fbae480 - (Simon) Fix to result callback in saveDestAsChildSource
- 36dc209 - (Tim Martin) Merged in update/mysql-max-allowed-packet (pull request #717)
Increase mySQL max_allowed_packet to 100m for local development
- ca91b61 - (Mark Boyd) increase mySQL max_allowed_packet to 100m for local development
- 31fa4c6 - (Tim Martin) Merged in bug/HPC-2409-projects-import (pull request #716)
Change setCluster to setFieldCluster in project import to match association alias
- 011b58a - (Mark Boyd) change HTTP status code to 404 when location for IATI data cannot be found
- fc58b1e - (Mark Boyd) change setCluster to setFieldCluster in project import to match association alias
- 9069f1c - (Tim Martin) Merged in task/HPC-2242-add-flow-object-versioning (pull request #714)
Task/HPC-2242 add flow object versioning
- e0a63d6 - (Tim Martin) Merged in change/HPC-2352-add-validation-for-greater-than-zero (pull request #713)
Change/HPC-2352 add validation for greater than zero
- 52da7ba - (Mark Boyd) add special error handling for emergencies by year API endpoint
- 735f9fa - (Mark Boyd) fix error codes and handling for other classic endpoints and IATI
- af36074 - (Mark Boyd) update error codes and handling for classic project endpoints
- f8fee85 - (Simon) Write unit tests for deleteFlowData
- 1c4c058 - (Simon) Write unit tests for deleteFlowData
- 64f2b96 - (Simon) Fix existing tests
- 1f57d3e - (Mark Boyd) remove 404 as possible response for public emergencies endpoints
- a436d75 - (Simon) Fix existing tests
- 7dff389 - (Simon) Fix logic of delete through promisifying
- 24325a7 - (Simon) Merge conflicts
- e838f4b - (Simon) Add validation for funding amount check
- 78bcd08 - (Simon) Commenting, promisfy getActiveFlowById and add query by versionID
- 16edfc1 - (Simon) Cast to self.amountUSD to integer
- 34aa70e - (Simon) Close HPC-2393 fix funding amount check
- 43c91dc - (Simon) Better empty clause catches
- 26c144f - (Simon) Better empty clause catches
- 9fc4000 - (Tim Martin) Merged in feature/HPC-2211-EDRIS-update-pending (pull request #712)
Feature/HPC-2211 edris update pending
- 8bf2377 - (Tim Martin) Fixed formatting
- 643d74f - (Tim Martin) Added logic to update pending flows instead of creating new versions
- f801d52 - (Simon) [WIP] Add validation for dollar amount check skeleton
- fb3d645 - (Mark Boyd) Merged in feature/HPC-23860-IATI-flow-activity-dates (pull request #711)
Generate flow activity date elements from flow destination usage years & fix errors with duplicate data
- f0f177c - (Mark Boyd) remove sourceUsageYearName from Solr query
- 0907c35 - (Mark Boyd) generate flow activity date elements from flow destination usage years & fix errors with duplicate data
- 94e4ac8 - (Mark Boyd) add 404 response for endpoints missing parameters
- 9b30524 - (Tim Martin) Merged in bug/fix-external-imports (pull request #710)
Fix reference to missing functions for external import
- 97eeb9b - (Mark Boyd) consolidate query lib join functions
- 754d7ff - (Mark Boyd) fix reference to missing functions for external import
- 75347b8 - (Tim Martin) Merged in feature/HPC-2156-endpoint-flow-object-versioning (pull request #709)
Added logic to get correct version of flow objects for parked parents
- 038b599 - (Tim Martin) Added logic to get correct version of flow objects for parked parents
- bfe5265 - (Tim Martin) Merged in feature/HPC-2156-endpoint-flow-object-versioning (pull request #708)
Fixed issue with project global clusters during Solr import
- ed51bb2 - (Tim Martin) Fixed issue with project global clusters during Solr import
- a17e6dd - (Tim Martin) Merged in change/HPC-2348-format-money-amounts-in-error-messages (pull request #707)
Add currency formatting to amounts calculation
- 2d1141e - (Simon) Edits to catch some errors better, fix report details saving
- 2f4718e - (Simon) Add currency validation to amounts calculation
- 27c85ac - (Simon) Clean up category and object saving for flows
- a720860 - (Tim Martin) Merged in feature/HPC-2154-EDRIS-flow-object-versioning (pull request #706)
Added version ID to flow objects
- 4792f40 - (Tim Martin) Added version ID to flow objects
- 6505838 - (Simon) Add empty substantive change for createFlowData
- a9d5dc9 - (Tim Martin) Merged in bug/plan-summary-issue (pull request #705)
Added filter property for active records
Bug/HPC-2214 display pending flows in linked
HPC-2367: Update all flow and flow search queries to use version ID when joining flow objects
- 1a5a13f - (Tim Martin) Added filter property for active records
- ba3c155 - (Simon) Clean up and elaborate, define tests
- 65fff9c - (Mark Boyd) remove unnecessary module exports
- 721c731 - (Mark Boyd) update queries to join flow objects using version ID
- b1186bb - (Tim Martin) Merged in bug/plan-summary-issue (pull request #702)
Fixed issue with getting plan summary by id
HPC-1925: Emergencies public API
Flow object versioning
- 3943b3e - (Tim Martin) Fixed issue with getting plan summary by id
- 31d5f88 - (Mark Boyd) update API documentation for emergencies
- eed41ff - (Mark Boyd) update documentation for emergency public API endpionts
- c235e5b - (Mark Boyd) remove debugging code
- 7a7025c - (Tim Martin) Merged in feature/HPC-2261-change-flow-date (pull request #700)
Changed logic to use decisionDate for flowDate
- 8695579 - (Tim Martin) Changed logic to use decisionDate for flowDate
- 82559d9 - (Mark Boyd) add endpoint for emergencies by year
- f711809 - (Mark Boyd) add emergencies by year endpoint
- 28b630f - (Mark Boyd) finish error handlnig for emergency by ID endpoint
- ff20aa3 - (Tim Martin) Fixed issue with EDRIS import
- 8804d2a - (Mark Boyd) add XML version of emergency by ID public endpoint
- 2dce72e - (Tim Martin) Merged in bug/country-summary-sources-error (pull request #699)
Fixed issue with country summary sources endpoint
- 59d5b3f - (Tim Martin) Fixed issue with country summary sources endpoint
- ea05154 - (Simon) Make changes to API to not query all activity streams
- df3fefd - (Mark Boyd) create controller for public endpoint of emergency by ID
- 2976637 - (Mark Boyd) change variable reference
- 7a28bd2 - (Mark Boyd) add more safety checks before removing orphaned flow objects
- eedd28c - (Tim Martin) Merged in feature/HPC-2351-multi-cluster (pull request #697)
Added logic to create only one flow when there are multiple global clusters
- cd4516e - (Tim Martin) Added logic to create only one flow when there are multiple global clusters
- 945a71d - (Mark Boyd) update flow by ID and legacyID controllers to use versionID when retrieving flow objects
- c5c2cde - (Tim Martin) Merged in feature/IATI-docs (pull request #696)
Add documentation for IATI endpoint & improve error handling
- 1e38e78 - (Mark Boyd) update legacy & external imports to use flow versionID when attaching flow objects
- 579be60 - (Mark Boyd) add documentation for IATI endpoint & improve error handling
- f841f86 - (Mark Boyd) Merged in feature/IATI-tweaks (pull request #695)
IATI updates (HPC-2286 & HPC-2298)
- 501c770 - (Mark Boyd) remove unnecessary sequelize reference
- 1b753a5 - (Mark Boyd) remove unnecessary imports
- be6721b - (Mark Boyd) remove debugging code
- daf0fd1 - (Mark Boyd) refactor cluster and location data parsing
- 9884328 - (Mark Boyd) restore original IATI project query
- 739f84a - (Tim Martin) Merged in bug/global-homepage-map-issue (pull request #694)
Fixed issue with null organization ID for global homepage map endpoint
- c5f89d3 - (Tim Martin) Merged in change/HPC-2301-additional-logic-for-saving-flow-children (pull request #693)
Change/HPC-2301 additional logic for saving flow children
- 99a3ea2 - (Tim Martin) Fixed issue with null organization ID for global homepage map endpoint
- 330db2b - (Simon) Clean up code
- a7bb17f - (Simon) Add new logic for saving flow children
- 896b804 - (Mark Boyd) make separator strings configurable for queries and results parsing
- 6d7af3e - (Mark Boyd) add recipient country data for IATI individual flows
- abb0bfa - (Tim Martin) Merged in bug/HPC-2334-cap-value-issue (pull request #692)
Bug/HPC-2334 cap value issue
- afe4f1a - (Tim Martin) Formatted file
- 9984d19 - (Mark Boyd) HPC-2286: fix transaction data
- 4e2f753 - (Mark Boyd) change IATI project data preparation to use new data structure from raw query
- f89bbfc - (Mark Boyd) write custom query for IATI project data to get performance boost
- 4047e3f - (Mark Boyd) Merged in feature/IATI-flow-data (pull request #691)
IATI flow data
- abf55be - (Mark Boyd) remove unnecessary field from Solr query
- 7c265ca - (Mark Boyd) comment out debugging statements
- e052e55 - (Mark Boyd) fix formatting of other org and ID output
- 56c7bdc - (Mark Boyd) fix missing updated date timestamp for project records
- c9d295b - (Tim Martin) Added logic to loop through all emergencies that match location
- 204b035 - (Tim Martin) Merged in bug/HPC-2269-EDRIS-multi-flow (pull request #690)
Added trim to glideNumber
- dcf2604 - (Tim Martin) Added trim to glideNumber
- 1193226 - (Tim Martin) Merged in bug/HPC-2269-EDRIS-multi-flow (pull request #689)
Added additional logging
- 91620b5 - (Tim Martin) Added additional logging
- d70a9b9 - (Tim Martin) Merged in feature/add-locationIdISO3-solr-field (pull request #688)
Add new combo ID/ISO3 solr field for flow locations
- b57e5aa - (Mark Boyd) add new combo ID/ISO3 solr field for flow locations
- daa2311 - (Tim Martin) Merged in feature/add-location-ISO3-solr (pull request #687)
Add solr indexing for ISO3 codes of source and destination locations on flows
- 8635ac8 - (Mark Boyd) add solr indexing for ISO3 codes of source and destination locations on flows
- 6c2d29f - (Mark Boyd) add field cluster and global cluster data for IATI flows data
- cb5cf29 - (Tim Martin) Merged in bug/HPC-2269-EDRIS-multi-flow (pull request #686)
Fixed issue with linked commitment
- 17f106e - (Tim Martin) Fixed issue with linked commitment
- aaf80e4 - (Mark Boyd) add activity status and dates to IATI flows data
- c92baca - (Mark Boyd) add participating org and transaction data for IATI flow data
- 133f8f1 - (Tim Martin) Merged in bug/HPC-2219-edris-plan-issue (pull request #685)
Fixed issue with linked commitment
- 8cb7c44 - (Mark Boyd) change control flow to prepare unique array of flows not associated with projects for IATI output
- 0988c80 - (Tim Martin) Fixed issue with linked commitment
- 1ff561a - (Tim Martin) Merged in bug/HPC-2219-edris-plan-issue (pull request #684)
HPC-2219: EDRIS plan attach issue
Classic API updates & changes for global clusters
- 51a63e2 - (Tim Martin) Added option for removal of flow objects
- eb83045 - (Simon) Fix validation to differentiate between destinations and sources
- fe1aa8b - (Simon) Better formatting, more readable function arguments
- 877b9b3 - (Mark Boyd) merge in develop
- 6c20d3f - (Mark Boyd) update global cluster mapping for EDRIS import
- 788026c - (Mark Boyd) remove Mine action keyword for flows with mine action sector
- 8d2880b - (Mark Boyd) HPC-2333: map mine action sector to mine action global cluster
- 82417df - (Mark Boyd) update global cluster documentation
- 4184c6c - (Mark Boyd) migrate parent global clusters for AOR globa l clusters
- bfb71a8 - (Mark Boyd) update documentation for global cluster endpoints
- 2443a4f - (Mark Boyd) change acronym column to code for global clusters
- 88c881d - (Mark Boyd) add parentId column for global clusters
- 325d559 - (Mark Boyd) change root element to for projects public endpoints
- 2ca9d50 - (Mark Boyd) change root element to for locations public endpoint
- 4997e43 - (Mark Boyd) change root element to for organizations public endpoint
- 677ca67 - (Tim Martin) Merged in changes/HPC-1920-project-endpoints (pull request #682)
Remove partners property and sectorIASC data from public project endpoints data
- 8eac863 - (Mark Boyd) change XML output for global clusters to use as root element
- 7e5591c - (Mark Boyd) remove partners property and sectorIASC data from public project endpoints data
- b952aa0 - (Mark Boyd) Merged in feature/IATI-endpoint (pull request #681)
More work on IATI endpoint
- 0a4e930 - (Mark Boyd) change properties used for humanitarian scope data
- 6814d8f - (Tim Martin) Merged in change/HPC-2222-revisit-save-parent-flows (pull request #680)
move checkReportDetails to validations for flow
- e68d215 - (Mark Boyd) fix issue where only single result was appearing
- 2641aa5 - (Simon) Merge conflicts
- 541c4cd - (Tim Martin) Merged in feature/IATI-endpoint (pull request #679)
Initial work on IATI endpoint (for project data)
- 93b6f35 - (Tim Martin) Merged in change/HPC-2252-save-flow-linked-to-plan-or-emergency-restricted (pull request #678)
Change/hpc 2252 save flow linked to plan or emergency restricted
- 5d84dfc - (Mark Boyd) fix output for project priority element in IATI XML
- a47979a - (Simon) move checkReportDetails to validations for flow
- f8a9418 - (Mark Boyd) remove unnecessary console.log
- 810cfea - (Mark Boyd) add console.time logging to monitor response time for IATI data requests
- 14fac42 - (Mark Boyd) add speical namespace elements for project categories
- e1ee52a - (Mark Boyd) add recipient country info
- 95d62a9 - (Mark Boyd) change IATI xml to be built from object for more flexibility
- 3fafcab - (Simon) Move validations unit spec to the server
- 7215fc5 - (Simon) Add validation for checking if restricted
- 4d21254 - (Mark Boyd) fix minor documentation error
- 08145ce - (Mark Boyd) Merged in bug/fix-external-import (pull request #677)
Changed project scope name for field cluster
- 2848d60 - (Mark Boyd) changed project scope name for field cluster
- 4e19d0d - (Tim Martin) Merged in bug/HPC-2219-edris-plan-issue (pull request #676)
Added ID for EDRIS console output for testing
- 002f3f3 - (Tim Martin) Added ID for EDRIS console output for testing
- 4be7e69 - (Mark Boyd) first pass at code to output provider and receiver org output for transaction
- 4fe2728 - (Mark Boyd) add variables to store OCHA identifiers for XML output
- d166814 - (Simon) Remove from pre-commit hook, will ask if people want that first
- bcd1581 - (Simon) Tests for getting all flows
- 9854ad9 - (Tim Martin) Merged in feature/HPC-1882-solr-updates (pull request #675)
Created not specified field for single funding totals
- 79d4930 - (Tim Martin) Created not specified field for single funding totals
- f935902 - (Mark Boyd) add project budget output to IATI XML
- 7e62107 - (Simon) Update README for seed path, add ideas for fixing plan migration
- 58ec8ec - (Mark Boyd) add field cluster and global cluster output
- ed7ced7 - (Mark Boyd) add participating orgs output for source and destination organizations to IATI output
- 8994d69 - (Mark Boyd) add activity title and description to XML output
- d3939e3 - (Simon) Only add streams if not in automated-tests
- 8f7f91a - (Simon) Clean up lib.unit and add pre-commit
- 34eb451 - (Tim Martin) Merged in feature/HPC-1882-solr-updates (pull request #674)
Fixed issue with project import
- 575a98e - (Tim Martin) Removed console.log for query
- de08e0e - (Tim Martin) Fixed issue with project import Added delete functionality for flows that have been deleted
- aa01a42 - (Simon) Move sequelize.query to stubs for models, and add better commenting
- 4fd9bf4 - (Simon) Remove old tests from lib file
- 6642371 - (Simon) Add reference to ValidateType
- f7abcc4 - (Simon) add ValidateType to library
- b9c3251 - (Tim Martin) Merged in feature/HPC-1882-solr-updates (pull request #673)
HPC-1882: solr updates
- 35dfc16 - (Tim Martin) Added error handing
- fd33d44 - (Tim Martin) Added high-water to Solr indexing for flows and projects
- 92bb5be - (Tim Martin) Merged in bug/HPC-2314-why-two-inactive-reasons (pull request #671)
General fixes to flow controllers, fixed one potential bug
Rename cluster to fieldCluster in project API output
- 55d24dc - (Mark Boyd) add function to generate XML from IATI data
- 10de3d4 - (Simon) Write initial tests for update flow
- dab7304 - (Simon) Add checks for existence to validations
- c25f56b - (Simon) Split flow into two files
- 77110ef - (Mark Boyd) rename cluster to fieldCluster in project API output
- 9442b00 - (Tim Martin) Added initial logic for Solr indexing based on high-water approach
- f73ceac - (Simon) General fixes to flow controllers, fixed one potential bug
- 4b5fc23 - (Tim Martin) Merged in feature/add-solr-fields (pull request #670)
Add new fields to project and flow solr documents
- 5c0cb62 - (Mark Boyd) fix condition for retrieving project gender marker categories
- 18bc9f1 - (Mark Boyd) add new fields to project and flow solr documents
- ad35e00 - (Mark Boyd) more work on IATI queries
- 081d5d5 - (Mark Boyd) stub out IATI XML file header elements (HPC-2274)
- c46d953 - (Mark Boyd) add xmlbuilder module for creating IATI XML
- b2e030d - (Mark Boyd) change IATI endpoint to lookup location by ISO3 code
- b947171 - (Mark Boyd) include solr docs under each grouped project
- f31ef6c - (Tim Martin) Merged in feature/HPC-2018-mulitple-values (pull request #669)
Fixed issue with flowObjectTotals grouping
- 5559b49 - (Tim Martin) Fixed issue with flowObjectTotals grouping
- 504dffe - (Mark Boyd) refine queries for IATI flows by project and not by project & add ability to negate condition on main query object for solr queries
- de6a5f5 - (Tim Martin) Merged in bug/HPC-2314-why-two-inactive-reasons (pull request #668)
Building Controller Unit Tests
- b39a099 - (Mark Boyd) more work on IATI queries
- 2ff9f3e - (Simon) Remove console.log
- b013aa9 - (Simon) Rename flow.controllers.spec to clearly be for unit testing
- c224d35 - (Simon) Add test skeletons for the flow controllers
- 5c71365 - (Simon) Add proxyquire to dev dependencies
- 0734f7e - (Simon) Style changes to flow.js
- c76f081 - (Tim Martin) Merged in feature/flow-solr-import-add-fields (pull request #667)
Add flow date and flow type to flow solr indexing job
- b3c2022 - (Mark Boyd) update schema.xml with new fields
- fc7c1d9 - (Mark Boyd) add flow date and flow type to flow solr indexing job
- 2683ba9 - (Mark Boyd) setup initial route and controller for IATI endpoint & fix bug with limits in solr query
- 62b94ad - (Tim Martin) Merged in feature/HPC-2018-mulitple-values (pull request #666)
Created custom endpoint for testing
- 3badfe5 - (Tim Martin) Created custom endpoint for testing
- 0667da7 - (Mark Boyd) Merged in bugs/classic-API-endpoints (pull request #665)
Character encoding bugs in classic API endpoints & Add categories to organizations endpoint
- 2211795 - (Mark Boyd) update documentation for organizations endpoint
- 1183a0e - (Mark Boyd) add utf-8 character encoding for JSON endpoints & add organizationType categories to organizations endpoint
- 686cd8e - (Tim Martin) Merged in feature/HPC-2018-mulitple-values (pull request #664)
Added project ID to console log
- dee58eb - (Tim Martin) Added project ID to console log
- 92a1810 - (Tim Martin) Merged in feature/HPC-2018-mulitple-values (pull request #663)
Removed null placeholder from project indexing
- 8ea8d16 - (Tim Martin) Removed null placeholder from project indexing
- 5e5fe18 - (Tim Martin) Merged in feature/HPC-2018-mulitple-values (pull request #662)
HPC-2018: Added multi-value handling
- 1c526df - (Tim Martin) Moved getFlowObjectTotals to Solr query controller for easier re-use Updated endpoints to use getFlowObjectTotals from Solr query controller
- bbc0f0e - (Tim Martin) Updated all endpoints to use new multi-value funding structure
- 550b900 - (Tim Martin) Merged in feature/HPC-1967-solr-index-update (pull request #661)
HPC-1967: Solr updates
Classic project endpoints
- 6dda9d6 - (Tim Martin) Removed null placeholder values for missing fields Added multi-org type indexing
- 3ac3cfc - (Tim Martin) Updated getPlanSummaryFieldClusters to use single funding structure
- aee8368 - (Mark Boyd) change route for project by code & finish project API documentation
- 2708ebc - (Mark Boyd) more work on project documentation
- 974bc73 - (Mark Boyd) started adding project schema for documentation
- 64f298f - (Mark Boyd) change endpoints back to use xml2js for JSON to XML conversion
- 4c4ea9c - (Mark Boyd) add better logging to public endpoints
- 72b687f - (Tim Martin) Refactored single/shared/overlap logic in order to group by totals
- aaceaae - (Mark Boyd) add xmlbuilder module for building XML from JSON & add data massaging function for project data before XML conversion
- 72c6f7f - (Mark Boyd) return only id, name, and abbreviation attributes of project organizations
- a79003d - (Mark Boyd) add classic project endpoints by ID, code, and plan ID
- 96ae618 - (Tim Martin) Merged in feature/HPC-1916-classic-API-organizations (pull request #659)
HPC-1916: Add public organizations API endpoint
- 282395b - (Mark Boyd) add documentation for public organizations endpoint
- 407f7c3 - (Mark Boyd) Merged in feature/undo-module-updates (pull request #658)
Undo module updates (HPC-2105)
- 93ecff4 - (Mark Boyd) After discussing with Tim, we realized that updating the node modules needs to hold off until dev, stage, and prod are all running on the new Alpine images with node v4, since many of these module updates require node v4.
- 768acc7 - (Mark Boyd) add public API endpoint for organizations
- f21b328 - (Tim Martin) Merged in change/HPC-1996-query-limit-available-clusters (pull request #656)
Fix limiting of queries
HPC-2105: Update node modules
HPC-1914: Classic API endpoint for countries
- d4446d1 - (Mark Boyd) update docs for Public API with public locations endpoint
- 1434c20 - (Mark Boyd) move public global clusters controller to separate route
- 2f85db1 - (Mark Boyd) add classic API endpoint for locations
- bf3e09f - (Simon) Fix limiting of queries
- 13410c3 - (Mark Boyd) merge in develop
- a42fa11 - (Mark Boyd) Merged in fixes/data-seeding (pull request #655)
Remove unnecessary console.log & comment out broken RPM data seeding
- 171d62a - (Mark Boyd) remove unnecessary console.log & comment out broken RPM data seeding
- 12e2e8d - (Tim Martin) Merged in feature/HPC-2118-global-boundaries (pull request #652)
Feature/hpc 2118 global boundaries
- 886743f - (Mark Boyd) upgrade squel module to v4.4.2
- 5556f60 - (Tim Martin) Added global boundary logic to remaining endpoints
- 63f4a6e - (Mark Boyd) Merged in feature/stage-API-docs-config (pull request #651)
Add Nginx config to serve API docs to stage
- 9891579 - (Mark Boyd) Add Nginx config to serve API docs to stage
- 37a8d6b - (Mark Boyd) Merged in feature/dev-API-docs-config (pull request #650)
Add Nginx config to serve API documentation for dev
- 3e97862 - (Mark Boyd) add Nginx config to serve API documentation for dev
- 42e8489 - (Tim Martin) Merged in change/HPC-2312-versioning-for-activities (pull request #649)
Change/hpc 2312 versioning for activities
-
d3e85d9 - (Tim Martin) Added logic for boundary type - global totals
-
8a1f8b8 - (Simon) Fix typo
-
e44c2f8 - (Simon) Updates that enable versioning for flows
-
20f262c - (Simon) Add versioning reference to the function for fetching the last activity stream
-
ca15805 - (Simon) ID should be Id
-
0bcec2a - (Simon) Rename to categoryVersionID
-
72df768 - (Simon) Add versioning to activities
-
f9e2f2f - (Mark Boyd) bump up node engine version to 4.0.x in package.json
-
5fe330e - (Mark Boyd) remove console debugging message & comment out RPM data seeding that may no longer be relevant
-
ac35bbe - (Mark Boyd) Updated numerous node modules, including:
-
async
-
csv
-
fs-extra
-
helmet
-
json2csv
-
mysql
-
object-path
-
pg
-
pm2
-
supertest-as-promised
-
umzug
-
grunt
-
grunt-contrib-copy
-
grunt-mkdir
-
grunt-shell
-
mocha
-
node-inspector
-
nodemon
-
raml2html
-
should
-
supertest
-
55176d8 - (Tim Martin) Merged in change/HPC-2230-remove-nestings-for-parent-and-child-flows (pull request #648)
remove categories and nestedFlowObjects from parent and child scopes
- f6f33d3 - (Simon) Remove nestedFlowObject function
- 4d825d1 - (Simon) remove categories and nestedFlowObjects from parent and child scopes
- 74138e9 - (Mark Boyd) Merged in bug/HPC-2099-OCT-plan-matching (pull request #646)
HPC-2099: Bugs in project and plan matching
Change import logic so that firstReportedDate is always inherited from existing flow, if one exists
- d2f941b - (Mark Boyd) change import logic so that firstReportedDate is always inherited from existing flow, if one exists
- 1856b56 - (Mark Boyd) remove unnecessary check for endDate is NULL in project matching date conditions for OCT
- 3cbc80f - (Mark Boyd) remove unnecessary check for IS NULL on plan endDate in plan matching code, which was excluding valid data
- b82a753 - (Tim Martin) Merged in bug/fix-solr-memory-error (pull request #645)
Removed categoryRef from nestedFlowObject return
- 104ebfd - (Tim Martin) Removed categoryRef from nestedFlowObject return Added logic to Solr import to query for parent category
- e6d959e - (Tim Martin) Merged in change/HPC-2230-display-source-info-in-linked-flows (pull request #644)
Remove usageYear from returned data. Simplify output.
- dcb64aa - (Simon) Remove usageYear from returned data. Simplify output.
- 89547cf - (Tim Martin) Merged in feature/HPC-2117-boundary-group-by (pull request #643)
Fixed issue with location retrieval on homepage map endpoint
- 149ac63 - (Tim Martin) Fixed issue with location retrieval on homepage map endpoint
- d0f838e - (Tim Martin) Merged in feature/HPC-2117-boundary-group-by (pull request #642)
Added boundary logic for grouped totals
- 7af8676 - (Tim Martin) Merged in change/HPC-2230-display-source-info-in-linked-flows (pull request #641)
Add more details to flow versions
- ab2eb95 - (Tim Martin) Added boundary logic for grouped totals
- 55a4c92 - (Simon) Add more details to flow versions
- 8c5cbd2 - (Mark Boyd) Merged in feature/HPC-2254-project-matched-data (pull request #640)
Add project code to unmatched data for projects
- 927f5f0 - (Mark Boyd) add project code to unmatched data for projects
- 074b1a5 - (Tim Martin) Merged in change/HPC-2230-display-source-info-in-linked-flows (pull request #639)
Add usageYear to flowObjects to include in parents
- b06993d - (Tim Martin) Merged in feature/HPC-1871-global-clusters-classic-endpoint (pull request #638)
HPC-1871: Add global clusters classic endpoint
- 083072c - (Simon) Add usageYear to flowObjects to include in parents
- 846a4e9 - (Mark Boyd) update JSON schema for global clusters endpoint
- d9d1833 - (Mark Boyd) add safety checks to logic converting JSON to XML
- af7c6f4 - (Mark Boyd) convert error message to XML when format is requested
- ac1e503 - (Tim Martin) Merged in bug/fix-solr-memory-error (pull request #637)
Added logic to release Postgres connection every 100 flows
Bug/hpc 2251 add migration for primary key
- 9f39c7c - (Tim Martin) Added logic to release Postgres connection every 100 flows
- 4cb005d - (Simon) Add pkey index of versionID to migration flowObject
- c69d6b3 - (Simon) Remove bluebird as a dev dependency
- c886b55 - (Simon) Merge conflicts
- 29fee1f - (Mark Boyd) Merged in feature/HPC-2010-upgrade-node-v4 (pull request #635)
HPC- 2010: Upgrade to new Alpine Nginx and Node images
- aa06b47 - (Simon) Point docker-compose to working nginx16-node image
- b31880d - (Mark Boyd) added example XML response for global clusters
- d820d82 - (Mark Boyd) add JSON schema spec for global cluster endpoint
- cf967cd - (Mark Boyd) adjust output for global clusters endpoint & add method for converting JSON response to XML
- a39c180 - (Mark Boyd) add config for nginx containers to serve RAML documentation
- 3a7b570 - (Mark Boyd) remove testing Dockerfile
- 04f2ad8 - (Mark Boyd) remove sequelize CLI config
- 372ec1f - (Mark Boyd) resolve merge conflict in import documentation
- 54808fc - (Mark Boyd) add external link to contactsID auth container with an alias to the dnsdock hostname (contactsid.auth.vm)
- 85c9c74 - (Mark Boyd) re-add data seeding on service startup
- e59c56d - (Mark Boyd) update mysql connection config to use docker link name, not dnsdock hostname
- 814d686 - (Mark Boyd) update import documentation to reference correct paths to import scripts
- 356e155 - (Mark Boyd) add and mount new startup script for node
- 67b158b - (Mark Boyd) add explicit links between pgsql containers and node containers to avoid latency resolving dnsdock hostname for postgres container
- cc3beb7 - (Mark Boyd) comment out data seeding temporarily bc it is throwing an async error
- accce50 - (Mark Boyd) update node packages to latest versions
- 89e7f08 - (Mark Boyd) add dnsdock host names for node containers to facilitate debugging
- 6820528 - (Mark Boyd) set up two nginx containers for local dev
- 9e67bd0 - (Mark Boyd) remove unnecessary port references
- c62cc18 - (Mark Boyd) nginx config fixed to initialize properly & add kludgy, temp fix to run hpctest API service through nginx proxy
- 2587f25 - (Mark Boyd) add test bash script to override default container nodeJS startup
- 0d532d1 - (Mark Boyd) add temporary script to override default base image nodeJS server startup
- 4a433aa - (Mark Boyd) remove references to bash
- 0e22e46 - (Mark Boyd) change user to root in nginx conf & change node.sh to not use exec
- 5fdf3c4 - (Mark Boyd) testing a new image with alpine + nodeJS and nginx
- ee65b15 - (Mark Boyd) upgrade docker compose to use new alpine image for nodeJS
- f550737 - (Ali Raza) Version Bump 0.9.1
- de6c0e1 - (Simon) Add categories to parent reference
- 8e6246f - (Tim Martin) Merged in bug/HPC-2146-parked-flow-indexing (pull request #634)
Callback fix
- 4f6cb4f - (Tim Martin) Callback fix
- 9c1b195 - (Mark Boyd) Merged in bug/HPC-2260-child-flow-dest-objects (pull request #633)
change flow by legacy ID controller to only return IDs for child flows
- f3f3ebb - (Mark Boyd) change flow by legacy ID controller to only return IDs for child flows
- b8cdd63 - (Tim Martin) Merged in bug/HPC-2146-parked-flow-indexing (pull request #632)
Removed children from scope and added additional query
- fa3cd12 - (Tim Martin) Removed children from scope and added additional query
- 8350e58 - (Tim Martin) Merged in bug/HPC-2146-parked-flow-indexing (pull request #631)
Added logic for parked flows
Add option for custom URLs for OCT and CERF test data
- 9caf093 - (Tim Martin) Added logic for parked flows
- 3ff5571 - (Mark Boyd) fix error handling
- 3bec2cd - (Mark Boyd) add code to detect protocol for request URL of CERF and OCT imports
- a190375 - (Mark Boyd) add option for CERF and OCT imports to use a custom URL for importing test data
- 1ebb9cb - (Mark Boyd) Merged in bug/HPC-1322-unmatched-data (pull request #629)
Add postgres dollar quoting of organization names when searching for orgs in CERF and OCT import
- 3ff205c - (Mark Boyd) remove unnecessary import
- 122dc3c - (Mark Boyd) add postgres dollar quoting of organization names when searching for orgs in CERF and OCT import
- 53eef5b - (Mark Boyd) Merged in feature/HPC-2253-add-highwater-plans-emergencies (pull request #628)
HPC-2253: Add highwater for plans, emergencies, and organizations
- 51b0e80 - (Mark Boyd) code style fixes
- 07c66d5 - (Mark Boyd) add catches for thrown errors
- cdad18b - (Mark Boyd) add time output to organizations import
- d36f624 - (Tim Martin) Merged in bug/HPC-2146-parked-flow-indexing (pull request #627)
Bug/hpc 2146 parked flow indexing
- 23b74cc - (Tim Martin) Changed getDonorSummaryFundingByObject to use Solr
- 71863bc - (Mark Boyd) add high water to organization import
- 06cbf5c - (Tim Martin) Changed getDonorSummaryTrends to use Solr query
- 8d78fd8 - (Tim Martin) Changed getDonorSummarySnapshot to use Solr query
- 7e99dac - (Mark Boyd) add high water integration to emergency import
- 2ec5b3a - (Tim Martin) Moved getFundingByFlowObjects to flowQuery controller
- f4e0dd6 - (Mark Boyd) address minor bugs in high water integration
- d82d35d - (Mark Boyd) fix highwater integration with project import to ensure highwater arg can be used even if there no high water established
- bc9bb34 - (Mark Boyd) integrate highwater with plan import
- 1f8e894 - (Mark Boyd) Merged in bug/CERF-approval-date-only (pull request #626)
Fix bug with CERF import not accurately recognizing when only approval date is set
- 873e4a6 - (Mark Boyd) fix bug with CERF import not accurately recognizing when only approval date is set
- 904e549 - (Mark Boyd) Merged in feature/CERF-import (pull request #625)
CERF import
- 3f0062a - (Tim Martin) Breakout of Solr logic into its own controller
- 74b98f4 - (Tim Martin) Changed CountrySummaryFundingByOrganizations to use Solr
- 56ce1d3 - (Tim Martin) Changed CountrySummaryFundingByObject to use Solr
- cbceb28 - (Tim Martin) Changed CountrySummaryPooledFunds to use Solr for querying
- dc00605 - (Simon) Move validations into public folder, only check substantive if not adding
- 52c4ebe - (Mark Boyd) fix to seed CSV data
- e325a1b - (Mark Boyd) fix issue with data seeding that was creating duplicate organizations
- dc322ce - (Tim Martin) Merged in task/HPC-2195-flow-status-checks-for-date (pull request #624)
Small clean up
- 2af83c4 - (Mark Boyd) add route for looking up flows by external system ID as a query parameter
- c677d23 - (Mark Boyd) add missing function for superseding CERF flows
- 39f0731 - (Mark Boyd) quick code error fix
- 384aa37 - (Tim Martin) Changed getPlanSummaryLargestSources endpoint to use Solr query
- bdb1590 - (Simon) Merge conflicts, also validations refactoring
- 66a6a3b - (Mark Boyd) Merged in bug/plan-import-clusters (pull request #623)
Fix issue with plan import clusters
- eaab358 - (Mark Boyd) ensure other queries for legacy records include an objectType
- 6be04dd - (Tim Martin) Merged in bug/HPC-2213-fix-edris-excludes (pull request #622)
Added logic to handle errors during EDRIS processing
- 18b07d1 - (Tim Martin) Added logic to handle errors during EDRIS processing
- 5f753a1 - (Mark Boyd) add objectType to query for clusters by legacy ID
- d2cee0a - (Simon) Small clean up
- 53472ad - (Tim Martin) Merged in feature/HPC-2118-global-boundaries (pull request #621)
Feature/hpc 2118 global boundaries
- 7c12982 - (Tim Martin) Changed plan overview top funding endpoint to use Solr
- 3b089ce - (Mark Boyd) add more error handling for plan import
- a8b20ad - (Mark Boyd) Merged in plan-import-error-reporting (pull request #620)
add better error messages for plan import
- 1fbff30 - (Mark Boyd) add better error messages for plan import
- 700d047 - (Tim Martin) Changed getPlanOverviewFundingProgress endpoint to use Solr
- 03694e0 - (Tim Martin) Merged in bug/last-updated-issue (pull request #619)
Bug/last updated issue
- 3d0e554 - (Mark Boyd) remove unnecessary argument to function mapping sector names to global clusters
- 2c133c8 - (Mark Boyd) map global clusters from IASC sector names for CERF flows
- 5341ba9 - (Tim Martin) Fixed issue with last updated
- a010468 - (Tim Martin) Changed globalOverviewSnapshot endpoint to use Solr
- c0f8f45 - (Mark Boyd) use project global clusters as destinations, if they exist
- 17c5900 - (Tim Martin) Changed globalOverviewByObject endpoint to use Solr
- 753dba8 - (Mark Boyd) add flow objects to CERF import
- 5baa42b - (Mark Boyd) HPC-1328: add report details to CERF flows
- fbe4554 - (Tim Martin) Merged in bug/HPC-2248-usage-year-issue (pull request #618)
Bug/hpc 2248 usage year issue
- 8f5103f - (Tim Martin) Added destination filter
- c5839da - (Tim Martin) Merged in bug/HPC-1864-exclude-flows-with-active-status-from-parent-child-link-selection (pull request #617)
Add clause to query to exclude inactive flows
- 5e4302c - (Tim Martin) Added logic to inner join on flow object type in order to filter records with no values
- 9331613 - (Simon) Add clause to query to exclude inactive flows
Also fix some jshint errors
- aa9e576 - (Mark Boyd) fix issues with setting categories and decision dates on CERF flows
- 7b694c0 - (Mark Boyd) create initial version of CERF import & separate re-usable import functions into shared file
- 1eb9b62 - (Mark Boyd) Merged in feature/HPC-1319-process-CERF (pull request #616)
Setup initial request of CERF data
Feature/HPC-2016- add boundary logic
- 423f37f - (Tim Martin) Added boundary logic to country summary endpoints
- 37afc08 - (Tim Martin) Merged in feature/HPC-2210-store-source-record-ID (pull request #614)
HPC-2210: Add source record id to report details
Edited flowObject.js to have versionID and add a migration
- f08fff6 - (Mark Boyd) add field for externalDataCode to queries for pending flows from FTS classic database
- 915e4d8 - (Mark Boyd) Merged in highwater-fixes (pull request #613)
prevent highwater change if the import is for specific IDs
- 1e6fc05 - (Mark Boyd) prevent highwater change if the import is for specific IDs
- 6e8bbf9 - (Mark Boyd) store source system record ID on report details, if exists
- 639be22 - (Mark Boyd) Merged in feature/minor-code-reorg (pull request #609)
Reorganize some helper functions to ease and promote re-use
HPC-2179: Add high water infra
Ensure updated date is set correctly on superseded OCT flow
- 470f8d3 - (Tim Martin) Added boundary totals to plan summary endpoint
- 00b73c4 - (Simon) Remove query, simplify migration
- 0e62a25 - (Mark Boyd) uncomment necessary logic
- 4687ba2 - (Mark Boyd) ensure updated date is set correctly on superseded OCT flow
- eddb761 - (Tim Martin) Added boundary conditions to plan endpoints
- f12e7f8 - (Simon) Add query to update version to most recent version
- 8a31dee - (Simon) Edited flowObject.js to have versionID and add a migration
- 05367d8 - (Simon) Better commenting, check for -1
- 0456e4b - (Mark Boyd) setup initial request of CERF data
- 44b277f - (Mark Boyd) reorganize some helper functions to ease and promote re-use
- 5e0d6ac - (Tim Martin) Merged in task/HPC-1421-child-flows-update-parent-destinations (pull request #608)
Bump updatedAt for the childFlow as well
Task/hpc 1119 save as update logic
Add Barbados, Republic of South Sudan, and Hong Kong as national government orgs & add comments with name of every national government to import code
- 933951e - (Simon) Bump updatedAt for the childFlow as well
- 8d5a2ce - (Simon) Logic fixes on the server to assign right dates and versions to the flow
- 5cfacae - (Mark Boyd) add Barbados, Republic of South Sudan, and Hong Kong as national government orgs & add comments with name of every national government to import code
- 64b0b96 - (Mark Boyd) more documentation updates
- d67b8bd - (Mark Boyd) add high water approach to project import
- 2cf478f - (Simon) Initial attempt at checking for s. changes and directing where to go
- d9bc8d8 - (Mark Boyd) update documentation
- 217df05 - (Mark Boyd) update import documentation
- 5531f95 - (Mark Boyd) add support for "all" parameter to process all records for flow import, regardless of high water
- 320111c - (Mark Boyd) add ability to specify high water date for flow import as an argument
- 6b48f87 - (Simon) [WIP] Update flow or create new version based on substantive changes and error correction
- a445b92 - (Mark Boyd) integrate highWater with flow import & add help for returning highWater for any job
- 7d31823 - (Tim Martin) Modified internal logic to check for exact ID count and match
- 2a60695 - (Mark Boyd) add database storage for high water information about data import jobs
- 1a346f3 - (Simon) Check for empty Child links
- 69ecea0 - (Simon) Clean up created and updated activities fetching
- 3517632 - (Simon) [WIP] Start checking for substantive changes on the back-end
- 6bc4afb - (Simon) Fix some validations things for back-end use
- 992bdda - (Tim Martin) Switched country summary funding by plan to use Solr
- 69d17d5 - (Tim Martin) Switched country summary snapshot to use Solr for query
- 1d6cc79 - (Tim Martin) Merged in task/HPC-2195-flow-status-checks-for-date (pull request #605)
Task/hpc 2195 flow status checks for date
Add validations
- 8dc6c55 - (Simon) add a validation for flow date
- 3a40871 - (Simon) Don't recompile the validations libraries
- 48bc2e9 - (Simon) Remove console.log
- d33d8ef - (Simon) Add validations
- b3e8edc - (Tim Martin) Merged in feature/add-JSCS (pull request #603)
Added JSCS config file
- 5ec42c8 - (Tim Martin) Added JSCS config file
- d2e99dc - (Tim Martin) Added formatting
- 8a0a8e6 - (Tim Martin) Merged in feature/HPC-2149-add-legacy-Serbia-location (pull request #602)
HPC-2149 - Add "Serbia and Montenegro (2006-2009)" location
- 050980c - (Tim Martin) Merged in task/HPC-1421-child-flows-update-parent-destinations (pull request #600)
Break out spawnCreateOrUpdateActivity for reuse, and reuse it.
- 8afb9c6 - (Tim Martin) Merged in change/HPC-2058-emergencies-remove-hardcoded-module (pull request #598)
Add check for parameters on emergencies
- c1b6215 - (Mark Boyd) remove logging on locations that were not updated by cron job
- d4ff7b1 - (Mark Boyd) Merged in code-style-fix (pull request #601)
remove debugger statements
- 56edd11 - (Mark Boyd) remove debugger statements
- 8af7f81 - (Mark Boyd) Merged in bug/HPC-1676-superseded-OCT-flows (pull request #599)
Fix bug setting version end date on superseded OCT flows
- 8241935 - (Simon) Break out spawnCrateOrUpdateActivity for its own reuse
- b967c91 - (Tim Martin) Switched plan summary by field cluster to use Solr for funding totals
- 810b7d8 - (Mark Boyd) fix bug setting version end date on superseded OCT flows
- 9a910d6 - (Simon) Add check for parameters on emergencies
- 8365895 - (Mark Boyd) add required seeding for custom locations & adjust locations cron job to not delete non-updated records
- db8f001 - (Tim Martin) Merged in feature/HPC-2197-add-all-fields-solr (pull request #596)
Feature/hpc 2197 add all fields solr
Add "Inside plan" category to OCT flows if certain conditions are met
Added flow validations to server, provided endflow for it.
Add planIndicated category group & add "Inside plan" category to EDRIS flows when CAP = Y
- 600ee93 - (Tim Martin) Added updatedAt field
- 265e54a - (Tim Martin) Added updatedAt field.
- 8e046f9 - (Mark Boyd) add "Inside plan" category to OCT flows if certain conditions are met
- 8b0eb93 - (Simon) Added flow validations to server, provided endflow for it.
- 658d98c - (Mark Boyd) add planIndicated category group & add "Inside plan" category to EDRIS flows when CAP = Y
- 39b155d - (Mark Boyd) Merged in bug/HPC-2093-remove-extra-report-details (pull request #592)
Debugging removal of extra report details
- 5990ae8 - (Mark Boyd) move function to remove extra report details to later in callback chain & remove debugging code
- 24d7b1d - (Mark Boyd) debugging removal of extra report details
- b9e9e46 - (Mark Boyd) Merged in revert/HPC-2093-report-details (pull request #591)
remove code to delete extra report details for flows
- d46398e - (Mark Boyd) remove code to delete extra report details for flows
- 17016f4 - (Mark Boyd) Merged in feature/HPC-2141-add-new-recipients (pull request #590)
Use new recipients from transformation table
- 9995787 - (Mark Boyd) change logic to use only single new destinatino organization from transformation table
- 33ff3d1 - (Mark Boyd) Merged in bug/flow-import-issues (pull request #589)
Fix faulty logic for creating new versions of legacy flows
- 98e5045 - (Mark Boyd) uncomment basic flows import
- 353d5c6 - (Mark Boyd) fix faulty logic for creating new versions of legacy flows
- 0673000 - (Tim Martin) Merged in bug/HPC-1863-created-by-user (pull request #584)
Add better createdAt rules
- f18fa61 - (Simon) Try again to fix this
- 23dbaa6 - (Simon Vansintjan) Merged in HPC-2191-fix-dates-and-display-for-both- (pull request #588)
Added plan reporting period for indicatorGoals to fetch dates
- f6e83c0 - (Ali Raza) Added plan reporting period for indicatorGoals to fetch dates
- 9863237 - (Simon) Remove console.log statements
- d69469e - (Simon) Merge conflicts
- 9ef6ded - (Tim Martin) Merged in feature/HPC-2098-country-summary-update (pull request #587)
Modified config to support new Solr URL
- 8fdcea8 - (Tim Martin) Modified config to support new Solr URL
- 11ff4bf - (Tim Martin) Merged in feature/HPC-2098-country-summary-update (pull request #586)
HPC-2098: Country summary updates
- 43321a3 - (Tim Martin) Removed console.log
- 9f9b0ab - (Tim Martin) Removed console.log
- 242c6e0 - (Tim Martin) Formatting
- eaa41e3 - (Tim Martin) Merged in bug/HPC-1443-create-activity-properly-when-rejecting-flows (pull request #582)
Spawn an activity when a flow gets bulk updated to rejected.
- 44b5ff6 - (Tim Martin) Added last updated to plan overview trends Added logic to filter by national government for country summary sources
- b22c290 - (Mark Boyd) Merged in bug/HPC-2130-emergency-locations (pull request #585)
Prevent early callback when attaching emergency locations
- b84c2ab - (Mark Boyd) prevent early callback when attaching emergency locations
- 32ec566 - (Simon Vansintjan) Merged develop into bug/HPC-1863-created-by-user
- 5f0ad91 - (Mark Boyd) Merged in bug/HPC-1687-OCT-dest-usage-year (pull request #581)
Fix bug when setting destination usage year for OCT flows
add ability to specify custom date ranges for OCT import
- 39c9afd - (Mark Boyd) add ability to specify custom date ranges for OCT import
- 8a725f0 - (Simon) On flow update create an activity to indicate the flow has been updated with a rejection
- ece67ba - (Simon) Limit createdStream results by code: created and spacing
- 8f0adab - (Simon) Whitespace and a TODO for future us
- 3aeb46f - (Mark Boyd) simplify code for procesing and using OCT record fiscal year date
- 90a75aa - (Mark Boyd) remove console logs
- f9deeb7 - (Mark Boyd) fix bug when setting destinatino usage year for OCT flows
- ef6bcb6 - (Tim Martin) Merged in feature/HPC-1832-homepage-contributions (pull request #580)
Fixed issue with response format
- cd9d304 - (Tim Martin) Fixed issue with response format
- b0f3ad9 - (Mark Boyd) add new recipients from contribution transform table as destination organizations, if they exist
- 9a83eae - (Tim Martin) Merged in bug/HPC-2140-exclude-bilateral-org (pull request #579)
Exclude bilateral org (ID 5384) from import
Correct handling for special collective organizations as flow destinations
- 4a93f1a - (Mark Boyd) exclude bilateral org (ID 5384) from import
- 50dfcde - (Mark Boyd) correct handling for special collective organizations as flow destinations
- 98368ea - (Tim Martin) Merged in feature/HPC-2097-donor-overview-changes (pull request #577)
Feature/hpc 2097 donor overview changes
- fd2dad5 - (Tim Martin) Added logic to include European commission
- d9c86e1 - (Tim Martin) Added national government filter to query
- cc671cf - (Tim Martin) Merged in feature/HPC-2030-homepage-map (pull request #576)
Added iso3 code to endpoint
- 76d9c50 - (Tim Martin) Added iso3 code to endpoint
- 6276b36 - (Tim Martin) Merged in feature/HPC-1832-homepage-contributions (pull request #575)
Feature/hpc 1832 homepage contributions
- d117f37 - (Tim Martin) Added flowStatus to Solr docs
- 1f4a792 - (Tim Martin) Added comment
- 9c1565f - (Tim Martin) Added logic to show month total
- f90a40b - (Tim Martin) Merged in feature/HPC-1832-homepage-contributions (pull request #574)
Added month to flow index data
- dc6f55c - (Tim Martin) Added month to flow index data
- 9952daf - (Tim Martin) Merged in feature/HPC-2126-add-project-solr (pull request #572)
Removed required for amountUSD
- 62204ed - (Tim Martin) Merged in feature/HPC-2093-remove-duplicate-report-details (pull request #573)
Remove reportDetails that are no longer valid
- a3082fc - (Tim Martin) Added additional logic for Solr plan import
- 9f0286d - (Mark Boyd) remove commented line
- 0f772bf - (Tim Martin) Removed required for amountUSD
- 9348c63 - (Tim Martin) Merged in feature/HPC-2126-add-project-solr (pull request #571)
Feature/hpc 2126 add project solr
- bd80df3 - (Tim Martin) Removed temp code
- 7f96d92 - (Tim Martin) Added comment
- ee8ec40 - (Tim Martin) Added project import to soar
- 2d708f4 - (Tim Martin) Added schema changes
- fc2864e - (Tim Martin) Merged in feature/HPC-2108-appeal-summary-trends (pull request #570)
Feature/hpc 2108 appeal summary trends
- 15430ae - (Tim Martin) Removed comments
- 509d5a2 - (Tim Martin) Added logic to use Solr queries
- 39a0e39 - (Mark Boyd) remove reportDetails that are no longer valid
- 62e9972 - (Tim Martin) Merged in change/HPC-1996-query-limit-for-plans (pull request #569)
Change/hpc 1996 query limit for plans
- 4d277c7 - (Simon) Endpoints updated to query limit based on selected Plan
- 961bec6 - (Tim Martin) Merged in feature/HPC-1842-country-summary-update (pull request #568)
Added destination emergency count
- c57bc89 - (Tim Martin) Added destination emergency count
- 6962f74 - (Tim Martin) Updated beneficiaryGroup field name
- 2993909 - (Simon) Add better createdAt rules
- d9ffc94 - (Tim Martin) Merged in feature/HPC-2100-add-solr-fields (pull request #567)
Updated import logic and schema changes
- f5fd7db - (Tim Martin) Updated import logic and schema changes
- 36d2108 - (Mark Boyd) Merged in minor-bug-fixes (pull request #566)
Fix minor bug in OCT import with passing moment dates to sequelize query
- 77e320f - (Mark Boyd) rename date variables for clarity
- 045bf46 - (Mark Boyd) fix minor bug in OCT import with passing moment dates to sequelize query
- d684c7c - (Tim Martin) Merged in feature/oct-attach-data (pull request #565)
Attach more flow data and flow objects to OCT flows
- fec3cca - (Mark Boyd) add log message if there is no OCT data to process
- ea73d29 - (Mark Boyd) add processing of cancellations for OCT flows
- f0333d1 - (Mark Boyd) adjusting flow object creation to avoid deleting flow objects
- 93c8d38 - (Tim Martin) Merged in feature/HPC-1831-homepage-map (pull request #564)
Added logic to show European Commission and its location coordinates
- 620a2d8 - (Tim Martin) Added logic to show European Commission and its location coordinates
- fe3875a - (Mark Boyd) add handling if flowStatus is empty
- ff6db94 - (Mark Boyd) add more logic to store unmatched data for exact text strings
- 4c5870a - (Mark Boyd) HPC-2060: add flow description
- 00446ac - (Mark Boyd) fix various code errors
- 0e0f0fa - (Mark Boyd) add handlers for creating flow objects and external data
- 1a7146c - (Mark Boyd) add rules for organization and location source objects & add inline documentation
- c5f26e3 - (Mark Boyd) fix error with query for global clusters
- 96ec24c - (Mark Boyd) add more searching for flow objects
- 97bfaba - (Mark Boyd) add more logic for determining other objects based on matched projects
- 204a70d - (Simon) Start initial work in being able to query limit the API for objects
- f629e1a - (Mark Boyd) correct date querying logic for matched projects and emergneices, add query for matched plans
- 7782889 - (Mark Boyd) adding more to set destination objects based on matched project
- 82cf2a0 - (Mark Boyd) add initial logic for finding projects and emergencies
- 9f56b38 - (Vincent Perrin) Updated version to 0.9.0
- 2c74130 - (Tim Martin) Merged in feature/HPC-1831-homepage-map (pull request #563)
Changed homepage map endpoint to use Solr for data source
- bcc9f33 - (Tim Martin) Changed homepage map endpoint to use Solr for data source Added logic to filter organizations by orgType of 'National government'
- b003a15 - (Tim Martin) Merged in feature/HPC-1721-plan-overview-global-cluster (pull request #562)
Feature/hpc 1721 plan overview global cluster
- a03fd16 - (Tim Martin) Removed commented code and unnecessary variables
- cd5f2d6 - (Tim Martin) Added totals for other funding
- f73e772 - (Tim Martin) Merged in feature/HPC-1842-country-summary-update (pull request #561)
Modified country summary snapshot to use source organizations for pooled funds amount
- 3a8c7fb - (Tim Martin) Modified country summary snapshot to use source organizations for pooled funds amount
- efdc0e9 - (Tim Martin) Added Solr logic to plan overview
- 2a2b81d - (Tim Martin) Merged in feature/HPC-1721-plan-overview-global-cluster (pull request #560)
Feature/hpc 1721 plan overview global cluster
- 4048251 - (Tim Martin) Switched endpoint to direct database query
- e4375a6 - (Tim Martin) Updated docker dev config to use HR.info test API
- c0a094c - (Tim Martin) Updated solr schema file
- 79aaa53 - (Tim Martin) Updated Solr import to include globalClusters
- aa7eb82 - (Mark Boyd) Merged in feature/HPC-2096-include-misc-projects (pull request #559)
Remove condition excluding projects connected miscelleanous emergencies (type ID = 30)
- 62f4bdb - (Mark Boyd) remove condition excluding projects connected miscelleanous emergencies (type ID = 30)
- dcdda33 - (Tim Martin) Added dynamic Solr fields
- 63fdf16 - (Tim Martin) Merged in feature/HPC-1837-global-overview-trends (pull request #558)
Added flow object behavior (single) to Solr query
- 54104e6 - (Tim Martin) Added flow object behavior (single) to Solr query
- 0e34479 - (Tim Martin) Merged in feature/HPC-1837-global-overview-trends (pull request #557)
Added Solr query logic for global overview trends endpoint
- 5e3cd12 - (Tim Martin) Merge branches 'feature/HPC-1837-global-overview-trends' and 'develop' of bitbucket.org:phase2tech/hpc_service into feature/HPC-1837-global-overview-trends
- 0fefc31 - (Tim Martin) Added Solr query logic for global overview trends endpoint
- df394d5 - (Tim Martin) Merged in feature/HPC-1837-global-overview-trends (pull request #556)
Added logic to group by year instead of querying for each year
- bebe91d - (Tim Martin) Added logic to group by year instead of querying for each year
- 7ad7e7a - (Tim Martin) Merged in feature/HPC-1837-global-overview-trends (pull request #555)
Added filter for plan includeTotals
- ca2f590 - (Tim Martin) Added filter for plan includeTotals
- d65bfab - (Tim Martin) Merged in feature/HPC-1837-global-overview-trends (pull request #554)
Removed console logs
- 60230e3 - (Tim Martin) Removed console logs
- bfd4906 - (Tim Martin) Merged in feature/HPC-1837-global-overview-trends (pull request #553)
HPC-1837: global overview trends
- 8f44483 - (Tim Martin) Added new query to increase performance
- 2473ee9 - (Tim Martin) Merged in feature/HPC-1840-plan-summary-cluster (pull request #552)
Added data object to the response
Improve control flow when setting plan emergencies
- c8a8466 - (Tim Martin) Added data object to the response
- 790935f - (Tim Martin) Added global overview trends
- 5f1c516 - (Mark Boyd) improve control flow when setting plan emergencies
- 4e6b1a9 - (Mark Boyd) Merged in bug/flow-import-early-return (pull request #550)
Fix bug with early return callback for flow import
- 1f70de0 - (Mark Boyd) fix bug with early return callback for flow import
- 94fb5d0 - (Tim Martin) Merged in feature/HPC-1840-plan-summary-cluster (pull request #549)
Feature/hpc 1840 plan summary cluster
- 3e79700 - (Tim Martin) Added additional zero amounts
- 914e34c - (Tim Martin) Added zero amounts for refugee totals
- 9e93268 - (Tim Martin) Merged in feature/HPC-1840-plan-summary-cluster (pull request #548)
HPC-1840: plan summary cluster
- 2141bd6 - (Tim Martin) Added additional logic for refugee totals
- d3d73ad - (Tim Martin) Merged in bug/flow-import-callbacks (pull request #547)
Fix flow import callbacks to avoid undefined errors
- e0c65e5 - (Mark Boyd) fix flow import callbacks to avoid undefined errors
- 3583325 - (Tim Martin) Added logic for filtering by responseType
- 5a4e4be - (Tim Martin) Merged in bug/fix-category-import-duplication (pull request #546)
Fix ategory import duplication
- 4d2aa75 - (Mark Boyd) change categoryLegacy model to allow multiple legacy IDs associated to same category ID
- ad02335 - (Mark Boyd) add checks for legacy data
- 37196ca - (Tim Martin) Added unmet requirements and funding share
- a95f467 - (Mark Boyd) fix logic to check for categories by legacy ID and name/group to avoid duplication
- 7398bfc - (Tim Martin) Merged in feature/HPC-1676-supersede-pending-flows (pull request #545)
HPC-1676: Supersede existing pending flows
- 0c04cdf - (Mark Boyd) add helper function for creating external reference records
- d5ac448 - (Tim Martin) Added funding share
- 30d3774 - (Mark Boyd) add logic to supersede existing pending flow when new pending flow data is retrieved
- 7eb8bea - (Tim Martin) Merged in feature/HPC-1817-plan-overview-updates (pull request #544)
HPC-1817: plan overview updates
HPC-2076: Remove "Government of" label from palestinian govt org
HPC-2044: Add "National government" category to government orgs
- 3664661 - (Tim Martin) Added logic to filter include totals for specified endpoints
- a311ec6 - (Mark Boyd) remove "Government of" label from palestinian govt org
- ec18254 - (Mark Boyd) minor code style update
- 1f2d4ef - (Tim Martin) Added includeTotals logic
- a4df792 - (Tim Martin) Added plan overview global cluster
- 5c02ff6 - (Mark Boyd) change series to parallel processing
- 4fb1f1c - (Mark Boyd) add National government category and apply to government organizations on import
- e6c193c - (Vincent Perrin) changed version number to 0.8.7 in package.json
- 9dac44e - (Ali Raza) version bumped in package.json
- ec95657 - (Vincent Perrin) Merged in vincentp/HPC-2067-second-monitoring-period-in-mai (pull request #541)
HPC-2067
- abe46ca - (Vincent Perrin) HPC-2067 clean up
- 0d844eb - (Vincent Perrin) finalized state engine draft 1
- b6ca3a9 - (Mark Boyd) Revert "add National government category and apply to government organizations on import"
This reverts commit 4fb1f1c568a21fec8077e92e376e6d5e0f1bf3d3.
- a33ec2e - (Mark Boyd) add National government category and apply to government organizations on import
- 8c5eead - (Tim Martin) Merged in feature/HPC-1721-plan-overview-global-cluster (pull request #540)
HPC-1721: Plan overview global cluster
- 0c8467b - (Tim Martin) Added additional logic for plan overview by global cluster
- a1e7ed2 - (Tim Martin) Merged in feature/HPC-2028-child-source-objects (pull request #538)
HPC-2028: Set child flow source objects equal to parent destination flow objects during import
HPC-2029: Exclude RRP detail appeals from plan migration
- 69c22fc - (Mark Boyd) exclude RRP detail appeals from plan migration
- fa1ba54 - (Mark Boyd) make sure to pass error through callback
- c031b02 - (Mark Boyd) change async series to parallel processing
- 7894109 - (Mark Boyd) fix bug with flowObject destroy helper passing on result as error value
- a34ec4e - (Vincent Perrin) work in progress
- f5556a2 - (Vincent Perrin) Improved plan state save and added saving of planReporting Period
- 7fe20b5 - (Tim Martin) Added plan overview by global cluster endpoint
- 50c16e3 - (Mark Boyd) fix extraneous data logging, still need some more testing
- 5232b38 - (Mark Boyd) add logic to prevent linked flows from creating their own source objects
- eb215ab - (Mark Boyd) create function to set sources for child flows based on destinations for parked flows
- 8f6426f - (Tim Martin) Merged in feature/HPC-1562-appeal-summary-snapshot (pull request #537)
Added logic to filter plans by full location match
- 9ac4040 - (Tim Martin) Added logic to filter plans by full location match
- ed1b582 - (Mark Boyd) Merged in oct-import-logging (pull request #536)
Added informational logging to OCT import job
- 2adb6b6 - (Mark Boyd) added informational logging to OCT import job
- 28a6a08 - (Tim Martin) Merged in feature/OCT-fix-project-query (pull request #534)
Specify attributes for included models on project find in OCT import to avoid triggering sequelize bug
- 866c2ab - (Vincent Perrin) temp
- 26bcfd4 - (Mark Boyd) change series to parallel
- 7b5c028 - (Mark Boyd) specify attributes for included models on project find in OCT import to avoid triggering sequelize bug
- bffe94c - (Tim Martin) Merged in feature/HPC-1562-fix-overall-funding (pull request #533)
Added destination to plan years for overall funding
- a23161c - (Tim Martin) Added destination to plan years for overall funding
- f329205 - (Tim Martin) Merged in feature/HPC-1839-funding-trends-inside-plan (pull request #532)
Added additional logic for plan trend funding
- 25685d8 - (Tim Martin) Added additional logic for plan trend funding
- 5b0a4cf - (Tim Martin) Merged in feature/HPC-1839-funding-trends-inside-plan (pull request #531)
Modified plan summary trends query to use location for year trends
OCT import improvements
- 7e18f29 - (Tim Martin) Modified plan summary trends query to use location for year trends
- d530fd1 - (Mark Boyd) remove logging
- 6834ccd - (Mark Boyd) add logic to prevent duplicate processing of OCT records
- 169f6ac - (Vincent Perrin) Seeding default plan statuses and using as default values for backward compatibility
- 84a9ace - (Tim Martin) Merged in feature/HPC-1860-restricted-indicator (pull request #529)
HPC-1860: Update logic for plan and emergency active and restricted indicators
HPC-2026: Update logic for associating year objects with plans
Initial work to create pending flows from OCT data (HPC-1681, HPC-1682, HPC-1683, HPC-1684, HPC-1686)
- 7167a6d - (Mark Boyd) update logic for plan and emergency active and restricted indicators
- 3cf07ea - (Mark Boyd) update logic for associating year objects with plans
- dc0c4f8 - (Vincent Perrin) getting and saving planStateId
- 2e58ccd - (Vincent Perrin) added plan state default table and migration for plan table
- 3bf9355 - (Mark Boyd) remove debugging statements
- c8db6b2 - (Mark Boyd) uncomment edris import
- 29d4946 - (Mark Boyd) HPC-1684: add report details to OCT flows
- 4e71635 - (Mark Boyd) testing logic for additional OCT pending flow versions
- ec2764a - (Mark Boyd) HPC-1682: add categories for OCT flows
- cb9c64c - (Tim Martin) Merged in change/HPC-1878-inactive-bypass (pull request #526)
Add tests to test whether inactive reason cancelled works.
- 2df956b - (Vincent Perrin) HPC-2062 creation of new tables and relations
- ff1b557 - (Vincent Perrin) HPC-2062 creation of new tables and relations
- 60747eb - (Simon) Fix conflicts
- cc8269f - (Simon) Add first few tests for flow endpoints
- dbe21cb - (Simon) Add seed data for inactiveReason categories
- 0ac8e9e - (Simon) Add commenting to controllers/flow.js for updating
- 9ad7f01 - (Simon) Update instructions on how to run test suite
- 6192457 - (Mark Boyd) debugging oct data project query
- ff52cdb - (Tim Martin) Merged in feature/HPC-1839-funding-trends-inside-plan (pull request #525)
Added funding trends inside/outside plan
- d0600ad - (Tim Martin) Added funding trends inside/outside plan
- 94d5485 - (Mark Boyd) HPC-1686: add logic for creating notes data
- e3a61cd - (Mark Boyd) first pass at logic for finding projects associated with oct records
- c02abf1 - (Mark Boyd) HPC-1682: adding more flow level data to import
- 88f2324 - (Vincent Perrin) changed authentication URL (authBaseUrl) to reflect changes onthe new NodeJS container.
- 1f7ccad - (Mark Boyd) cleanup and removing unnecessary logging
- 263160b - (Mark Boyd) fix errors in import
- b55f8a6 - (Vincent Perrin) Merged in vincentp/HPC-2055-regression-on-webcontent (pull request #524)
HPC-2055 plus eTag mgmt simplification
- c7be0e6 - (Mark Boyd) debugging models not being loaded
- c0d5935 - (Vincent Perrin) HPC-2055 plus eTag mgmt simplification
- a91c4fd - (Tim Martin) Merged in task/HPC-2027-validation-library (pull request #523)
Add scope to fetch categories as well
- a720cff - (Simon) Add scope to fetch categories as well
- 0cf12e0 - (Tim Martin) Merged in feature/HPC-1994-add-solr-customlocation (pull request #522)
Feature/hpc 1994 add solr customlocation
- 79794ab - (Tim Martin) Removed async
- d0add16 - (Tim Martin) Added logic for customLocations for plans
- b9c88be - (Tim Martin) Merged in feature/HPC-1839-plan-summary-trends (pull request #521)
Feature/hpc 1839 plan summary trends
- 9a2d33e - (Tim Martin) Removed console log
- b3f7767 - (Tim Martin) Added requirements by year
- 2209242 - (Tim Martin) Merged in feature/HPC-1832-homepage-contributions (pull request #520)
Added overall funding
- dea3f27 - (Tim Martin) Added overall funding
- 7df7433 - (Tim Martin) Merged in bug/HPC-1863-created-by-user (pull request #518)
Add fetching of the created by activity
Vincentp/hpc 2000 plan and cluster split
- 2190ec6 - (Vincent Perrin) HPC-1999 separated cluster entities from plan entities, fixed a bug on cluster activity creation
- 53aa69f - (Simon) Remove log
- 9316624 - (Simon) Add fetching of the created by activity
- 3a1414a - (Vincent Perrin) organized monitoring routing and controllers
- 83a78e0 - (Vincent Perrin) HPC-1974 removed unnecessary cluster data and else from plan
- f3dff09 - (Mark Boyd) initial pass at creating flows from OCT data, still need to debug flows not getting created
- ce1b6d3 - (Vincent Perrin) HPC-1501 completed with final facto and bug fixes
- b582a44 - (Tim Martin) Merged in feature/HPC-1832-homepage-contributions (pull request #517)
Modified global totals logic
- b4907a1 - (Tim Martin) Modified global totals logic
- abaeaf3 - (Tim Martin) Merged in feature/HPC-1832-homepage-contributions (pull request #516)
Added logic for funding sums for all years
- 4d123e6 - (Tim Martin) Added logic for funding sums for all years
- 6d33865 - (Tim Martin) Merged in feature/HPC-1832-homepage-contributions (pull request #515)
Changed the total requirements calculation
- 2766dc8 - (Tim Martin) Changed the total requirements calculation
- dc6823a - (Tim Martin) Merged in feature/HPC-1832-homepage-contributions (pull request #514)
Feature/hpc 1832 homepage contributions
- 55abed1 - (Tim Martin) Removed auth requirements for legacy endpoints
- 1561567 - (Tim Martin) Added homepage contribution endpoint
- 2f896e6 - (Tim Martin) Merged in feature/HPC-1966-solr-changes (pull request #513)
Changed solr config
- 4923207 - (Tim Martin) Changed solr config
- dba1251 - (Tim Martin) Merged in feature/HPC-1831-homepage-map (pull request #512)
Fixed issue with nested locations
- 39c8d63 - (Tim Martin) Fixed issue with nested locations
- b12e645 - (Vincent Perrin) HPC-1501 Endpoint for cluster details working. To finalize. Bugs with caseload.
- b856d65 - (Tim Martin) Merged in feature/HPC-1568-plan-types-flag (pull request #511)
HPC-1568 - Add includeTotals flag for categories & migrate values into it
- e380f4a - (Mark Boyd) add includeTotals flag for categories & migrate values into it
- ced726d - (Tim Martin) Merged in feature/HPC-1831-homepage-map (pull request #510)
Fixed issue with longitude on location
- 8c52aaa - (Tim Martin) Fixed issue with longitude on location
- 9930a1e - (Tim Martin) Merged in feature/HPC-1831-homepage-map (pull request #509)
Feature/hpc 1831 homepage map
- 166c556 - (Tim Martin) Added logic for plan requirements totaling for alternative plan costing
- 51cf12f - (Tim Martin) Added homepage map endpoint Added new logic for alternative plan costing
- 7ae9e7b - (Tim Martin) Merged in feature/HPC-1669-process-oct-feed (pull request #508)
HPC-1669: Requeset and process OCT XML feed
- f41208e - (Mark Boyd) finish initial implementation of reading and parsing OCT XML data from external endpoint
- 0cfe6ab - (Mark Boyd) initial setup of OCT import script
- 34a1017 - (Mark Boyd) Merged in feature/HPC-2014-project-clusters (pull request #506)
HPC-2014 - Ensure project cluster legacy IDs are looked up correctly
- bd41e8f - (Mark Boyd) ensure project cluster legacy IDs are looked up correctly
- a08b03f - (Vincent Perrin) HPC-1501 first step
- 7d9abd9 - (Vincent Perrin) HPC-1503 addapted getPlan
- 6b19f28 - (Vincent Perrin) .
- f1c09f8 - (Vincent Perrin) HPC-1797 improved and fixed endpoint for plan web content
- fc7d2d9 - (Tim Martin) Added solr docker-compose file
- fcd81aa - (Tim Martin) Merged in feature/HPC-1834-global-overview-location (pull request #505)
Fixed issue with pooled funds
- f341a99 - (Tim Martin) Fixed issue with pooled funds
- 8a84dbc - (Mark Boyd) Merged in feature/HPC-1720-project-global-clusters (pull request #504)
HPC-1720: Add more logic to ensure project instance exists on project update
- b8bcc61 - (Mark Boyd) remove debugging code
- c5208a9 - (Mark Boyd) add more logic to ensure project instance exists on project update
- 0a5b231 - (Tim Martin) Merged in feature/HPC-1834-global-overview-location (pull request #503)
Fixed issue with other_funding totals
- 0759300 - (Tim Martin) Fixed issue with other_funding totals
- d40de11 - (Vincent Perrin) fixed save cluster webcontent endpoint
- 4eb162a - (Vincent Perrin) fixed save cluster webcontent endpoint
- 3d22ac9 - (Tim Martin) Merged in feature/HPC-1834-global-overview-location (pull request #502)
Feature/hpc 1834 global overview location
- 5ae5f8a - (Tim Martin) Updated flow query to include flow status
- 0b6482f - (Tim Martin) Merged in feature/HPC-1720-project-global-clusters (pull request #501)
HPC-1720: Add import for attaching global clusters to project
- 0994f57 - (Mark Boyd) fix error with duplicate global clusters & count query for projects import
- 3cfa752 - (Tim Martin) Merged in change/HPC-1806-add-restricted-column-to-plan (pull request #500)
Add restricted column to emergency and migration
- a66d2af - (Simon) Add restricted column to emergency and migration
- 5f81cb4 - (Tim Martin) Merged in task/HPC-1440-show-source-or-destination-org (pull request #498)
Show source and destination direction and nested objects for each flow
- 03b6e2f - (Mark Boyd) add code to associate global clusters with projects & add global clusters to project controllers for output
- 981c0d4 - (Simon) Merge conflicts
- 88e9131 - (Tim Martin) Added getGlobalOverviewByObject
- 3d9c7dc - (Tim Martin) Merged in feature/HPC-1833-global-overview-snapshot (pull request #499)
Added global overview snapshot
- 2779505 - (Tim Martin) Merged in change/HPC-1430-pass-more-data-for-flow-objects (pull request #496)
Add more information for parent & child flow objects
HPC-1442 - Add organization ID 15446 to list of organizations to be excluded during import
- e8d9c0a - (Tim Martin) Added global overview snapshot
- 0fa14cd - (Simon) Add refdirection for nested objects
- 164d2d7 - (Simon) Add scope to models.findAll that is built based on objectType
- 4bd1d28 - (Tim Martin) Modified solr import
- 84f4e21 - (Mark Boyd) add fields for project and global clusters to projects import
- 3b76f7e - (Mark Boyd) add organization ID 15446 to list of organizations to be excluded during import
- c233e0f - (Simon) Add more information for parent & child flow objects
- f0ed01b - (Tim Martin) Merged in feature/HPC-1848-country-summary-pooled-funds (pull request #495)
changed totalFunding to total_funding
- 4c2850d - (Tim Martin) changed totalFunding to total_funding removed limit as path parameter and made it a query param
- f6d6efb - (Tim Martin) Merged in feature/HPC-1848-country-summary-pooled-funds (pull request #494)
Added pooled funds and related plans endpoints
- a9e4fc6 - (Tim Martin) Added pooled funds and related plans endpoints
- e02c780 - (Tim Martin) Merged in feature/HPC-1848-country-summary-plans (pull request #493)
Added country summary by plans endpoint
- e740d74 - (Tim Martin) Added country summary by plans endpoint
- 99cb360 - (Tim Martin) Merged in change/HPC-1806-add-restricted-column-to-plan (pull request #492)
Change/hpc 1806 add restricted column to plan
- 19f8622 - (Simon) Remove default value
- 492d096 - (Simon) Add restricted column to plan
- 8fc3bc1 - (Simon) Write migration to add restricted column
- 18230ed - (Tim Martin) Merged in feature/HPC-1846-country-summary-UN-recipients (pull request #491)
Feature/hpc 1846 country summary un recipients
- 7243eca - (Tim Martin) Changed endpoint parameter to query string
- 51c3201 - (Vincent Perrin) HPC-1797 added the get cluster endpoint
- 91f9f0d - (Vincent Perrin) HPC-1503 added the get cluster endpoint
- 7be12eb - (Vincent Perrin) HPC-1503 rooting and methods, first step
- 0051783 - (Tim Martin) Added endpoint for funding by orgs
- 049fec4 - (Tim Martin) Merged in feature/HPC-1845-country-summary-cluster (pull request #490)
Feature/hpc 1845 country summary cluster
- faf3b1d - (Tim Martin) Added endpoint
- 584a8d0 - (Tim Martin) Added endpoint for country summary funding by object
- f4ee152 - (Tim Martin) Merged in feature/HPC-1844-country-summary-source-org (pull request #489)
Added logic to group by parent organizations
- 18f89b4 - (Tim Martin) Removed console logs
- 0e0969a - (Tim Martin) Added logic to group by parent organizations
- fc4b1a8 - (Tim Martin) Merged in feature/HPC-1844-country-summary-source-org (pull request #488)
Feature/hpc 1844 country summary source org
- 0766715 - (Tim Martin) Added endpoint for boundary report
- 4d97f8e - (Tim Martin) Added country summary sources endpoint
- fc95e58 - (Tim Martin) Merged in feature/HPC-1843-country-summary-trends (pull request #487)
Added country summary trends endpoint
- 6799f08 - (Tim Martin) Added country summary trends endpoint
- 5a0fab9 - (Tim Martin) Merged in feature/HPC-1842-country-summary-snapshot (pull request #486)
Feature/hpc 1842 country summary snapshot
- 69fb6b9 - (Tim Martin) Added additional logic for country totals
- b7a7ab0 - (Tim Martin) Merged in feature/HPC-1782-project-refugee-indicator (pull request #485)
HPC-1782: Add "Refugee" response type category for certain projects
- fb1ca6f - (Mark Boyd) remove unnecessary code
- 848e880 - (Mark Boyd) add code to set responseType category for projects
- 3ced420 - (Mark Boyd) add association between projects and global clusters
- 0f84ac1 - (Mark Boyd) add responseType category group and add Refugee category to it
- 7ec8ae9 - (Tim Martin) Added country summary snapshot
- c69f45e - (Vincent Perrin) Merged in vincentp/HPC-1773-monitoring-cas-with-directive (pull request #484)
Vincentp/hpc 1773 monitoring cas with directive
- 20ee2c6 - (Vincent Perrin) corrected a few attributes, indenting and additional contition and debugging
- 4a52c6e - (Vincent Perrin) debugging
- 4f0f3bf - (Tim Martin) Merged in feature/HPC-1852-donor-summary-trends (pull request #483)
Added endpoint and function for getDonorSummaryFundingByObject
- 083830b - (Tim Martin) Added endpoint and function for getDonorSummaryFundingByObject
- 237753b - (Tim Martin) Merged in feature/HPC-1852-donor-summary-trends (pull request #482)
Added donor summary trends
- bee5a8c - (Tim Martin) Added donor summary trends
- d427ee5 - (Tim Martin) Merged in feature/HPC-1816-donor-summary-snapshot (pull request #481)
Added endpoint for external reference with no auth
- 940810c - (Tim Martin) Added endpoint for external reference with no auth
- 92b387b - (Tim Martin) Merged in feature/HPC-1816-donor-summary-snapshot (pull request #480)
Removed year from related plans
- a4fa872 - (Tim Martin) Removed year from related plans
- 25db80d - (Tim Martin) Merged in feature/HPC-1816-donor-summary-snapshot (pull request #479)
Changed monthly totals to zero based indexing
- 195e37a - (Tim Martin) Changed monthly totals to zero based indexing Updated monthly totals to show 0 amounts Fixed issue with error when organization is not found
- 22286c4 - (Ali Raza) Merged in bug/HPC-1814-fix-units-not-sending-from-api (pull request #466)
Add consistent scoping to core plan entities
- c0d468f - (Ali Raza) Merged develop into bug/HPC-1814-fix-units-not-sending-from-api
- c893e55 - (Tim Martin) Merged in feature/HPC-1852-donor-summary-trends (pull request #478)
Modified FTP details
- 93b31ec - (Tim Martin) Modified FTP details
- 4cfdcb1 - (Tim Martin) Merged in feature/HPC-1400-refactor-restricted-indicator (pull request #477)
Added first reported date to flow query
- 498c7a1 - (Tim Martin) Added first reported date to flow query
- eda3b90 - (Tim Martin) Merged in feature/HPC-1400-refactor-restricted-indicator (pull request #476)
Updated EDRIS FTP settings
- bda6fc3 - (Tim Martin) Updated EDRIS FTP settings
- bd8f936 - (Tim Martin) Merged in feature/HPC-1400-refactor-restricted-indicator (pull request #475)
Feature/hpc 1400 refactor restricted indicator
- 7f1140d - (Tim Martin) Modified logic to exclude restricted flows from flow queries
- 99bf8d6 - (Simon) Merge conflicts
- 25022c0 - (Tim Martin) Modified logic to set active status to true for restricted flows
- 0215d0b - (Ali Raza) Merged in bug/HPC-1717-add-location-to-seed-data (pull request #470)
add location to seed data, update README for new seeding steps
Change seed name for measurementType
Fixed issue with funding total parameters
- 0f39ccc - (Tim Martin) Fixed issue with funding total parameters
- 40331a5 - (Tim Martin) Removed restricted from categories
- 0264f29 - (Vincent Perrin) Merged in change/HPC-1820 (pull request #468) Make sure backend accepts cluster objectives as part of a cluster
- a8ec139 - (Simon) Change seed name for measurementType
- 947f7e8 - (Tim Martin) Merged in feature/HPC-1816-donor-summary-snapshot (pull request #472)
Added last updated to response
- 88cfed5 - (Tim Martin) Added last updated to response
- 765f5d3 - (Tim Martin) Merged in feature/HPC-1816-donor-summary-snapshot (pull request #471)
Feature/hpc 1816 donor summary snapshot
- 4337b18 - (Tim Martin) Added category option to flow object query Completed endpoint calculations
- 066e418 - (Vincent Perrin) updated version to v0.8.5
- 6eae82e - (Tim Martin) Added totals by month
- b83176f - (Simon) add location to seed data, update README for new seeding steps
- 2bc5193 - (Simon) Make sure backend accepts cluster objectives as part of a cluster
- 7bf7d99 - (Simon) Add consistent scoping to core plan entities
- 1aad068 - (Tim Martin) Added restricted field and migration logic
Fixed issue with flowObject groupings
- 90a44de - (Tim Martin) Fixed issue with flowObject groupings
- fe123f3 - (Vincent Perrin) Merged in simonv/HPC-1704-create-tests-for-cluster-activities (pull request #441)
Simonv/hpc 1704 create tests for cluster activities
- 31e2393 - (Vincent Perrin) Updated the readme for Jamine testing.
- 96a2323 - (Vincent Perrin) corrected a fit to an it
- d3012ca - (Vincent Perrin) merged
- a679244 - (Tim Martin) Merged in bug/fix-plan-overview-requirements (pull request #465)
Fixed issue with funding share
- 3700b2b - (Tim Martin) Fixed issue with funding share
- 349fcbb - (Tim Martin) Merged in bug/fix-plan-overview-requirements (pull request #464)
Fixed plan overview requirements totals
- 033fc51 - (Tim Martin) Fixed plan overview requirements totals
- 440b4d4 - (Vincent Perrin) Merged in simonv/HPC-1772-move-so-to-monitoring-form (pull request #462)
Take 2: now with working etags
Added paging to getAllOrganizations endpoint
- 2f0f93c - (Vincent Perrin) made a correction that was preventing some objects to be updated
- ce616ff - (Tim Martin) Added paging to getAllOrganizations endpoint
- f79aa7e - (Simon Vansintjan) Merged develop into simonv/HPC-1772-move-so-to-monitoring-form
- 4584937 - (Simon) Add some tests and update old tests
- a2fea2e - (Simon) Add note to add endpoints for goalMeasurement
- 40ec0ac - (Simon) Clean up error handling in ClusterObjectives controllers
- a59a534 - (Simon) Clean up debug, but keep debug function
- 9c6c6a9 - (Simon) Remove debug information and add etag check that doesnt rely on special data formatting
- 12874dc - (Simon) Switch plan monitoring to be update
- effb364 - (Simon) Clean up functions for singular indicator
- f880bd2 - (Tim Martin) Merged in feature/HPC-1735-donor-summary-snapshot (pull request #461)
Feature/hpc 1735 donor summary snapshot
- d108e67 - (Tim Martin) Fixed issue with plan overview trend requirements
- 239f6a6 - (Simon) Add endpoints that focus on updating the entire cluster
- 19b6857 - (Vincent Perrin) tracked down the eTag issue through the current implementation. Added tools for debugging.
- bd0f227 - (Ali Raza) Merged in vincentp/HPC-1786-record-plan-reporting-period (pull request #460)
Vincentp/hpc 1786 record plan reporting period
- 4d713bc - (Simon) Make planMonitoring endpoints for SO accept simpler data format
- b21dd20 - (Vincent Perrin) added a todo note about the dates on goalMeasurement that can be replaced by a reference to planReportingPeriod
- 69ca63d - (Vincent Perrin) HPC-1786 updated endpoint for using planReportPeriod
- 31ebcec - (Ali Raza) Merged in simonv/hpc-1751-endpoint-for-monitoring-cos (pull request #455)
Simonv/hpc 1751 endpoint for monitoring cos
- 8c18e2b - (Simon) Simplified scopes in planMonitoring
- 38d60e3 - (Tim Martin) Merged in simonv/HPC-1781-update-docker-env-scripts (pull request #458)
Create config for automated tests
- 09c0f1c - (Simon) Create config for automated tests
- 3e9f2ca - (Tim Martin) Added donor summary snapshot
- e9769fe - (Simon Vansintjan) Merged develop into simonv/hpc-1751-endpoint-for-monitoring-cos
- 2475da2 - (Simon) Fix tests to better handle empty values
- 19d456c - (Tim Martin) Merged in feature/HPC-1562-appeal-summary-snapshot (pull request #457)
Added new endpoints
- 85979eb - (Tim Martin) Added new endpoints
- d15c438 - (Simon) [WIP] Did some refactoring, need to make sure values get deleted
- 6e42f1e - (Simon) Add supertest as promised
- ab73138 - (Simon) Add bluebird
- 1dea6f1 - (Simon) Update tests to include PUT for just values
- ef2ad64 - (Simon) Add Jasmine back in to package.json
- cd01fd7 - (Simon) Undid changes to package.json
- 692aa72 - (Simon) Update readme with instructions for Jasmine test environment
- 65bb364 - (Simon) Add actual endpoint
- ad54c5a - (Simon) Add PUT endpoint for cluster objectives monitoring
- 0059603 - (Simon) Better whitespace in saver.js
- 6bc523c - (Simon) Add more in-depth scope options for corePlanEntityObjective
- 26c6c55 - (Simon) Move saveEntityMeasurements to lib file
- ae583b0 - (Tim Martin) Fixed issue with Solr import
- ce0349c - (Tim Martin) Merged in feature/HPC-1562-appeal-summary-snapshot (pull request #454)
Feature/hpc 1562 appeal summary snapshot
- 3bccf58 - (Tim Martin) Removed console logs
- 12cc216 - (Tim Martin) Added logic for new Solr fields
- bc65385 - (Tim Martin) Added Solr index file to repo
- 8635dfe - (Simon) Create GET endpoints and tests for cluster objectives monitoring
- 98fe652 - (Simon) Add jasmine to dev dependencies
- d41c4d0 - (Simon Vansintjan) Merged in simonv/hpc-1750-create-docker-compose-test (pull request #451)
Simonv/hpc 1750 create docker compose test
Added boundary fields
- ea9cea7 - (Tim Martin) Added boundary fields
- 16bfd80 - (Tim Martin) Merged in feature/HPC-1562-appeal-summary-snapshot (pull request #450)
Fixed issue with organizations
- de24aec - (Tim Martin) Fixed issue with organizations
- bf529b6 - (Simon Vansintjan) Merged in simonv/refactor-save (pull request #447)
Add commenting and better spacing to saver
- 53547bc - (Simon) changed 'update' str to create, cause it is a create log
- c9b6f43 - (Simon) Merge save
- c4e4fb0 - (Simon) Had to add docker-compose.yml to commit, otherwise it wouldn't be happy
- c6bba33 - (Simon) Working docker-compose-test.yml
- 5682aec - (Simon) Add docker compose test yaml
- 3bf2933 - (Simon) Add commenting and better spacing to saver
- 71648a0 - (Simon) Add comments to explain some changes
- 092bc75 - (Simon) Start writing down the monitoring test for planObjectives
- e264331 - (Simon) Add test outlines for clusters activities and objectives
- a3e759b - (Simon) Revert some temporary changes, add TODO comments, spacing fixes
- 641147f - (Simon) Add plan objectives test
- 2dec442 - (Vincent Perrin) upgraded version to 0.8.4
- 20871f3 - (Vincent Perrin) Merged in vincentp/HPC-1746-user-role-admin-unable-to-selec (pull request #453)
added the declaration of models so that this function can be called to retreive roles per user
- 2d9064e - (Vincent Perrin) added the declaration of models so that this function can be called to retreive roles per user
- 41007f5 - (Vincent Perrin) jshint cleaning
- a916fd5 - (Tim Martin) Merged in simonv/add-log-to-plan-lib (pull request #448)
Add log entry and meet JSHint lines
- 34a5b32 - (Simon) Meet jshint rules
- 80117f2 - (Tim Martin) Merged in simonv/HPC-1711-local-author-broken (pull request #446)
Change log warn because it's an error, not an info tidbit.
Add JSHint to hpc service
- 0415959 - (Simon Vansintjan) Merged develop into simonv/HPC-1711-local-author-broken
- b3fe6f0 - (Simon) Change log warn because it's an error, not an info tidbit.
- b58b3bf - (Simon Vansintjan) Merged develop into simonv/HPC-1700-add-jshint
- b71c9e7 - (Simon) Add JSHint to hpc service
- 5de4c19 - (Simon) Fix HPC-1712, check methods exist
- adad1c4 - (Vincent Perrin) Merged in HPC-1630-modify-custom-locations-for-opt (pull request #435)
Hpc 1630 modify custom locations for opt
- adbc171 - (Simon) Make sure that clusters include nested activities
- 545e0c4 - (Simon) Add export error
- c8cea18 - (Simon) Fix faulty reference to server.js
- 6900594 - (Tim Martin) Merged in feature/HPC-1667-add-solr-client (pull request #440)
Feature/hpc 1667 add solr client
- 0ac920b - (Tim Martin) Removed staging DB logging for Sequelize
- 7658b0c - (Tim Martin) Merge branches 'feature/HPC-1667-add-solr-client' and 'develop' of bitbucket.org:phase2tech/hpc_service into feature/HPC-1667-add-solr-client
- 871aa78 - (Tim Martin) Added new logic to populate solr indexing
- ea0fd25 - (Simon Vansintjan) Merged in simonv/add-some-hpc-service-test-shells (pull request #437)
Add some simple tests for plan monitoring
Removed port number
- c713ea4 - (Tim Martin) Removed port number
- 698629c - (Tim Martin) Merged in feature/HPC-1667-add-solr-client (pull request #438)
Feature/hpc 1667 add solr client
- 0629ab9 - (Tim Martin) Commented solr container
- 42018c4 - (Tim Martin) Changed query limit
- 6e30655 - (Tim Martin) Added logic to solr import
- 14a3900 - (Simon) Add some simple tests for plan monitoring
- df3dddb - (Vincent Perrin) forgot docker-compose file
- 7f46142 - (Vincent Perrin) completed merge
- 1372559 - (Vincent Perrin) cleanup
- 48d21fc - (Vincent Perrin) merge
- d354dc2 - (Vincent Perrin) created migration to update disaggregation model and the location table. Updated the custom location seeding to reflect the change. Updated the readme to warn about a small procedural change.
- 0511337 - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-endpoints (pull request #434)
Feature/hpc 1549 appeals overview endpoints
- e711169 - (Tim Martin) Fixed issue with merge
- c28f552 - (Tim Martin) Merge
- 8e576b1 - (Tim Martin) Merged in bug/flow-save-issue (pull request #433)
Fixed flow save issue
- 16b04d1 - (Tim Martin) Fixed flow save issue
- 71d7a2c - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-snapshot (pull request #432)
Feature/hpc 1549 appeals overview snapshot
- 43920a7 - (Tim Martin) Added endpoints for recipient and donor overviews
- 4348fa3 - (Tim Martin) Modified the additional flow object data to use parameters
- 73ea0c4 - (Tim Martin) Added Solr package and initial script
- f829ff3 - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-snapshot (pull request #431)
Feature/hpc 1549 appeals overview snapshot
- 7384316 - (Tim Martin) Added result
- 959ca55 - (Tim Martin) Centralized total logic and added new endpoints
- ef6ac7d - (Simon Vansintjan) Merged in simonv/refactor-plans (pull request #430)
Refactor Plans
- f4374bd - (Simon) Resolve merge conflicts
- 292d23a - (Simon Vansintjan) Merged simonv/HPC-1486-get-models-for-a-plan into develop
- 98cf13c - (Simon) Add clusters in models take 2
- 39479d5 - (Simon Vansintjan) Merged in simonv/HPC-1486-get-models-for-a-plan (pull request #429)
Simonv/hpc 1486 get models for a plan
- c6d4cb3 - (Simon Vansintjan) Merged develop into simonv/HPC-1486-get-models-for-a-plan
- 27d570c - (Simon) Include clusters in models
- f0f7149 - (Simon) Spacing
- a5a8d51 - (Simon) Completed refactor of Plan.js
- 1dcb8ac - (Simon Vansintjan) Merged in simonv/HPC-1648-track-cluster-activities-measurement-change-as-part-of-cluster-activities (pull request #423)
Track cluster activities measurement change as part of cluster activities
- 68ed076 - (Simon) Undo measurements reference to get rest of PR merged
- 1c27843 - (Simon) Refactor plan.js into three different files
- afd9075 - (Simon) Removed a space
- c533943 - (Simon) Remove print statements
- a8dbfd8 - (Simon) Add route for getting all the goals for a plan
- 2e3be08 - (Simon) Re-add scope for activities and objectives This creates better reuse for different controllers (eg. indicatorGoal)
- 59f8fc1 - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-snapshot (pull request #428)
Added logic to use the flow reporting logic to calculate funding totals
- 3f27f27 - (Tim Martin) Added logic to use the flow reporting logic to calculate funding totals
- 7e363f6 - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-snapshot (pull request #427)
Added trends endpoint
- 5d20ee3 - (Tim Martin) Added trends endpoint
- 22d9420 - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-snapshot (pull request #426)
Added logic for funding calculations
- 4f77bc9 - (Tim Martin) Added logic for funding calculations
- 73ca1f0 - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-snapshot (pull request #425)
Added new logic for flow query
- 5809348 - (Tim Martin) Added new logic for flow query
- 89d8b97 - (Tim Martin) Merged in simonv/add-more-instructions (pull request #424)
Add more instructions
- 38ed22e - (Simon) Add some documentation about etags
- 6b065c4 - (Simon) Add more info on logs
- 6b6b6a3 - (Simon) Add instructions on how to clean up logs
- e2a3216 - (Simon) Remove dependency on global variable.
- aa54db4 - (Simon) Track cluster activities measurement change as part of cluster activities
- 33ac8ca - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-snapshot (pull request #422)
Removed unnecessary functions
- 66533cd - (Tim Martin) Removed unnecessary functions
- 41218d6 - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-snapshot (pull request #421)
Added new query
- 0bea62c - (Tim Martin) Added new query
- b0ec871 - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-snapshot (pull request #420)
Added boundary flow logic
- acbd03d - (Tim Martin) Added boundary flow logic
- b756444 - (Vincent Perrin) partial implementation, need to check error catching implementation
- 19fb200 - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-snapshot (pull request #419)
Modified endpoint
- 4b01e0f - (Tim Martin) Modified endpoint
- e949e6a - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-snapshot (pull request #418)
Added logic for appeals overview snapshot
- b9f1430 - (Tim Martin) Added logic for appeals overview snapshot
- 38fa8d8 - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-endpoints (pull request #417)
Added logic to filter org types
- 6071a2b - (Tim Martin) Added query to select plans by usage year
- 60d1d03 - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-endpoints (pull request #416)
Feature/HPC-1549: appeals overview endpoints
- 071ed26 - (Tim Martin) Added endpoint to get usage years by object type
- 6c6b181 - (Tim Martin) Added new functions
- 9d66801 - (Vincent Perrin) updated version
- e9c78f1 - (Vincent Perrin) Added a migration for updating the opt plan: update location names in jsonModel and then location in the location table. Eventually, updated the seeding of custom locations (for OPT as well) to match the change.
- fa05617 - (Tim Martin) Updated version
- 165b8d8 - (Vincent Perrin) improved sort of measurements CA
- 8c9739e - (Vincent Perrin) temp
- 2e8812a - (Vincent Perrin) cleaning
- dea7a31 - (Tim Martin) Updated version number
- cb0876c - (Tim Martin) Merged in feature/HPC-1601-custom-locations (pull request #415)
Modified location insert logic
- 2a0e2dc - (Tim Martin) Modified location insert logic
- b515d6a - (Tim Martin) Merged in feature/HPC-1601-custom-locations (pull request #414)
Feature/HPC-1601: Custom locations
- eecf253 - (Tim Martin) Added adminLevel to to locations import from hr.info
- b98e62e - (Tim Martin) Added custom locations seeding
- 86c8f0e - (Tim Martin) Updated version number
- bfd3f4c - (Tim Martin) Merged in feature/HPC-1584-add-comment-field (pull request #413)
Added comments to indicatorGoals
- 26cc8c6 - (Tim Martin) Added comments to indicatorGoals
- 35c9451 - (Tim Martin) Merged in feature/HPC-1565-modify-indicator-number-types (pull request #412)
Created migration to change parameterValue value field to FLOAT
- e03c258 - (Tim Martin) Created migration to change parameterValue value field to FLOAT
- a771b3e - (Tim Martin) Merged in HPC-monitoring (pull request #411)
Hpc monitoring
- 2f3a232 - (Vincent Perrin) cleanup
- 2e02327 - (Vincent Perrin) cleanup
- e2060c8 - (Vincent Perrin) cleanup
- 3930100 - (Vincent Perrin) added endpoints for SO monitoring, All read and save functions, eTags.
- 2fe6871 - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-endpoints (pull request #410)
Added getUsageYearsByObject
- bd003f7 - (Tim Martin) Added getUsageYearsByObject
- ec91441 - (Vincent Perrin) docker-compose.yml default config
- 5fba42b - (Vincent Perrin) modified seeding script to avoid a unique_violation error
- d132414 - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-endpoints (pull request #409)
Added endpoint for getDonorOrganization overview
- bf02b88 - (Tim Martin) Added endpoint for getDonorOrganization overview
- c41b603 - (Vincent Perrin) just to deploy
- d17e776 - (Vincent Perrin) just to deploy
- 34e5a9f - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-endpoints (pull request #408)
Removed endpoint
- 9aa8dc0 - (Tim Martin) Removed endpoint
- 9be0fdc - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-endpoints (pull request #407)
Added countries overview query
- 62281e1 - (Tim Martin) Added countries overview query
- 878103b - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-endpoints (pull request #406)
Added years to getAllPlans scope
- 4c38001 - (Tim Martin) Added years to getAllPlans scope
- 7bdf3fd - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-endpoints (pull request #405)
Added categories scope to getAllPlans endpoint
- 6a75675 - (Tim Martin) Added categories scope to getAllPlans endpoint
- 6c7351f - (Vincent Perrin) merged, with Temporary endpoints for FTS Beta site for bypassing auth
- de853e2 - (Vincent Perrin) improved some models and the measurement API
- da26bb7 - (Tim Martin) Merged in feature/HPC-1549-appeals-overview-endpoints (pull request #404)
Added logic to remove scopes for getAllPlans
- 06e371a - (Tim Martin) Added logic to remove scopes for getAllPlans
- be57720 - (Vincent Perrin) added some measurement data
- 7564b12 - (Vincent Perrin) added the table planReportingPeriod full migration
- cb32821 - (Vincent Perrin) added the table planReportingPeriod relation with plan
- b5eb7d0 - (Vincent Perrin) added the table planReportingPeriod
- 02ee4a7 - (Vincent Perrin) added goalMeasurement table
- ac94258 - (Vincent Perrin) added the table planReportingPeriod
- 9b96f87 - (Vincent Perrin) added the table planReportingPeriod
- 38a5339 - (Vincent Perrin) removed column from indicatorGoal table
- f73248e - (Vincent Perrin) general cleanup
- fcfcce7 - (Tim Martin) Merged in feature/fts-beta-queries (pull request #403)
Added routes and queries for FTS Beta site testing
- 4247545 - (Tim Martin) Added routes and queries for FTS Beta site testing
- 6febb97 - (Vincent Perrin) ready for monitoring with API split
- 193b80c - (Vincent Perrin) mostly some debugging
- cef09cb - (Vincent Perrin) mostly some debugging
- 1e2d7b0 - (Vincent Perrin) docker-compose back to normal
- 058758e - (Vincent Perrin) unified the eTags management and updated entities APi for allowing complete entity split from plan. To be polished
- 2679341 - (Vincent Perrin) completed the etag management for arrays of objects for the display of strategic objectives
- 646dc9f - (Tim Martin) README.md edited online with Bitbucket
- ba79af5 - (Tim Martin) README.md edited online with Bitbucket
- b697730 - (Tim Martin) README.md edited online with Bitbucket
- 3c20686 - (Tim Martin) README.md edited online with Bitbucket
- 5831e44 - (Vincent Perrin) temp removal of strategic objectives
- 1ba1024 - (Vincent Perrin) created endpoint for cluster activities
- 943007a - (Vincent Perrin) created endpoint for cluster objectives
- bd53a21 - (Vincent Perrin) get cluster objectives endpoint done
- 92a20c9 - (Vincent Perrin) clean up
- d179f28 - (Vincent Perrin) clean up
- 23afdb3 - (Vincent Perrin) clean up
- 573d467 - (Vincent Perrin) added the delete for strategic objectives
- 4d0383c - (Vincent Perrin) added the creatio/update for strategic objectives
- 1c9ff78 - (Vincent Perrin) backbone for objectives API
- 65cccb5 - (Vincent Perrin) GET stategic objectives
- 8edcdd5 - (Vincent Perrin) fixed issue abot truncated attributes. Cleaned the model for limitating issues of this type
- e859092 - (Vincent Perrin) handled disaggregation model conversion issue
- 69bc203 - (Vincent Perrin) Clusters objectives and acitivities saved and retreived normally
- c252e37 - (Vincent Perrin) reduced some part of the model to reduce the get query. We reached a limitation here
- d468844 - (Vincent Perrin) cluster activities values but issue when saving cluster objectives
- d77fcf7 - (Vincent Perrin) cluster objectives complete and cluster activities without disaggregation
- 7828c49 - (Vincent Perrin) testing
- 41c64d0 - (Tim Martin) Merged in bug/HPC-1459-org-search-issue (pull request #402)
HPC-1459: Org search issue
- 1114012 - (Vincent Perrin) testing
- d316e8e - (Vincent Perrin) improved the api following testing with lates frontend, and beyong cluster objectives (cluster objectices and activities working also).
- 035e878 - (Tim Martin) Added and conditions for org query
- af2f5fb - (Tim Martin) Merged in bug/legacy-import-currency-issue (pull request #401)
Fixed issue with currencies not importing
- a206f27 - (Tim Martin) Fixed issue with currencies not importing
- 43f4c78 - (Vincent Perrin) version to test get cluster objectives
- 37c9481 - (Vincent Perrin) added attachmentEntityIndicator UnitId foreign key constraint and removed deprecated test seeding.
- c433250 - (Tim Martin) Merged in feature/HPC-1350-conuntry-and-subdivision-location-search (pull request #400)
HPC-1350: Remove parent location when searching for child location
- ccf467f - (Eduardo Velez) HPC-1350: Remove parent location when searching for child location
- de77914 - (Vincent Perrin) Seeding for new tables for the dev deployment. New columns.
- 351f072 - (Tim Martin) Merged in feature/HPC-1474-updating-flows-dont-return-to-flow-list (pull request #399)
HPC-1474: When updating flows, the app doesn't return the user to the list screen
- 361f678 - (Eduardo Velez) HPC-1474: When updating flows, the app doesn't return the user to the list screen
- 720f784 - (Tim Martin) Merged in feature/HPC-1417-update-by-name-does-not-update-when-approving-pending-cancellation (pull request #398)
Fixed issue with saving categories
- 218cec9 - (Eduardo Velez) Fixed issue with saving categories
- b2b1241 - (Eduardo Velez) Merged in feature/HPC-969-security-additions (pull request #396)
HPC-969: Additional security features
HPC-1195: Unlink child/parent flows when inactive
- 7974384 - (Vincent Perrin) updated version and tag to 0.7.3 for disaggregation demo 1
- 24607a5 - (Tim Martin) Added filtering for parent/child flows where activeStatus is true
- 4efba5e - (Tim Martin) Added logic for numeric validation on search flows
- 62612a9 - (Tim Martin) Merged in feature/HPC-1425-org-autocomplete-by-name-and-abbr (pull request #395)
HPC-1425: Organization Auto-matching on Org Name and Org Abbreviation
HPC-1377: Fix activity logic
- 49fe0da - (Tim Martin) Fixed logic with saving activities and returned createdBy user
- b823225 - (Tim Martin) Merged in feature/HPC-1134-delete-org-check (pull request #393)
HPC-1134: org delete validation
- 6bd9b77 - (Tim Martin) Merged in feature/HPC-1417-update-by-name-does-not-update-when-approving-pending-cancellation (pull request #392)
HPC-1417: Updated By Name Does Not Update When Approving a Pending Flow Cancellation Request
- b3a2f30 - (Tim Martin) Added validation for deleting organizations
- 0f46e89 - (Eduardo Velez) small changes to resolve HPC-1397
- 51fc565 - (Eduardo Velez) Minor edits
- 1a7085a - (Eduardo Velez) HPC-1417: Updated By Name Does Not Update When Approving a Pending Flow Cancellation Request
- c13b023 - (Eduardo Velez) Merged in feature/HPC-1133-addlastupdated (pull request #391)
HPC-1133: Added activity records for organizations
- 312425c - (Tim Martin) Added logic for saving activity records
- 24b472c - (Eduardo Velez) HPC-1425: Organization Auto-matching on Org Name and Org Abbreviation
- b72d30b - (Vincent Perrin) cleanup
- 24c8242 - (Vincent Perrin) Added the disaggregation models API endpoint
- 2180e03 - (Vincent Perrin) Merge remote-tracking branch 'origin/HPC-API-disaggregation' into vincentp/HPC-1453-api-get-disaggregation-models
HPC-1456: Add ‘GMS’ to Report Channel pulldown
- 2ed42d8 - (Eduardo Velez) HPC-1456: Add ‘GMS’ to Report Channel pulldown
- 88ea03c - (Eduardo Velez) Merged in feature/HPC-1131-create-organization (pull request #389)
HPC-1131: Added create, update and delete for organizations
- fe3ab65 - (Vincent Perrin) removed parameterValue seeding which causes an issue with the auto incrementation of this id at first.
- 4769b1d - (Vincent Perrin) Plan API with disaggregation save (update and create) done for strategic objectives. Modified structure of table indicator goals, improved seeding. clean up
- a8f5e0b - (Tim Martin) Added create and delete functionality
- e80efb1 - (Vincent Perrin) API save, first successfull test of updating creating, and improved seeding and corrected parameterTypeId in measurementType object of values.
- e96a5ad - (Vincent Perrin) added the migration for comments in IndicatorGoal, values output is now flat and parameterValues start to be savable but issue with saving cluster data
- 4325e1b - (Vincent Perrin) Moved unitId from goals to indicators, added comment on indicator, added seeding on indicators and a bit more even
- 0f5d8c6 - (Vincent Perrin) seeded parameterVaalues, changed values to be split into disaggergated ones or aggregated ones
- e60a89a - (Vincent Perrin) added disaggregationCategories and groups to the test seeding
- c1a932f - (Vincent Perrin) added units and unitTypes to the seeding
- fa083ca - (Vincent Perrin) added the plan template to the seeding ofthe default test template
- df9069e - (Vincent Perrin) started the new formating of values into disagg. and agg.
- e3b7a33 - (Vincent Perrin) added disaggregation-category-group endpoint
- 3f3df12 - (Vincent Perrin) added disaggregation-category endpoint
- 808cec5 - (Vincent Perrin) added unit-type endpoint
- 8c1a27f - (Vincent Perrin) added unit endpoint
- db703e6 - (Vincent Perrin) added measurement-type endpoint
- 260f7d8 - (Vincent Perrin) added the location to the description of values
- a7b3f29 - (Vincent Perrin) updated the seeding of parameterTypes
- 7ad8f65 - (Vincent Perrin) sends a set of values for implementing the disaggregation
- a9b657f - (Vincent Perrin) ...
- 273ec6b - (Vincent Perrin) ...
- fa6c721 - (Vincent Perrin) testing new simplified output
- d4bbd55 - (Vincent Perrin) merged
- e904a53 - (Vincent Perrin) changed the relation of parameterType
- 6353ae2 - (Vincent Perrin) merged
- f147479 - (Vincent Perrin) ongoing
- 93c96f4 - (Vincent Perrin) changed the relation of parameterType
- e303097 - (Vincent Perrin) added the id next to the value in indicator goals
- 7af6ff7 - (Vincent Perrin) added the id next to the value in indicator goals
- 07b8d8a - (Vincent Perrin) first dev
- 55ac778 - (Vincent Perrin) created new end point
- 0ece44b - (Vincent Perrin) updated the new end point to plan-disaggregation
- 8b49160 - (Vincent Perrin) Get plan with disaggregation: added the aggregated vâlues to the output
- 94ff620 - (Vincent Perrin) code clean up
- 7c40646 - (Vincent Perrin) added disaggregation model to indicator goals in DB, corrected migration about the connection to indicatorGoals table, removed the S to indicatorGoals because it's normally good like this and because Sequelize remove the s to generate reference names, and made the formatting of the output of the get disagPlan API for strategic opbjectives with the disaggregation model and the formatting of values according it.
- 1bce5f8 - (Vincent Perrin) revert the sequelize CLI stuff and removed comments
- 56a0b47 - (Vincent Perrin) revert the naming convention of migrations
- 1704b85 - (Vincent Perrin) corrected plan controller goal model issue
- 7b60f7e - (Vincent Perrin) corrected foreign key
- 6244733 - (Vincent Perrin) test removed goal model from plan API structure
- d60a435 - (Vincent Perrin) test removed goal model but not from plan API structure
- a3f0aaf - (Vincent Perrin) test removed goal model from plan API structure
- a651813 - (Vincent Perrin) test removed goal model
- 73a841d - (Vincent Perrin) test removed goal relation
- 9bce7b7 - (Vincent Perrin) comments
- 941a002 - (Vincent Perrin) goal model testing
- 61f52b9 - (Vincent Perrin) renamed migration
- 7473ff4 - (Vincent Perrin) renamed migration
- da832ab - (Vincent Perrin) renamed migration
- b7421f1 - (Vincent Perrin) renamed migration
- d296933 - (Vincent Perrin) modified relations for indicators
- 3bdfbe8 - (Vincent Perrin) added the goal model
- 8b9f7c7 - (Vincent Perrin) added the goal model
- 9fe1217 - (Vincent Perrin) goal added columns for down migration
- ed11be7 - (Vincent Perrin) update of syntax for Sequlize foreign keys
- bbb4f39 - (Vincent Perrin) sequelize CLI files
- 1013773 - (Vincent Perrin) updated migration names
- 8b7cca9 - (Vincent Perrin) updated down migrations
- faeaf24 - (Vincent Perrin) updated the goal migration
- a8d8d6e - (Vincent Perrin) added unique constraint on parameterMeasurment
- aa1c2d5 - (Vincent Perrin) added unique constraint on indicatorGoals
- e268532 - (Vincent Perrin) test
- 26b709a - (Vincent Perrin) test
- 2b213bc - (Vincent Perrin) comment
- 8abb745 - (Vincent Perrin) temp commit
- cbb9539 - (Vincent Perrin) done with disaggregation
- f36757c - (Vincent Perrin) ...
- 503356d - (Vincent Perrin) completed the indicatorGoals columns with customID and commented out part of outdated API to avoid errors
- ac03a1d - (Vincent Perrin) Made few improvements on keys and removed attachMentEntityIndicatorGoals and goal
- 5bc743d - (Vincent Perrin) first step with db to review and endpoint
- 9f621c7 - (Tim Martin) Updated version number
- 6124ad1 - (Tim Martin) Merged in feature/HPC-1435-apply-funcing-and-flow-typel-validation-to-edit-flow-screen (pull request #388)
HPC-1435: Apply Funding and Flow Type Validation to Edit Funding Flow Screen
HPC-1427: Unable to add a keyword
HPC-1296: Saved Funding Sources Do Not Display Upon Return to Flow Screen
- 031b567 - (Eduardo Velez) HPC-1435: Apply Funding and Flow Type Validation to Edit Funding Flow Screen
- 4cea1e3 - (Eduardo Velez) HPC-1427: Unable to add a keyword
- 42152ef - (Eduardo Velez) HPC-1296: Saved Funding Sources Do Not Display Upon Return to Flow Screen
- 766b710 - (Tim Martin) Merged in feature/HPC-1214-reject-selected-new-pending-flow-from-list (pull request #385)
HPC-1214: Update 'updatedAt' and 'versionEndDate' on bulk reject
- 356b227 - (Eduardo Velez) HPC-1214: Update 'updatedAt' and 'versionEndDate' on bulk reject
- c14b5f3 - (Eduardo Velez) Merged in feature/HPC-1193-approve-update-pending-flow-cancellation (pull request #384)
Removed logs used for debuging
- 5aa0b01 - (Eduardo Velez) syntax error
- f0481f7 - (Eduardo Velez) Removed logs used for debuging
- 8742034 - (Eduardo Velez) Merged in feature/HPC-1193-approve-update-pending-flow-cancellation (pull request #383)
add logs when deciding to supersed
- 1320ff5 - (Eduardo Velez) add logs when deciding to supersed
- 296bc93 - (Tim Martin) Merged in feature/HPC-1193-approve-update-pending-flow-cancellation (pull request #382)
debug superseded process
- b78da81 - (Eduardo Velez) missing log
- 301fd7f - (Eduardo Velez) added more debug logs
- 55dfba6 - (Eduardo Velez) debug superseded process
- 040e88e - (Tim Martin) Merged in feature/HPC-1214-reject-selected-new-pending-flow-from-list (pull request #381)
HPC-1214: reject selected NEW pending funding flows from a list
HPC-1195: EDRIS child flows
- e12356d - (Eduardo Velez) HPC-1214: reject selected NEW pending funding flows from a list
- bbd1b5c - (Tim Martin) Modified EDRIS missing link flow string
- 9887b02 - (Tim Martin) Added logic for storing linkedFlow IDs
- 8df8c88 - (Tim Martin) Merged in feature/HPC-1317-limit-autocomplete-results (pull request #378)
HPC-1317: Limit the number of auto-complete matches
- 2bb460b - (Eduardo Velez) HPC-1317: Limit the number of auto-complete matches
- 6157f18 - (Tim Martin) Merged in feature/HPC-1187-reject-update-pending-flow (pull request #377)
HPC-1187: Added category ids when attaching other flow versions to retrived flow.
Bug/HPC-1381 - fix linked flows
- 3ed14c6 - (Eduardo Velez) HPC-1187: Added category ids when attaching other flow versions to retrived flow.
- b30c1f4 - (Tim Martin) Added logic to add parent destination flow objects as child source flow objects
- 2526b6c - (Mark Boyd) Merged in feature/release-sequelize-connections (pull request #373)
(WIP) Release Sequelize connections
- 966b09c - (Tim Martin) Merged in feature/HPC-1193-approve-update-pending-flow-cancellation (pull request #375)
HPC-1193: Approve an UPDATE pending funding flow cancellation request
- ff78fd1 - (Mark Boyd) add sequelize connection releasing for projects import & add async processing for flow and project imports
- 8e78245 - (Tim Martin) Merge branches 'bug/HPC-1381-fix-linked-flows' and 'develop' of bitbucket.org:phase2tech/hpc_service into bug/HPC-1381-fix-linked-flows
- 9b9faca - (Tim Martin) Added logic for getting parent flow details
- 89a9755 - (Eduardo Velez) removed unwanted changes
- 401b57f - (Eduardo Velez) HPC-1193: Approve an UPDATE pending funding flow cancellation request
- a9d40f2 - (Tim Martin) Reorder of attaching flow related data
- 5ad860c - (Tim Martin) Merged in feature/HPC-1393-superseded_version_start (pull request #374)
HPC-1393: Ensuring reset flow version start date is only applied to cancelled flow (not superseded version).
HPC-1378: Fixed reportedBy org matching
HPC-1253: Added association to project clusters
- 2c63583 - (Joe Turgeon) HPC-1393: Ensuring reset flow version start date is only applied to cancelled flow (not superseded version).
- cfe502b - (Tim Martin) EDRIS - Fixed issue with country code
- edec217 - (Tim Martin) added gte operator to edris
- c2ec8b0 - (Mark Boyd) implement code to manually release pooled connection to Sequelize database after each batch of imported flows
- 45d638c - (Tim Martin) Fixed reportedBy org matching
- 722d65a - (Tim Martin) Added association to project clusters
- c90395e - (Mark Boyd) Merged in feature/flow-import-remove-concurrency (pull request #370)
Imports: remove concurrency
- 8108b04 - (Mark Boyd) remove concurrency from project import
- e8c95d8 - (Mark Boyd) remove concurrency from flow import
- 8cf9ffd - (Tim Martin) Merged in feature/new-pending-flow-notes (pull request #369)
HPC-1374: add mapping to include status notes from source data for new and update pending flows
- c446cf6 - (Mark Boyd) HPC-1374: add mapping to include status notes from source data for new and update pending flows
- 1ed1b90 - (Tim Martin) Merged in bug/HPC-1369-add-version-to-flow-links (pull request #368)
HPC-1369: Fixed issue with flow count by version
- 5917044 - (Tim Martin) Fixed issue with flow count by version
- 212cef2 - (Tim Martin) Merged in bug/HPC-1369-add-version-to-flow-links (pull request #367)
Bug/HPC-136: Add version to flow links
- 8b61927 - (Tim Martin) Added option to group by version Set search function to group by version
- fcd7cc3 - (Tim Martin) Merged in feature/fix_sql_constraint_error (pull request #366)
Ensure duplicate categories are not saved in saveReportDetails()
HPC-1354: Fixing validation logic for carryover flow type.
HPC-1241: Fixing createdAt date assigned to new revisions.
- 6455726 - (Joe Turgeon) Ensure duplicate categories are not saved in saveReportDetails(). Ensuring setReportFiles() completes before continuing.
- 95f0f1a - (Joe Turgeon) Merged in feature/HPC-1309-assign-first-reported (pull request #363)
HPC-1309: Assign First Reported Date
- a43365d - (Joe Turgeon) HPC-1354: Fixing validation logic for carryover flow type.
- 442ad8b - (Tim Martin) Added version grouping for flow list items
- 4902beb - (Joe Turgeon) HPC-1241: Fixing createdAt date assigned to new revisions.
- affbb95 - (Tim Martin) Set firstReportedDate for existing flows
- 2504c5d - (Tim Martin) Merged in feature/report-detail-save-bug (pull request #362)
Fix error with report file referencing deleted report detail
- 14a49c3 - (Eduardo Velez) Fix error in with report file referencing deleted report detail
- 86b89b7 - (Tim Martin) Added contact info
- 33cb4cb - (Tim Martin) Merged in feature/fix_new_flow_bug (pull request #360)
Fixing bug when saving new flows that caused error skipping flow attachments.
HPC-1354: Updating funding and flow type validation behavior
HPC-1309: Assign first reported date for new EDRIS flows
HPC-1373: Make EDRIS Organization string match case insensitive
- 7df0911 - (Tim Martin) Added Sequelize $iLike operator to name searches
- d2920d4 - (Joe Turgeon) Fixing bug when saving new flows that caused error skipping flow attachments.
- e08a54e - (Joe Turgeon) HPC-1354: Updating funding and flow type validation behavior. Applying most validation only to new flows to prevent errors updating existing flows. Extending check for flows with a Pooled Fund source.
- 9cf1954 - (Tim Martin) Added logic for assigning first reported date for new flows only
- fbadf31 - (Tim Martin) Merged in feature/HPC-1312-change-contribution-status (pull request #355)
HPC-1312 - Changed contribution status to flow status for EDRIS imports
HPC-1188: Approve version as restricted
HPC-1061: Refactoring saveChildSourceAsDest routine as saveDestAsChildSource
Added logic for filtering flows by status
- 907840e - (Joe Turgeon) HPC-1061: Refactoring saveChildSourceAsDest routine as saveDestAsChildSource to ensure that when a flow is saved with children, the children's sources are updated with the current flow's destinations.
- d326562 - (Eduardo Velez) remove log
- 2e61092 - (Eduardo Velez) HPC-1188: Approve version as restricted
- 5491029 - (Tim Martin) Changed contribution status to flow status for EDRIS imports
- 7db8a06 - (Tim Martin) Merged in feature/HPC-1182-approve-pending-funding-flow (pull request #353)
HPC-1182: Add superseded to prevously active flow
- bbd56b8 - (Eduardo Velez) removed log
- 5d8ced1 - (Eduardo Velez) HPC-1182: Add superseded to prevously active flow
- 610d75b - (Tim Martin) Added logic for filtering flows by status
- db30071 - (Tim Martin) Merged in mboyd/HPC-1301-refactor-implementing-partner (pull request #352)
HPC-1301: refactor implementing partner
- 15e50b4 - (Mark Boyd) change saving of implementingPartner property to use more general objectDetail column on flowObject
- 62afd3f - (Tim Martin) Merged in feature/HPC-1241-fix_error_updating_flow (pull request #351)
HPC-1241: Fixing 'Error updating flow' when cancelling a flow due to old reportDetail ID parameter.
- edf6628 - (Joe Turgeon) HPC-1241: Fixing 'Error updating flow' when cancelling a flow due to old reportDetail ID parameter.
- d5d084d - (Tim Martin) Merged in hotfix/flow-legacy-scope (pull request #350)
make legacy scope not required on flows
- 24fb71f - (Mark Boyd) make legacy scope not required on flows
- 446a3f9 - (Mark Boyd) add migration to remove implementingPartner column and to add objectDetail column
- 46d8ef4 - (Tim Martin) Merged in feature/HPC-1060-parent_source_match (pull request #349)
HPC-1060: Ensuring any existing flow sources are replaced when a flow parent is specified.
HPC-1182: addressed error in when saving detial files
- b2a980f - (Joe Turgeon) HPC-1060: Ensuring any existing flow sources are replaced when a flow parent is specified.
- acff958 - (Mark Boyd) Merged in feature/flow-scope-hotfix (pull request #348)
ensure objectType is loaded for legacy flow scope
- d2b2d11 - (Mark Boyd) ensure objectType is loaded for legacy flow scope
- 7072171 - (Mark Boyd) Merged in feature/flow-legacy-scope-fix (pull request #347)
specify objectType when loading flow legacy scope
- 52ea63e - (Mark Boyd) specify objectType when loading flow legacy scope
- 2519234 - (Mark Boyd) Merged in feature/flow-legacy-scope (pull request #346)
Flow legacy scope
- 795ed21 - (Mark Boyd) add legacy scope for including legacy data with flows
- df9f565 - (Mark Boyd) add legacy scope to unified flow retrieval function to allow easily identifying source record ID for a flow
- 6156695 - (Eduardo Velez) HPC-1182: addressed error in when saving detial files
- 0388b93 - (Mark Boyd) Merged in feature/rollback-legacy-only (pull request #344)
refactor category rollback to only affect records migrated from legacy data
update rules for setting beneficiaryGroup of Refugee
- 438ec8f - (Mark Boyd) refactor category rollback to only affect records migrated from legacy data
- 6142d6f - (Tim Martin) Merged in feature/flow-import-error-handling (pull request #342)
add error handling for flow count queries
HPC-1182: Checking for array before doing foreach
- 3d5164a - (Mark Boyd) update rules for setting beneficiaryGroup of Refugee
- 14ea03d - (Mark Boyd) add error handling for flow count queries
- 2be3b41 - (Eduardo Velez) merge conflicts
- 3868a28 - (Eduardo Velez) HPC-1182: Checking for array before doing foreach
- 8cde2b0 - (Mark Boyd) Merged in feature/legacy-endpoint-versions (pull request #340)
update flow by legacy ID controller to return only a single flow version data, with information about other flow versions
HPC-991/HPC-1250: Pending flow imports
- b4b8867 - (Mark Boyd) update flow by legacy ID controller to return only a single flow version data, with information about other flow versions
- 8161da5 - (Mark Boyd) HPC-1250: fix flow by external controller to return correct data for each flow version
- b8e8493 - (Mark Boyd) merged in develop
- 162d6d2 - (Mark Boyd) further edits to pending and regular flow queries
- aac1b56 - (Tim Martin) Merged in mboyd/HPC-1356-source-global-clusters (pull request #338)
HPC-1356: Add source global clusters
HPC-1182: Changes necessary to approve pending flows
- fe8aac2 - (Mark Boyd) refactor regular and pending flow query building to ensure fields needed by both have same aliases
- 7802da7 - (Tim Martin) Merged in mboyd/HPC-1355-beneficiary-group (pull request #336)
Fix conditions for setting beneficiaryGroup category of "Refugee"
- c5a1a82 - (Mark Boyd) correct field alias for source and destination location attributes
- 0b1c624 - (Mark Boyd) add handling for more special GCS cases
- 386333b - (Mark Boyd) add mappings to attach source global clusters to flows
- b08f408 - (Eduardo Velez) HPC-1182: Changes necessary to approve pending flows
- 536acef - (Mark Boyd) fix conditions for setting beneficiaryGroup category of "Refugee"
- 0045010 - (Mark Boyd) Merged in mboyd/HPC-1236-map-global-clusters (pull request #335)
HPC-1236: Map global clusters & change beneficiaryGroup conditions
- cece9d3 - (Mark Boyd) modify conditions for applying beneficiaryGroup category of "Refugee"
- 4d6097c - (Mark Boyd) update conditions for setting global clusters
- 2beef53 - (Tim Martin) Merged in bug/HPC-1344-reference-code (pull request #334)
Added search case insensitivity to reporterRefCode
HPC-1061: Fixing validation of child links on flows
Feature/hpc 1286 add pending filters
- 7c2b894 - (Tim Martin) Added search case insensitivity to reporterRefCode
- be35900 - (Joe Turgeon) HPC-1061: Fixing validation of child links on flows. Ensuring that flow links where parent and child are the same are not counted as a parent-child link.
- 933829a - (Tim Martin) Revised item push
- d4f4c90 - (Tim Martin) Added unchanged code back to controller
- 1df36da - (Tim Martin) Removed pending flows endpoint and controller functions
- 65ed0b2 - (Tim Martin) Added filter to flowSearch for externalReference systemID Added version to externalReference record for EDRIS
- 9d36c9b - (Tim Martin) Merged in feature/HPC-973-hpc_fts_admin_roles (pull request #330)
HPC-973/HPC-981: Updating participant controller to allow managing roles from multiple modules
- b284071 - (Tim Martin) Created externalData endpoints and controller
- 3f6a60a - (Mark Boyd) Merged in feature/skip-imports (pull request #331)
Add ability to skip imports
- a3928be - (Mark Boyd) change documentation language
- 5db54eb - (Mark Boyd) fix incorrect reference
- 76b4429 - (Mark Boyd) update import documentation
- 37eba2b - (Mark Boyd) add skip option for imports
- fd199c8 - (Joe Turgeon) HPC-973/HPC-981: Updating participant controller to allow managing roles from multiple modules. Adding endpoint to list roles that user can assign.
- bd3b023 - (Mark Boyd) Merged in feature/default-flow-import (pull request #329)
remove restriction to ensure flow import runs by default
update reportDocs to allow setting limit for migration & fix code to prevent dpulicate report file creation
- ffa1141 - (Mark Boyd) remove restriction to ensure flow import runs by default
- a0aa205 - (Mark Boyd) update reportDocs to allow setting limit for migration & fix code to prevent dpulicate report file creation
- 0ed10fc - (Tim Martin) Moved pending logic
- e33abc0 - (Mark Boyd) Merged in feature/simpler_import_steps (pull request #327)
Simplify import instructions
HPC-1236: add migration of source emergency for pooled contributions
HPC-1311: change contributionStatus category group to flowStatus
- 6baf18e - (Joe Turgeon) Simplify import instructions by fetching the SQL export in the MySQL container.
- 334f9ac - (Mark Boyd) add migration of source emergency for pooled contributions
- 995b708 - (Mark Boyd) update import documentation
- d59e212 - (Mark Boyd) change contributionStatus category group to flowStatus
- e197d66 - (Tim Martin) Merged in feature/flow-global-clusters (pull request #323)
HPC-1236: add missing mappings from sectors to global clusters
- 52f2ced - (Mark Boyd) HPC-1236: add missing mappings from sectors to global clusters
- 4da4eda - (Tim Martin) Merged in feature/HPC-1061-fix_child_flow_validation (pull request #322)
HPC-1061: Fixing validation for child flows
- f8d9c70 - (Joe Turgeon) HPC-1061: Fixing validation for child flows to ensure that records where the new child is its parent are ignored.
- 539c3b6 - (Mark Boyd) Merged in feature/projects-import (pull request #321)
Projects import
- 44835d5 - (Mark Boyd) add offset and limit parameters for flow & project imports, update import documentation
- c2b8e61 - (Tim Martin) Merged in feature/HPC-1010-flow-search (pull request #320)
Feature/hpc 1010 flow search
- 972e243 - (Mark Boyd) fix import size calculation
- 1820745 - (Tim Martin) Merged in feature/HPC-1181-review-new-pending-flow (pull request #317)
HPC-1181: Altered flow get to attach active ver if current ver not active
- 03ec960 - (Mark Boyd) add correct callback to check for project legacy record
- 1d940aa - (Mark Boyd) fix incorrect callback reference
- 830f463 - (Tim Martin) Added logic to flowObject queries to use OR clause within each object type and AND clause between object types
- 5f0c286 - (Mark Boyd) remove unnecessary variables
- 029008c - (Mark Boyd) fix variable references
- 4b63c01 - (Tim Martin) Merged in mboyd/HPC-1130-organizations-search (pull request #318)
HPC-1130: organizations search
add flow children to flow by legacy ID endpoint
- 25f2696 - (Mark Boyd) add flow children to flow by legacy ID endpoint
- 6e0b182 - (Mark Boyd) fix code style
- 93c7a4f - (Mark Boyd) updating rollback script to query models directly when legacy IDs are not supplied as arguments
- 65ce32f - (Mark Boyd) update projects import to run in batches
- 1deaf5a - (Mark Boyd) reverting logic for locations clause in organizations search
- c9c3cfb - (Eduardo Velez) HPC-1181: Altered flow get to attach active ver if current ver not active
- 1490d3c - (Mark Boyd) remove debugging info
- 0f2eb37 - (Mark Boyd) change output for organization autcomplete to just be array of results
- 2eba389 - (Mark Boyd) implement custom query for organization autocomplete to accommodate loading parent organizations by autocopmlete
- 62d9a79 - (Tim Martin) Added like clause for reporter ref code
- d3883d4 - (Tim Martin) Merged in feature/flow-search (pull request #316)
updated query builder to allow for nested joins
- c27ad51 - (Mark Boyd) adding logic to organization autocomplete for parent orgs
- 8493cae - (Mark Boyd) updated query builder to allow for nested joins
- 33471ac - (Mark Boyd) more work on organization search
- 2875f5e - (Tim Martin) Merged in feature/HPC-1010-flow-search (pull request #315)
Added inner join option on category joins
HPC-1241: Implementing functionality for Cancel/Set As Inactive operation.
- 1553db5 - (Tim Martin) Added missing comma
- 968477e - (Tim Martin) Added inner join option on category joins
- fa21c2c - (Mark Boyd) Merged in feature/optimize_import (pull request #314)
Import optimizations
- 12eb25d - (Mark Boyd) add updated config for test container
- fb40094 - (Mark Boyd) change order for organization search query joins
- 4d5fb48 - (Mark Boyd) add code to ensure organization categories are not joined twice
- e577db7 - (Mark Boyd) change condition for organizationType to use ID
- ef4dd33 - (Joe Turgeon) Updating MySQL configuration for connection pool approach.
- 06d8424 - (Joe Turgeon) Explicitly use and release from the connection pool for the flow import. Reduce the concurrency and batch size.
- b204ad6 - (Joe Turgeon) Use a connection pool for the MySQL connections.
- 9a72077 - (Mark Boyd) add logic to ensure necessary tables are joined for organization search
- 81b6ac7 - (Tim Martin) Merged in feature/flow-queries (pull request #312)
change conditions for flow search query & put query builder into re-usable file
- 824f314 - (Mark Boyd) add where condition query building logic for organizations search and ability to sort by any column
- 5ef1ebb - (Joe Turgeon) HPC-1241: Implementing functionality for Cancel/Set As Inactive operation. Refactoring createFlow and updateFlow to use helper functions which are isolated from the request/response.
- 731e4f0 - (Mark Boyd) setup basic query organizations search
- a4794be - (Mark Boyd) change conditions for flow search query & put query builder into re-usable file
- 135c26c - (Tim Martin) Merged in feature/manual-flow-import (pull request #311)
make flow import to be manually triggered, not run automatically
- 7977b4e - (Mark Boyd) make flow import to be manually triggered, not run automatically
- 7a02ab7 - (Mark Boyd) more work on organizations search controller
- c725d53 - (Mark Boyd) add basic sorting, limiting, offseting to organizations search route
- 2172035 - (Mark Boyd) add organization searching route
- 5eb3dc4 - (Mark Boyd) Merged in mboyd/full-flow-import (pull request #310)
Full flow import - Performance and memory usage improvements
- b4ca23a - (Mark Boyd) code style improvements
- 7417ff9 - (Mark Boyd) only log import name if specified
- 94cc129 - (Mark Boyd) add query to get count of all rows
- e1c4f99 - (Mark Boyd) benchmarking sequential vs parallel processing approach
- dcf0173 - (Tim Martin) Merged in feature/HPC-1010-flow-search (pull request #307)
HPC-1010 Flow search
- 960ceb2 - (Mark Boyd) remove debugging info
- b79817d - (Mark Boyd) add more debugging to flow import
- 1e00096 - (Mark Boyd) change flow import batches to run separate queries
- 69d3bda - (Tim Martin) Changes based on PR recommendations
- f1bb807 - (Mark Boyd) Merged in mboyd/HPC-1111-flow-import-refactoring (pull request #309)
HPC-1111: flow import refactoring
- f57ad52 - (Mark Boyd) remove unnecessary function
- 911804a - (Mark Boyd) remove debugging statements
- 9a3b650 - (Mark Boyd) refactor flow import to just basic and parked flows
- 079536c - (Mark Boyd) Merged in mboyd/import-refactor-updates (pull request #308)
Import refactor updates
- c8fea74 - (Mark Boyd) HPC-1300: add first reported date field migraiton
- 48ff3d1 - (Mark Boyd) use utility handleCallback for projects import
- b784683 - (Mark Boyd) remove progress logging from projects import
- 90aa4ae - (Mark Boyd) minor fixes for original currency and original amount
- c603662 - (Mark Boyd) more testing of full flow import
- 01b7e7c - (Tim Martin) Fixed getAllFlows query
- cc69e28 - (Tim Martin) Removed old flowSearch controller
- f849604 - (Tim Martin) Added options for search flow
- dc741a0 - (Mark Boyd) add test to ensure original crrency value does not contain numbers
- 8db2144 - (Tim Martin) Added additional logic to search query
- 3c13f1f - (Mark Boyd) add defensive coding to ensure origAmount string is not empty before converting to integer
- b56266e - (Eduardo Velez) Merged in feature-add--external-data-versionID (pull request #306)
Added version ID to external data
- 81788ba - (Tim Martin) Added version ID to external data
- 4a7c48d - (Mark Boyd) HPC-1294: add import for locations from special mapping table
- fd927ca - (Mark Boyd) HPC-1300: add migration for first reported date
- 30b5483 - (Mark Boyd) update projects import to ensure a project instance is returned
- 3fe89d1 - (Tim Martin) Merged in feature/HPC-1217-advisory-message (pull request #305)
HPC-1217: Added query to get alt flow versions on flow get
- 9acbcf7 - (Mark Boyd) change origAmount column to BIGINT
- 27b268f - (Mark Boyd) simplify flow import processing
- 7800ae4 - (Mark Boyd) more work seting up flow import batches
- 9cf5083 - (Mark Boyd) change flow import to use more parallel execution
- 048e7e6 - (Mark Boyd) implement initial version of basic flows import for 2000 records
- 8c304b5 - (Eduardo Velez) fixes with query
- fc0ec06 - (Eduardo Velez) Refactored to ues existing get flow function
- 8b889b5 - (Mark Boyd) refactor flow import into basic flows and parked flows
- a8e1bcc - (Tim Martin) Merged in mboyd/HPC-1144-legacy-timestamps (pull request #304)
HPC-1144: legacy timestamps
HPC-1278: project field clusters
Set matched boolean property for external data based on presence of matching ID
- bc7588a - (Eduardo Velez) HPC-1217: Added query to get alt flow versions on flow get
- 188793b - (Tim Martin) Added code to filter 'pending review' records
- db9d8a0 - (Mark Boyd) add updated timestamps on object creatino for emergencies, organizations, and plans
- 26c064c - (Mark Boyd) add migration for field clusters on projects
- 0cfdfc7 - (Mark Boyd) add cluster output to project endpoint
- 524b2d1 - (Mark Boyd) add association between projects and field clusters
- 79259be - (Mark Boyd) set matched boolean property for external data based on presence of matching ID
- fc40d23 - (Tim Martin) Merged in feature/import-fixes (pull request #301)
Flow import fixes
- 390b67a - (Tim Martin) Merged in feature/HPC-1295-src-and-dest-functional-review (pull request #300)
HPC-1295: Funding Sources and Destination Functional Review Findings
- 3ca5ec4 - (Mark Boyd) code style fix
- dc10475 - (Mark Boyd) fix flow import to uniqueness in flow updating
- 2c5a3ed - (Eduardo Velez) HPC-1295: Funding Sources and Destination Functional Review Findings
- 1fd1754 - (Tim Martin) Merged in mboyd/HPC-1180-pending-list-updates (pull request #299)
Pending list updates
- 5e0ae06 - (Tim Martin) Added search parameters for flowID and amountUSD
- f288cb8 - (Mark Boyd) update query for pending flows to include external reference data
- c70355c - (Joe Turgeon) Merged in bug/getflows-issue (pull request #298)
Fixed issue with flow variable
- 175b067 - (Tim Martin) Fixed issue with flow variable
- 21f6977 - (Tim Martin) Merged in bug/participantRole-migration (pull request #297)
Added error handing to migration
- 930eac3 - (Tim Martin) Added error handing to migration
- 6778b66 - (Mark Boyd) merged in develop
- de5923c - (Tim Martin) Merged in feature/HPC-1220-created_updated_user (pull request #295)
HPC-1220: Adding activity record when flows are updated. Loading activity stream for flows and integrating last updater and creator data.
Hpc 1272 error with removing roles from
Import updates
HPC-1060/HPC-1061: Ensuring behavior to populate Sources and Destinations based on a Parent or Child Flow functions when creating a new flow.
HPC-1059: Updating type validation logic
- 3fe2dc9 - (Ataur Chowdhury) Removed empty garbage files
- 3822076 - (Ataur Chowdhury) HPC-1270: made calls to role table, then generated the participant response so that it refelects the previous response pattern
- df9d38e - (Ataur Chowdhury) HPC-1272: added migration to remove existing db constraint
- af9d0c1 - (Tim Martin) Added logic to search for flowObjects
- c90ed6e - (Tim Martin) Added logic to prevent duplicate category joins
- 5154daa - (Joe Turgeon) HPC-1220: Adding activity record when flows are updated. Loading activity stream for flows and integrating last updater and creator data.
- e29a745 - (Mark Boyd) join externalReference data for use in pending flow list
- b3fd5e4 - (Joe Turgeon) HPC-1060/HPC-1061: Ensuring behavior to populate Sources and Destinations based on a Parent or Child Flow functions when creating a new flow.
- ba6c016 - (Joe Turgeon) HPC-1059: Updating type validation logic to only consider source/destination orgs matching if there is at least one source or destination org.
- 786ea98 - (Mark Boyd) add logic to store project cluster as flow destination cluster & include underfunded CERF flows for testing
- 16fb844 - (Tim Martin) Merged in feature/HPC-1051-funding-sources-and-destinations (pull request #291)
HPC-1051: Edits for funding sources and destinations items
- 924175a - (Tim Martin) Added logic to retrieve participantRoles manually
- 086c57e - (Eduardo Velez) remove log
- f351276 - (Eduardo Velez) HPC-1051: Edits for funding sources and destinations items
- cb17523 - (Mark Boyd) remove debugging lines
- 88212da - (Mark Boyd) HPC-1142: ensure all relevant clusters are associated with plan
- 73819bb - (Tim Martin) Merged in feature/HPC-1060-link_parent_flow (pull request #289)
HPC-1060/HPC-1203/HPC-1061/HPC-1204: Adding behavior to populate Sources and Destinations when a flow is linked/unlinked as a Parent Flow or as a Child Flow.
HPC-1059: Fixing validation on flow type when multiple source or destination organizations are selected.
- b523744 - (Joe Turgeon) Reworking _getFlowById() as _getActiveFlowById() to ensure the function returns the currently active flow.
- 81cfc9a - (Tim Martin) Added logic to filter flowSearch categories
- b83cdd9 - (Joe Turgeon) HPC-1059: Fixing validation on flow type when multiple source or destination organizations are selected.
- 2d82b5f - (Joe Turgeon) HPC-1060/HPC-1203/HPC-1061/HPC-1204: Adding behavior to populate Sources and Destinations when a flow is linked/unlinked as a Parent Flow or as a Child Flow.
- 35aa82c - (Tim Martin) Changed limit back to 50
- 0ba11c6 - (Tim Martin) Merged in feature/prevent-squel-query-injection (pull request #288)
Prevent SQL query injection on queries manually built with Squel module
- 2e35a1c - (Mark Boyd) code style fix
- ff07edb - (Mark Boyd) update use of squel module and flow controllers to pass replacement values onto sequelize and prevent SQL injection
- 0badaf8 - (Mark Boyd) more import updates
- e7f8049 - (Tim Martin) Added search functionality to flowQuery
- 1791c85 - (Tim Martin) Merged in feature/HPC-1059-type_validation (pull request #287)
HPC-1059: Adding flow save validation
HPC-1215: Added First reported date
- 3a5f5e7 - (Joe Turgeon) HPC-1059: Adding validation to ensure that when the source and destination organization match, the funding type is Internal.
- 580dbf9 - (Joe Turgeon) HPC-1059: Adding validation for the Allocation funding type and Pooled Fund source organization case.
- bc279ef - (Mark Boyd) HPC-1279: migrate any contributions with value greater than or equal to 0
- 49d3d46 - (Mark Boyd) HPC-1251: add rules for new poold fund, org ID 17682
- d68a1aa - (Eduardo Velez) Merged in mboyd/flow-saving (pull request #286)
Flow edit changes (HPC-1145 & HPC-1146)
- 3ab40ab - (Eduardo Velez) HPC-1215: Added First reported date
- 5d564ed - (Mark Boyd) change category saving back to using instance method, with options for versionID
- ac629a6 - (Mark Boyd) change flow categories to save using current flow version ID
- 424eb69 - (Mark Boyd) use version to retrieve report details and external data
- 9425a6d - (Tim Martin) Merged in feature/flowQuery-controller (pull request #284)
remove erroneous module reference
- bccffbe - (Mark Boyd) remove erroneous module reference
- 5349419 - (Tim Martin) Added flowSearch controller
- 481d3c4 - (Tim Martin) Merged in mboyd/flow-list (pull request #283)
Flow lists: HPC-1163 & HPC-1180
- 277d99e - (Mark Boyd) added sorting by reportChannel name for pending flows list
- 10d7e0e - (Mark Boyd) add flow count to flow results
- 757b891 - (Mark Boyd) remove debugging lines
- afdeac2 - (Mark Boyd) fix sorting by organization objects
- d588932 - (Mark Boyd) add defensive coding to join method
- 8f8d6d6 - (Mark Boyd) fix null handling for flow query ordering
- fd9642a - (Mark Boyd) move flow query builder into separate file
- 37df321 - (Mark Boyd) add custom handler squel query order handlng
- d1ca14c - (Tim Martin) Merged in feature/add-edris-test-ftp (pull request #282)
Changed EDRIS FTP to test server
- bdc91d7 - (Tim Martin) Changed EDRIS FTP to test server
- 8a57abc - (Mark Boyd) add more sorting ability by organization objects
- 53ca0e1 - (Mark Boyd) more work re-factoring sorting and grouping for custom flow queries
- cfeeda3 - (Mark Boyd) allow sorting flows by object parameters
- 45e959f - (Mark Boyd) refactor raw flow queries for re-use
- 2798a6f - (Mark Boyd) more work on flow list
- 8aace6a - (Mark Boyd) merged in develop;
- 1c55dae - (Mark Boyd) simplify output for flow list endpoint
- 0e5af30 - (Mark Boyd) flow list endpoint working
- b2f5de8 - (Mark Boyd) trying to de-duplicate flow results
- a83cf27 - (Mark Boyd) fix sort order logic
- 81fc241 - (Mark Boyd) manual query of flows including condition for category of "restricted"
- 9036b55 - (Tim Martin) Merged in feature/HPC-1205-save-reporting-details (pull request #281)
HPC-1205 save reporting details
- 2d04626 - (Mark Boyd) custom flow query is working, but not returning formatted results
- 3e60b6e - (Mark Boyd) trying to write manual query to filter flows by categories
- cb87c65 - (Tim Martin) Fixed syntax error
- a461386 - (Tim Martin) Added logic to remove existing flow reporting details
- f87ece6 - (Tim Martin) Added logic to create/update reporting details during flow create/update
- 4dc4604 - (Mark Boyd) alter flow controller to filter flows by categories (still testing)
- 2dfd286 - (Mark Boyd) add grouping and count of all rows to main flow endpoint
- 2e34739 - (Mark Boyd) add ability for custom ordering of flow data
- 29486e1 - (Mark Boyd) add limit and offset parameters for flow list endpoint
- 48cbead - (Tim Martin) Merged in HPC-1218-participant-seed-issue (pull request #277)
changed the function to add roles rather than overwriting them
Various import updates
Added "Traditional aid" category to all EDRIS imported flow records
- 76c5ba9 - (Mark Boyd) HPC-1235: add special rules when donor is ERF (ID 8487)
- a1ce2ce - (Tim Martin) Added "Traditional aid" category to all EDRIS imported flow records Updated "Pending Review" category mappings to "Pending review"
- 670f370 - (Mark Boyd) HPC-1239: associate "cash" contributions with "financial" contribution type
- 5ff54b7 - (Mark Boyd) HPC-1257: assign "method" category of "Traditional aid" when "contributionType" is "Contribution" or "Allocation"
- 968a672 - (Tim Martin) Hotfix to change flowObject delete flag
- 811de7e - (Mark Boyd) HPC-1255: update categories for "method" category group
- 12a4869 - (Mark Boyd) HPC-1239: change contribution type "Cash" to "Financial"
- 2e2b90f - (Mark Boyd) remove unique index on category name and group fields
- 562487c - (Mark Boyd) rename categories import files
- 67d7102 - (Eduardo Velez) Merged in feature/HPC-1206-flow-save (pull request #276)
Added logic to save flow objects on create and update flow functions
fix incorrect variable reference in flow import
- b02d3be - (Mark Boyd) fix incorrect variable reference in flow import
- 2f61085 - (Vincent Perrin) changed the function to add roles rather than overwriting them
- 3d01ce9 - (Tim Martin) Merged in feature/report-docs (pull request #275)
Add config for location of report documents on dev & stage environments
Legacy pending flows import
- b43d5a6 - (Tim Martin) Removed duplicate semicolon
- ac0d405 - (Tim Martin) Added logic to save flow objects on create and update flow functions
- e25fd04 - (Mark Boyd) add config for location of report documents on dev & stage environments
- 037fda2 - (Mark Boyd) change logic to allow report detail saving for any flow version
- 9e06150 - (Mark Boyd) fix incorrect reference for external data sources
- 4676e80 - (Mark Boyd) adjust upload pending flow import to avoid duplicates
- 9caa3a9 - (Mark Boyd) fix undefined variable errors in pending flow import
- 749d5dc - (Mark Boyd) change flow controllers to retrieve only report details for current version, if specified
- 27f8bcd - (Mark Boyd) add versionID column to externalData model
- 4df43c0 - (Mark Boyd) migration of update pending flows is working
- a9e67b3 - (Mark Boyd) add update flows to pending flows import
- 10f73d2 - (Mark Boyd) change pending flows import to be more abstract to support upload and update flows;
- 854b70d - (Mark Boyd) prevent report details from being erroneously created multiple times
- 429df69 - (Mark Boyd) add rollback for pending flows
- 0a2fb3d - (Mark Boyd) fix incorrect model names in pending flow import
- e4dfce7 - (Mark Boyd) add saving of external reference and external data for upload flows
- 2f37a6f - (Mark Boyd) set mappings from contribution upload data to flow data
- 65933fc - (Mark Boyd) setting up import for upload flows
- 18e87f2 - (Mark Boyd) Merged in feature/reportDocs-fix (pull request #273)
remove dependency on request module
- 683fe95 - (Mark Boyd) remove dependency on request module
- 2ce3cee - (Mark Boyd) add matched column to externalData model
- d0205ef - (Tim Martin) Merged in mboyd/HPC-1038-report-documents (pull request #272)
HPC-1038: report documents
- e1c7cb1 - (Mark Boyd) prevent file assets from being created for non-existent flows
- 52c91f2 - (Mark Boyd) finish logic for rolling back report details and files
- dffcb7d - (Mark Boyd) merged in develop
- 4e08ddc - (Tim Martin) Merged in feature/HPC-1171-multiple-values (pull request #271)
Feature/hpc 1171 multiple values
- 263c066 - (Tim Martin) Removed unnecessary spacing
- 036f06a - (Tim Martin) Added logic for adding amounts
- 1637f91 - (Mark Boyd) working on deleting report details, report files, file assets, and actual files on flow rollback/delete
- a325eee - (Mark Boyd) add logic to save report documents with correct path and location
- 9890ce3 - (Mark Boyd) adjust report docs import to move files into correct place
- 0da9b2e - (Mark Boyd) move report documents into permanent storage location
- 6fad363 - (Mark Boyd) adding rollback for imported report documents
- 33e9291 - (Mark Boyd) create reportFile instances and attach to reportDetails
- 0049006 - (Mark Boyd) add flows with report document to import
- 89b603b - (Mark Boyd) create fileAssetEntities for report documents
- 9ee63ab - (Mark Boyd) attempting to post to service to create file entities for report documents
- f8739bb - (Tim Martin) Merged in mboyd/HPC-1123-flow-delete (pull request #270)
HPC-1123: flow delete
- f3167a3 - (Mark Boyd) add import file for report documents
- 1a4bdf5 - (Mark Boyd) add configuration for storage of legacy report documents
- 7e24110 - (Mark Boyd) remove default scope for activeStatus = true on flows
- 870fecb - (Mark Boyd) set activeStatus = false for deleted flows
- bced7d3 - (Tim Martin) Changed scope for external data query
- ad761bc - (Mark Boyd) Merged in feature/query-fix (pull request #269)
remove limit from pooled contributions import
- b7b3e4a - (Mark Boyd) remove limit from pooled contributions import
- 7949bcf - (Tim Martin) Merged in mboyd/HPC-1236-pooled-projects (pull request #268)
HPC-1236: pooled projects
- 7ebc53d - (Mark Boyd) format comments
- 8669e1f - (Mark Boyd) remove debug messages
- a666c57 - (Mark Boyd) refactor flow model associations and controllers to optimize performance
- 0af1299 - (Mark Boyd) add cluster objects to flow endpoint output
- 9e87cde - (Mark Boyd) add import of cluster objects on flows
- 0748077 - (Mark Boyd) add more examples for testing
- 0e7f844 - (Mark Boyd) add new keywords for certain project codes
- 9e020c7 - (Mark Boyd) add information for pooled projects to all flow import queries
- e434a82 - (Tim Martin) Merged in mboyd/HPC-1230-clusters (pull request #267)
add routes & controllers to view clusters by ID and legacy ID
- 436bd61 - (Mark Boyd) add example flows for testing
- 0498397 - (Mark Boyd) remove unnecessary logging
- f1ae7e4 - (Mark Boyd) add routes & controllers to view clusters by ID and legacy ID
- e5f2d2f - (Tim Martin) Merged in mboyd/HPC-1219-global-clusters (pull request #266)
Add more mappings for sectors to global clusters & beneficiaryGroup categories
- a8ad713 - (Mark Boyd) add more mappings for sectors to global clusters & beneficiaryGroup categories
- f290849 - (Tim Martin) Hot fix for cron issue
- 50970b5 - (Mark Boyd) Merged in mboyd/HPC-1142-field-clusters (pull request #264)
HPC-1142: field clusters
add null parameter for callback in async waterfall chain to prevent processing from becoming hung
- 1e529f6 - (Mark Boyd) add null parameter for callback in async waterfall chain to prevent processing from becoming hung
- dd72f3a - (Mark Boyd) refactor plan import to ensure a plan instnace is always available
- c84eea6 - (Mark Boyd) add import to attach clusters to plans
- 9c858e1 - (Mark Boyd) add deletion of attachmentEntityCost associated to clusters when clusters are deleted
- b04a75e - (Tim Martin) Merged in feature/create-edris-cron (pull request #263)
Feature/create edris cron
- cee7e34 - (Tim Martin) Removed EDRIS import functionality from cron.js and created a separate script
- 7c73403 - (Tim Martin) Merged in feature/HPC-1240-update-org-name (pull request #262)
Add project details to flow <CAP_reference>
- 962917d - (Tim Martin) Removed err message
- 6f4f77a - (Tim Martin) Added logic to associate project details to flow Added new endpoint for getting flows by externalID
- 05b180f - (Mark Boyd) successfully add costs for imported clusters
- c987cad - (Mark Boyd) add saving for cluster costs
- 03cfb22 - (Mark Boyd) change cluster import to process records synchronously
- 62a3f97 - (Mark Boyd) finish import for clusters & add rollback for clusters
- 62ae375 - (Mark Boyd) add import for clusters
- c915fd0 - (Tim Martin) Merged in mboyd/flow-fixes (pull request #261)
fix query for contribution transformation data & code style fixes
HPC-1202: project categories
- 755b689 - (Mark Boyd) fix query for contribution transformation data & code style fixes
- 68b70b4 - (Mark Boyd) code style fix
- 2b6f0cd - (Mark Boyd) remove merge conflict lines
- 423d91b - (Mark Boyd) merging in develop
- caa93ad - (Mark Boyd) more code style fixes
- c57d190 - (Mark Boyd) add non-standard location names to projectGrouping1 categories for plans
- 885f19f - (Mark Boyd) code style fix
- 6a0bb47 - (Mark Boyd) adding import of erroneous project location categories into project group 1 category group
- 2e4d0fe - (Mark Boyd) update name for government organizations & ensure internal orgs are not imported
- 093e3fe - (Tim Martin) Removed duplicate callback
- 5d73b0d - (Tim Martin) Modified destination organization string for donor countries
- 7f1cbe6 - (Tim Martin) Added spacing
- 99f5d6b - (Tim Martin) Updated contribution status and flow type logic
- 02e99e3 - (Mark Boyd) add custom list of government organization IDs for identification during import
- a8bf5d8 - (Mark Boyd) prepend government organization names with "Government of"
- f93d3b7 - (Mark Boyd) fix string parsing for reference direction
- 1c2da5d - (Mark Boyd) remove negative balancing entry flow IDs from import
- 0098458 - (Mark Boyd) add import for appeals from contribution transformation table
- 70a8ee4 - (Mark Boyd) update import query to include all new keywords from contribution transformation table
- 58a7c53 - (Michael Kochendorfer) HPC-1123 Add logic for delete flow endpoint
- 0aefb8b - (Mark Boyd) only update organization associated entities with instance in place
- ff34b15 - (Mark Boyd) add defensive code for organizations legacy record creatino
- 437c0f8 - (Mark Boyd) hotfix for category import
- 8281ec7 - (Tim Martin) Added endpoint for getting pending flows
- 65b5b6d - (Eduardo Velez) HPC-1053: autocomplete search by id
- e42601d - (Mark Boyd) adding import of erroneous project location categories into project group 1 category group
- 5c2b482 - (Mark Boyd) Merged in mboyd/organization-names (pull request #259)
update name for government organizations & ensure internal orgs are not imported
- 938af70 - (Mark Boyd) update name for government organizations & ensure internal orgs are not imported
- 770f2a1 - (Mark Boyd) Merged in hotfix/archive-issue (pull request #258)
Removed duplicate callback
- 2e2f6ee - (Tim Martin) Removed duplicate callback
- 646ad7f - (Tim Martin) Added new function for project add
- e3401d1 - (Tim Martin) Merged in feature/HPC-1240-update-org-name (pull request #257)
Modified destination organization string for donor countries
- 9ff4dc6 - (Tim Martin) Modified destination organization string for donor countries
- cced689 - (Tim Martin) Merged in feature/HPC-1248-contribution-status-update (pull request #256)
Updated contribution status and flow type logic
- 7eb82c4 - (Tim Martin) Added spacing
- c60d45d - (Tim Martin) Updated contribution status and flow type logic
- 6514047 - (Tim Martin) Merged in mboyd/HPC-1139-organization-names (pull request #255)
HPC-1139: Government organization names
HPC-1231: special contributions
- 8816b4d - (Mark Boyd) add custom list of government organization IDs for identification during import
- 6b7a4bb - (Mark Boyd) prepend government organization names with "Government of"
- abbe778 - (Mark Boyd) fix string parsing for reference direction
- b386d11 - (Mark Boyd) remove negative balancing entry flow IDs from import
- dff0420 - (Mark Boyd) add import for appeals from contribution transformation table
- a25b737 - (Mark Boyd) update import query to include all new keywords from contribution transformation table
- fadc000 - (Mark Boyd) add more flows for testing
- a7c3f23 - (Tim Martin) Added logic for multiple locations
- 368e9a3 - (Tim Martin) Added arrays for organizations and countries
HPC-1123 Add logic for delete flow endpoint
Added endpoint for getting pending flows
HPC-1053: autocomplete search by id
- a393d15 - (Michael Kochendorfer) HPC-1123 Add logic for delete flow endpoint
- 1c3a575 - (Mark Boyd) only update organization associated entities with instance in place
- 760008b - (Mark Boyd) Merged in feature/organizations-hotfix (pull request #252)
add defensive code for organizations legacy record creatino
- 3e9495c - (Mark Boyd) add defensive code for organizations legacy record creatino
- 1a035d0 - (Mark Boyd) hotfix for category import
- 511816e - (Mark Boyd) add more flows for testing
- b2fa908 - (Mark Boyd) Merged in mboyd/HPC-1202-project-categories (pull request #248)
HPC-1202: project categories
- 767d1af - (Mark Boyd) improve logic for setting additional location and plan destinations
- 7525334 - (Mark Boyd) add import for destination location objects from contribution transformation table
- e2b75fb - (Mark Boyd) add processing for additinoal destination plans from contribution transform table
- db8bc35 - (Tim Martin) Added endpoint for getting pending flows
- 7dbb867 - (Eduardo Velez) HPC-1053: autocomplete search by id
- 4252eeb - (Mark Boyd) add association of subsetOfPlan categories to plan and projects
- 57786ae - (Mark Boyd) add association of projectGrouping1 categories with plans and projects
- 9ba6e98 - (Mark Boyd) add association of projectGrouping2 categories with projects
- 3518412 - (Mark Boyd) add association of projectPriority and projectGrouping2 categories to plans
- b8cc836 - (Mark Boyd) add association of customLocation categories with plans and projects
- d0d8dc9 - (Mark Boyd) merged in develop
- 75d4e79 - (Tim Martin) Merged in feature/HPC-1176-add-cancellation-request (pull request #247)
Added 'Pending Status' category
- b7816d7 - (Tim Martin) Added 'Pending Status' category
- 55d4ff4 - (Mark Boyd) Merged in feature/rollback-categories (pull request #246)
add ability to rollback categories
- 9977186 - (Mark Boyd) add ability to rollback categories
- 83bd156 - (Mark Boyd) Merged in feature/project-updates (pull request #243)
change projects import to process in series rather than in parallel
add special rules for contributions where donor ID is 5159 (Other income)
update rules for setting flow original amount and exchange rate
- 5df2038 - (Mark Boyd) add import for subset of plan categories
- e83861d - (Mark Boyd) add import for project grouping 2 categories
- 3826c35 - (Mark Boyd) add import for project grouping 1 categories
- 2c705aa - (Mark Boyd) ensure categry names are always trimmed to avoid duplicates due to whitespace
- 031ed54 - (Mark Boyd) add ability to rollback categories
- 0fd60b8 - (Mark Boyd) add import for project priority categories
- 4a457e2 - (Mark Boyd) set up project priority category import
- ba696f2 - (Mark Boyd) add import for custom location categories
- 70b8e3b - (Mark Boyd) add category group for custom locations
- 7af2f52 - (Mark Boyd) update rules for setting flow original amount and exchange rate
- 72f6f49 - (Mark Boyd) add special rules for contributions where donor ID is 5159 (Other income)
- 5845810 - (Mark Boyd) change projects import to process in series rather than in parallel
- 4e226e1 - (Tim Martin) Merged in mboyd/HPC-990-pooled-projects (pull request #242)
fix logic for setting flow objects for pooled contributions
- 84b691c - (Mark Boyd) fix logic for setting flow objects for pooled contributions
- 031b485 - (Tim Martin) Merged in feature/HPC-1109-fix_flow_save_bug (pull request #241)
Minor fix for Flow save bug
Import documentation
HPC-1152: Import, Store and Display Currency Values
- 2d14865 - (Joe Turgeon) HPC-1109: Fixes a flow save bug due to attempting to save incomplete flow file reporting attachments.
- d35863d - (Mark Boyd) fix typo
- 921fe12 - (Mark Boyd) add documentation on rolling back imported records
- 89b7138 - (Mark Boyd) update documentation for FTS imports
- 145adb4 - (Mark Boyd) Merged in mboyd/carryover-fix (pull request #239)
set source year for carryover flows to one less than the destination year && add standard as the default flow type
- 64ace70 - (Mark Boyd) set source year for carryover flows to one less than the destination year && add standard as the default flow type
- 3c94370 - (Eduardo Velez) HPC-1152: Import, Store and Display Currency Values
- 17a802e - (Tim Martin) Merged in feature/HPC-1059-flow_type_validation (pull request #234)
HPC-1059: Implementing flow type validation behavior.
Feature/hpc 1019 process edris file
- e3975ce - (Tim Martin) Added logic for cancelled records
- 33ee191 - (Mark Boyd) Merged in feature/pooled-import-hotfix (pull request #236)
add flag for processing pooled contributions
- 3251cab - (Mark Boyd) add flag for processing pooled contributions
- 3636fba - (Tim Martin) Added logic to see if parent flow is parked
- 667940f - (Mark Boyd) Merged in mboyd/HPC-990-pooled-project (pull request #233)
HPC-990: pooled project
- 17dd440 - (Mark Boyd) uncommented necessary lines
- b85a1e0 - (Mark Boyd) Merged in mboyd/HPC-1087-method-category (pull request #235)
add import for new method categories
- deee03d - (Mark Boyd) add import for new method categories
- 9d03669 - (Joe Turgeon) HPC-1059: Implementing flow type validation behavior.
- f8959ae - (Mark Boyd) finalized special conditions for pooled contributions
- 3172a32 - (Mark Boyd) code style fixes
- fdd0474 - (Mark Boyd) add missing condition for source organization
- 8684911 - (Mark Boyd) fix syntax error
- 9b7c69b - (Mark Boyd) add special condition for source project of pooled contributions
- 86678c1 - (Mark Boyd) add special conditions for source location of pooled contributions
- 607fbd0 - (Mark Boyd) add special conditions for source organization of pooled contributions
- 0968cdc - (Mark Boyd) add special rule for source year of pooled contributions
- 4fd507b - (Mark Boyd) add import for source plan objects for pooled contributions
- e577ee8 - (Tim Martin) Added logic to link parent flows for linked_commitment values
- 8cc840e - (Mark Boyd) write query for pooled contributions import
- 266beb6 - (Tim Martin) Merged in mboyd/HPC-917-project-taxonomy (pull request #232)
HPC-917: project taxonomy
- 7d33b02 - (Tim Martin) Merged in mkochendorfer/HPC-1154-strategic-objective-saving (pull request #231)
HPC-1154 Correctly save the strategic objective alignment for a cluster objective
HPC-1060: Extending flow save/update controller to link and unlink parent flows.
- ade53df - (Mark Boyd) fix for flow controller to load by id and version ID
- 84720a7 - (Mark Boyd) remove redundant code
- eea4e4c - (Mark Boyd) update category output for flows
- a3936c8 - (Mark Boyd) add category output to project controllers
- f3c4580 - (Mark Boyd) add import for attaching project categories
- d360583 - (Michael Kochendorfer) HPC-1154 Correctly save the strategic objective alignment for a cluster objective
- 13cc1e9 - (Mark Boyd) add import for genderMarker categories
- d8625b3 - (Tim Martin) Added logic for versioning categories
- 991fed6 - (Tim Martin) Added logic for versioning flows
- 5104735 - (Joe Turgeon) HPC-1061: Adding validateFlow middleware function to flow create and update routes to allow data validation before the flow is saved.
- 5b89103 - (Mark Boyd) Merged in feature/other-flows-import (pull request #230)
Other flows import
- edb2bb8 - (Mark Boyd) add more example flows to import for testing
- 51d1da2 - (Mark Boyd) move import of other flows into single function
- 206494b - (Joe Turgeon) HPC-1061: Adding support for linking child flows. Fixing support for removing all existing links on a flow.
- 22d4c75 - (Tim Martin) Merged in feature/HPC-1074-report-doc (pull request #227)
HPC-1074: Report Documentation
HPC-930: map sectors clusters
- a062bfb - (Mark Boyd) fix variable reference
- eabbdd4 - (Mark Boyd) Merged in mboyd/HPC-1092-global-cluster (pull request #226)
HPC-1092: global cluster
HPC-989: carryover
HPC-1151/HPC-998: Import flows with modified data
- a21b98e - (Mark Boyd) map sectors to keyword categories
- 04c52a2 - (Mark Boyd) map sectors to global cluster flow objects
- 12031d6 - (Joe Turgeon) HPC-1060: Extending flow save/update controller to link and unlink parent flows.
- 9b8d89f - (Eduardo Velez) remove log
- 7f15367 - (Eduardo Velez) HPC-1074: Report Documentation
- 478aac9 - (Mark Boyd) remove unnecessary module requirement
- 9b5ce4a - (Mark Boyd) improve global cluster import to allow updating of records, if necessary
- 5dd9ec6 - (Mark Boyd) add import for global clusters to main import script
- 48e6aa8 - (Mark Boyd) create import for new, unofficial global clusters
- 16622be - (Mark Boyd) set source year for carryover flows to one less than the contribution year
- b2953df - (Mark Boyd) remove conditions setting appeal, project, and emergency as source for carryover flows
- 968746d - (Mark Boyd) add import for specific flows with data from contribution transform table
- 52b4846 - (Mark Boyd) set fundingType to internal when donor and recipient are the same
- 4aebe1a - (Tim Martin) Merged in feature/HPC-1019-process-edris-file (pull request #223)
Feature/hpc 1019 process edris file
- 04aaba7 - (Tim Martin) Added check for duplicate records
- aa052b3 - (Tim Martin) Added externalReference model
- 2c3024e - (Tim Martin) Added reportDetails to EDRIS flows
- 6e8e082 - (Mark Boyd) import donor from contribution transformation table, if one exists
- 7b26987 - (Mark Boyd) add import for category values stored in contribution transform table
- 48a0e12 - (Mark Boyd) Merged in feature/rollback-orgs (pull request #222)
add rollback for organizations associated to projects
- 5dbcb70 - (Mark Boyd) remove debugging code
- 7901919 - (Mark Boyd) remove unnecessary modules for organization import
- 54cba86 - (Mark Boyd) remove duplicate code
- 4ddc3ed - (Mark Boyd) remove debugging statements
- 57c1617 - (Mark Boyd) updated organizations to ensure new organizations are processed correctly
- 0152bbf - (Tim Martin) Added flow notes logic
- 2d7f8fc - (Mark Boyd) add rollback for organizations associated to projects
- 2cf23ad - (Mark Boyd) Merged in feature/object-rollback (pull request #221)
add deletion of flow objects to rollback
- e7f5445 - (Mark Boyd) add deletion of flow objects to rollback
- a0350bb - (Tim Martin) Merged in feature/HPC-1019-process-edris-file (pull request #220)
Feature/hpc 1019 process edris file
- 83f08c8 - (Tim Martin) Uncommented archive logic
- 1fb953c - (Tim Martin) Added logic for globalCluster mapping
- 5df7312 - (Mark Boyd) Merged in feature/projects-import (pull request #219)
Make projects import opt-in rather than automatic given the volume of records
- 458f779 - (Mark Boyd) remove organization ID 8187 as an excluded organization from import
- e0325e3 - (Mark Boyd) make projects import opt-in rather than automatic given the volume of records
- 660d5ad - (Mark Boyd) Merged in mboyd/HPC-989-carryover (pull request #218)
HPC-989: carryover
HPC-1143: original pledges
HPC-1014: project objects
HPC-922: projects import
- 00d8d3b - (Mark Boyd) remove extraneous flowObject output from service output for flows
- 53ea15f - (Mark Boyd) uncommented non carryover flow import
- dd318c0 - (Mark Boyd) increase limit for carryover flow import to 100
- 86b6e27 - (Mark Boyd) remove extraneous conditions from carryover flow import
- 6a2147b - (Mark Boyd) add grouping by contribution ID to basic flow import query
- a612353 - (Mark Boyd) fix syntax error
- 8c2821b - (Mark Boyd) fix syntax error
- 9cbba3d - (Mark Boyd) add logic to specify source and destination objects for carryover flows
- af40dd7 - (Mark Boyd) add import of categories for carryover flows
- 3e7af9d - (Mark Boyd) add Internal as a fundingType category
- ac64fd0 - (Mark Boyd) add mappings for pledge original amount and exchange rate to flow import
- ddf4094 - (Mark Boyd) refactor flow import queries to allow easier updating of flows by ID
- fb1ff3c - (Mark Boyd) add new mapping for original amount of original pledge flow versions
- e8f0375 - (Mark Boyd) add rollback for categories connected to projects
- fd26ce2 - (Mark Boyd) updates to emegency and project imports
- 791237b8 - (Mark Boyd) move retrieval of dummy emergency ID for RRP overlap to a function
- 30a03c9 - (Joe Turgeon) Merged in feature/HPC-1052-report-details (pull request #213)
HPC-1052: report details
- 506d02e - (Tim Martin) Added core objects to flow
- 349fda4 - (Mark Boyd) add code to attach project objects to flows
- a53818c - (Mark Boyd) prevent project records for overriding updated date if there is no source values
- 19b718d - (Mark Boyd) change name colum on project column to TEXT type, as project names may be greater than 255 chars
- 544876f - (Mark Boyd) remove unique constraint for project name
- 18d92bf - (Mark Boyd) fix logic for associating organizatinos to projects
- 226becc - (Mark Boyd) fix syntax error
- 6f7632f - (Mark Boyd) finalize exclusion conditions for projects migration
- d60a9bd - (Mark Boyd) add code to ensure new project records are saved with the updatedAt value from the legacy data
- 520a3de - (Tim Martin) Fixed issue with object creation
- 459637a - (Mark Boyd) update save logic for projects import to associate projects with collective organizations
- c3a1992 - (Eduardo Velez) remove logs
- 0349b1a - (Eduardo Velez) HPC-1052: report details
- b63b426 - (Tim Martin) Added function for saving all objects
- 4315b06 - (Mark Boyd) add ability to rollback projects
- 5f62251 - (Mark Boyd) add routes and controllers for projects
- 6a04377 - (Mark Boyd) fix code to lookup related organizations for projects
- 851cd32 - (Mark Boyd) add import for organizations associated with projects
- 3fa40fb - (Mark Boyd) update project exclusion conditions
- 7374ded - (Mark Boyd) add association between project and many organizations
- fdc15e6 - (Mark Boyd) add import code to attach plan to projects
- 1442b6c - (Mark Boyd) add associations for project to plan and location models & add exclude conditinos for project import
- c9d48f9 - (Tim Martin) README.md edited online with Bitbucket
- ebb9e85 - (Tim Martin) README.md edited online with Bitbucket
- 151e7b9 - (Tim Martin) README.md edited online with Bitbucket
- a298081 - (Mark Boyd) add uniqueness for project code & set up project import
- d8ef627 - (Mark Boyd) preserve unique index on name column for project model, pending further review
- d70ad9a - (Tim Martin) Merged in feature/HPC-1019-process-edris-file (pull request #212)
Feature/hpc 1019 process edris file
- 5015cea - (Tim Martin) Added externalRefDate field
- 8408c5d - (Tim Martin) Uncommented archive logic
- 3953276 - (Tim Martin) Merged in mboyd/HPC-1091-default-categories (pull request #211)
HPC-1091: default categories
- 9b29a39 - (Tim Martin) Added exclude logic
- 71e8d25 - (Mark Boyd) add rest of columns to project model and migration to create them
- 37414b6 - (Tim Martin) Added model for externalData
- a8f79be - (Mark Boyd) add code column to project model, working on migration to add column
- ee4a801 - (Mark Boyd) set up basic script to import projects
- 7654da0 - (Mark Boyd) code style fix
- deee84b - (Mark Boyd) add rollback for emergencies and improve parallel processing for emergencies
- 593e4c0 - (Mark Boyd) add default categories for keywords and beneficiaryGroup
- 0cf2924 - (Mark Boyd) Merged in mboyd/parked-flows (pull request #210)
change parked flow value calculation
- 5757fae - (Mark Boyd) change parked flow value calculation
Conflicts: bin/lib/edrisImport.js
Fix flow import
- f9b0bfe - (Mark Boyd) fix flow import to upsert flows instead of plans
- 8ed55ec - (Mark Boyd) add rollback behavior for plans
- af30213 - (Tim Martin) Merged in bug/ftp-issue (pull request #208)
Fixed issue
- 642ebc7 - (Tim Martin) Fixed issue
- 4a489db - (Tim Martin) Added source and destination logic
- 59d0829 - (Tim Martin) Merged in bug/ftp-issue (pull request #207)
Removed callback error
- 3264ec3 - (Tim Martin) Removed callback error
- 787450e - (Mark Boyd) Merged in feature/flow-amount (pull request #206)
fix migration for flow amount column to avoid harmful column dropping behavior
- cd373b6 - (Mark Boyd) fix migration for flow amount column to avoid harmful column dropping behavior
- 6b57063 - (Tim Martin) Merged in bug/ftp-issue (pull request #205)
Added FTP error logic
- 8c37cbe - (Tim Martin) Added FTP error logic
- 6e93e34 - (Mark Boyd) Merged in mboyd/organizations-fixes (pull request #204)
Organization import fixes
- 7b38580 - (Mark Boyd) renamed folder for common model helpers
- 5083da5 - (Mark Boyd) rename folder for fts model helper functions
- 9060d77 - (Mark Boyd) fixed flow rollback behavior
- 311240f - (Mark Boyd) add legacy IDs for new organizations and improve organization rollback behavior
- b6f92b7 - (Mark Boyd) fix attachment of organization types for pooled funds
- 3861250 - (Mark Boyd) add missing variables to rollback functions
- d09856b - (Mark Boyd) move delete functions into helper files
- fc41007 - (Tim Martin) Merged in mboyd/HPC-918-parked-flows (pull request #203)
HPC-918: Fixes for parked flows
- 1369baf - (Mark Boyd) refactor rollback behavior and callbacks
- 25438c7 - (Mark Boyd) implemented rollback for organizations
- d0a6363 - (Mark Boyd) removed commented lines
- 3124056 - (Mark Boyd) change amountUSD column on flow model to BIGINT
- e090ccf - (Mark Boyd) remove commented lines for testing
- df4353c - (Mark Boyd) change logic for re-calculating parked flow value
- fca2e73 - (Mark Boyd) fixed issue with linking parked flows when there is a single child flow
- df4924b - (Tim Martin) Merged in mboyd/HPC-1143-original-pledge (pull request #202)
HPC-1143: Import original pledge data
- ea8c6ba - (Mark Boyd) only apply flowType of parked to non original pledge versions
- 123e791 - (Mark Boyd) implemented import for records with original pledge data
- 0cd660f - (Tim Martin) Merged in feature/HPC-1043-added-unscope-to-getFlow-and-saveFlowUpdate (pull request #201)
HPC-1043: Added unscope to getFlow() $ saveFlowUpdate()
- d781567 - (Mark Boyd) updated scripts to use new syntax for createAllObjectCategoryRefs
- f329e40 - (Mark Boyd) alter flow controllers to show categories for current version, if version argument exists
- 7458299 - (Mark Boyd) trying to restrict returned flow categories to current version
- c9d0cb1 - (Mark Boyd) fix code to prevent report details from being double processed
- b866fac - (Eduardo Velez) HPC-1043: Added unscope to getFlow() $ saveFlowUpdate()
- f049012 - (Mark Boyd) correct determination of flow amount
- 735a4eb - (Mark Boyd) fix logic for creating flows
- 283eb67 - (Tim Martin) Merged in feature/HPC-1109-flow_save (pull request #200)
HPC-1109: Endpoints for creating and updating funding flows
- b7f5384 - (Mark Boyd) add routes for viewing flows by version
- b35abe4 - (Mark Boyd) finish implementation for creating initial flow version for original pledge data
- 328c20f - (Tim Martin) Merged in mboyd/HPC-1028-import-reporting-details (pull request #199)
HPC-1028: reporting details
- 74c333b - (Mark Boyd) move flow legacy record creation to abstract callback
- a1327a3 - (Mark Boyd) add versionID column to categoryRef model
- 7015301 - (Mark Boyd) return categoryRef model to original state
- b35fd71 - (Joe Turgeon) HPC-1109: Fixes for associating categories on new flows.
- bda30e3 - (Mark Boyd) add versionID column to categoryRef model & trying to remove primary key constraints from categoryRef model
- 8542073 - (Joe Turgeon) HPC-1109: Initial work for handling flow saving.
- 0c64bbd - (Mark Boyd) add correct version for report details and fix early callback returns
- 1075286 - (Mark Boyd) minor adjustment to reportDetail schema, finish mapping elements to report details for flow import
- 9f46638 - (Mark Boyd) add reported method to notes on imported flow
- 27a2ff8 - (Mark Boyd) start implementing import to attach report details to flows
- 54268f0 - (Tim Martin) Merged in feature/HPC-1019-process-edris-file (pull request #198)
Feature/hpc 1019 process edris file
HPC-1037: Reporting details & files models
- af4b39c - (Tim Martin) Added budgetYear and description
- d11f67f - (Mark Boyd) remove reportLink model
- cde8dd2 - (Mark Boyd) refactor report file or URL storage to a single model
- 71f1364 - (Mark Boyd) added import for reportChannel terms
- 7103ebb - (Mark Boyd) add model for report files
- 039169d - (Mark Boyd) add relationship between flow and reportDetails
- cf3d114 - (Mark Boyd) add rest of columns to reportDetail model
- b557d84 - (Mark Boyd) start creating reportingDetail schema
- aaa9799 - (Tim Martin) Added logic for contributionStatus
- 59b45b9 - (Mark Boyd) Merged in mboyd/HPC-918-parked-contributions (pull request #196)
Mboyd/hpc 918 parked contributions
- 2e8a153 - (Mark Boyd) remove restriction for contribution value from parked flows import
- efe42e5 - (Mark Boyd) increase limit for parked flows import to 10
- f93cc8d - (Mark Boyd) finish logic to attach linked contributions as linked flows to a parked flow
- 533e617 - (Tim Martin) Merged in feature/HPC-1050-category-autocomplete (pull request #194)
HPC-1050: Added category autocomplete endpoint
- 196664f - (Mark Boyd) add code to attach flow links for parked flows
- bea4fc3 - (Mark Boyd) add sum of child linked flows to parked flow during import
- 67f458c - (Tim Martin) Merged in feature/fts-routes (pull request #193)
add auth middleware to flow and organization routes, prepend service version to flow routes
Mboyd/hpc 912 pooled funds
- 995b4a3 - (Mark Boyd) add handling for internal funding type
- 96a5f02 - (Mark Boyd) change conditions for applying funding type of contribution
- 8274971 - (Mark Boyd) add original pledge info to contribution queries
- e510ac6 - (Eduardo Velez) HPC-1050: Added category autocomplete endpoint
- 2666806 - (Mark Boyd) change conditions for assign funding type categories to flows
- 0d7e367 - (Mark Boyd) add auth middleware to flow and organization routes, prepend service version to flow routes
- 92daec0 - (Mark Boyd) add fundingType to flow ipmort
- 7b7f787 - (Mark Boyd) decreased limit for basic flow import
- abc66b7 - (Mark Boyd) HPC-995: refactor attaching objects to flows to accommodate collective organizations
- b4e7dc5 - (Mark Boyd) fix issue with adding legacy IDs in taxonomy import
- e2dd8b1 - (Mark Boyd) adding import for new organizations to flows
- 7e6ce74 - (Tim Martin) Merged in feature/HPC-1019-process-edris-file (pull request #189)
Feature/hpc 1019 process edris file
Feature/category updates
- cf79f74 - (Mark Boyd) remove unnecessary line
- 7f935c3 - (Mark Boyd) add new categories, update certain categories, refactor flow category seeding
- 1f8108b - (Mark Boyd) change In-kind to In kind
- 135956d - (Tim Martin) Merged in feature/HPC-1107-update-saving-behaviors-for-rpm (pull request #190)
HPC-1107: Updating saving behaviors for RPM
- 8b6a74a - (Eduardo Velez) merge conflict
- 6c48d9a - (Eduardo Velez) HPC-1107: Updating saving behaviors for RPM
- c9c23ac - (Tim Martin) Removed spacing
- 68c10da - (Tim Martin) Added archive functionality
- b921afd - (Mark Boyd) move identification for special organizations into separate function
- 1b635b5 - (Mark Boyd) Merged in mboyd/HPC-923-plan-import (pull request #188)
Mboyd/hpc 923 plan import
update conditions for hiding emergencies from RPM
fix import of categories for organizations & added parent organization info to organization output
- dc3ced2 - (Mark Boyd) add special conditions for contribution referencing org 15601
- b04035b - (Mark Boyd) increase limit on basic flows import to 1000
- e35764f - (Mark Boyd) HPC-1015: add organization objects to flow import
- fb90be1 - (Mark Boyd) update conditions for plan import
- 8a4eaee - (Mark Boyd) update query for importing plans
- 92d422e - (Mark Boyd) apply fix to import correct years for a plan
- d7c5c6b - (Mark Boyd) update conditions for hiding emergencies from RPM
- a57eaaa - (Mark Boyd) fix import of categories for organizations & added parent organization info to organization output
- 71d1965 - (Tim Martin) Added additional logic for flow level data
- 6279237 - (Mark Boyd) fix erroneous callback reference
- b0539a8 - (Tim Martin) Merged in HPC-1077-collective-orgs (pull request #185)
Hpc 1077 collective orgs
HPC-921: import organizations
- f8b8495 - (Mark Boyd) add migration for collectiveInd column and add code to import values for collectiveInd
- 6fb4140 - (Tim Martin) Merged in feature/HPC-1053-parent-and-child-flows (pull request #183)
HPC-1053: Funding Flow UI Screen - Link Parent and Child Flows
- 1ba4bd1 - (Mark Boyd) add column to indicate whether organization is collective
- 4109f4f - (Mark Boyd) add new organizations to import
- eeabe6e - (Mark Boyd) improve categories handling for organizations
- a9dbff4 - (Mark Boyd) add special categories for pooled fund organizations
- 7e371a3 - (Mark Boyd) remove redundant associations to legacy model
- bc67d6d - (Mark Boyd) update controllers by legacy ID to enforce object type
- e91e05d - (Mark Boyd) add organization native name and comments to import
- 24b7bf0 - (Mark Boyd) change update behavior for emergencies and organizations to use models and not instance
- ad34ef3 - (Mark Boyd) change how emergency records get updated
- 44fd7fa - (Mark Boyd) refactor organizations import to correctly process existing records
- 2abe43d - (Eduardo Velez) removed unwanted include
- 896251a - (Eduardo Velez) HPC-1053: Funding Flow UI Screen - Link Parent and Child Flows
- 859f7eb - (Mark Boyd) fix import to connect organization types with organizations
- c5d6e30 - (Mark Boyd) add controllers for viewing organizations by ID and legacy ID
- 9f42590 - (Tim Martin) Added additional logic
- dc234b9 - (Mark Boyd) refactor processing for organizations and creating of legacy records
- 5296667 - (Tim Martin) Merged in mboyd/HPC-919-organization-types (pull request #182)
HPC-919: Organization types
- 016d479 - (Mark Boyd) fix code formatting error
- 3896026 - (Mark Boyd) added organizations import to overall import script
- de0df10 - (Mark Boyd) add import for organization locations
- c914737 - (Mark Boyd) added import for organization parent
- 510082c - (Mark Boyd) add column for parent organization to organization model
- 2e8fdbf - (Mark Boyd) add URL column to organization import and model
- 99cce77 - (Mark Boyd) add organization abbreviation to import
- 41a5af3 - (Mark Boyd) add abbreviation column to organization model and migration to create column
- f38d3e2 - (Mark Boyd) create organization import script
- cf544b2 - (Mark Boyd) added sub categories for "NGO" organization type
- ccda032 - (Mark Boyd) change how taxonomy import looks for existing categories to accomodate new values and creating category parents
- a7662ae - (Mark Boyd) refactor category legacy lookup and add findCategory function
- ec2a84d - (Mark Boyd) add organizationType category group
- dd7640e - (Mark Boyd) change taxonomy imports to define term replacements by legacy ID, not legacy term name
- 599f214 - (Mark Boyd) ensuring category code is set before ccasting as a string
- ba3fdd2 - (Mark Boyd) fixed taxonomy import to ensure code attriute is cast as a string
- 2502f91 - (Mark Boyd) Merged in mboyd/HPC-1008 (pull request #180)
moved creation of objectExclude records into separate function for easier re-use
- 8627c10 - (Mark Boyd) moved creation of objectExclude records into separate function for easier re-use
- 5a3f867 - (Mark Boyd) Merged in feature/HPC-1051-and-autocomplete-endpoints-need-for-flows (pull request #177)
HPC-1051: Add autocomplete endpoints needed for flows
HPC-1013: plan objects
HPC-923: plan import
- 61a689c - (Mark Boyd) updated object exclude logic for emergencies to ensure plans are correctly excluded from RPM
- 6fa5938 - (Mark Boyd) change test for excluding plans from RPM to use appeal start date, not appeal year
- 283c164 - (Eduardo Velez) changed params for global cluster autocompletes
- 2c44797 - (Mark Boyd) add import code to associate plan objects with flows
- f354331 - (Mark Boyd) add route and controller for looking up plans by legacy ID
- 4051464 - (Mark Boyd) finish logic for associating plans with years based on the plan dates
- e27cb81 - (Mark Boyd) implement planCosting category group and attach plans to planCosting categories on import
- 165e037 - (Mark Boyd) add code column to category model
- a153a6f - (Mark Boyd) remove extraneous line from plan import
- accc49d - (Eduardo Velez) HPC-1051: Add autocomplete endpoints needed for flows
- fa5ebf0 - (Mark Boyd) added years to plan controllers
- cf82883 - (Mark Boyd) added active scope to plan model
- 25d30b4 - (Mark Boyd) fix plan import query & add association between plan and legacy models
- 45606ea - (Mark Boyd) add plan import to list of jobs and added more columns to plan import
- 1aaf3d7 - (Mark Boyd) added import to relate plans to years
- 1cad4c7 - (Mark Boyd) add import for associated locations and emergencies for plans
- 1bf2ac0 - (Mark Boyd) add comments column to plan model
- 361fc4e - (Mark Boyd) add launchDate column to plan model
- 0575701 - (Mark Boyd) add active column to plan model and add migration to create column
- 84c9cad - (Mark Boyd) create script for plan import
- 961eef4 - (Tim Martin) Added new flow create for each contract
- 72039de - (Tim Martin) Updated version to 0.7.0
- fc7b0c1 - (Mark Boyd) Merged in feature/common-seeding (pull request #176)
refactor common data seeding to exclude test participant seeding from required data
- 71d44b0 - (Mark Boyd) refactor common data seeding to exclude test participant seeding from required data
- dbc2fa2 - (Mark Boyd) Merged in feature/participant-seeding (pull request #175)
remove specific HID for test seed account to prevent duplicate participant seeding and mismatched roles
- 3e99018 - (Mark Boyd) remove specific HID for test seed account to prevent duplicate participant seeding and mismatched roles
- 4810ecc - (Mark Boyd) finish planType import & add routes and controllers for viewing categories by ID
- 643860a - (Mark Boyd) implement import for plan types. need to get legacyID added as primaryKey for categoryLegacy model
- d856c23 - (Mark Boyd) Merged in mboyd/HPC-1012-emergency-objects (pull request #174)
Mboyd/hpc 1012 emergency objects
HPC-916: emergency types
Added FTS admin role
- ccdc92d - (Mark Boyd) move handling for attaching imported flow objects to abstracted function
- 5b475f1 - (Mark Boyd) remove default active scope for emergencies and only apply it in full list of emergencies
- 56698f1 - (Mark Boyd) add association between flows and emergencies and update flow controllers to include emergency data
- ea5ec7e - (Mark Boyd) add import of emergency objects for flows
- b0fbb10 - (Mark Boyd) finish import attaching emergency types to emergencies and code cleanup
- cbe10a0 - (Mark Boyd) add import for attaching emergency types to emergencies
- 9cadfbf - (Mark Boyd) change emergencyType and planType terms to be in proper case & update drop data functionality
- 48d3222 - (Mark Boyd) Merged in hotfix/plan-controller (pull request #172)
add objectType to visible scope for emergencies and plans so plans are not incorrectly excluded
- 394bc9d - (Mark Boyd) add objectType to visible scope for emergencies and plans so plans are not incorrectly excluded
- 7b76de1 - (Tim Martin) Added error handling to EDRIS import
- f35eb42 - (Mark Boyd) Merged in mboyd/HPC-1090-cleanup (pull request #171)
Mboyd/hpc 1090 cleanup
- 474565a - (Mark Boyd) refactor drop models script to ensure data does not get out of sync
- f5074be - (Mark Boyd) Merged in feature/emergency-routes (pull request #170)
added route/controller to view emergency by legacy ID
- a8d465a - (Mark Boyd) added route/controller to view emergency by legacy ID
- 3ab5188 - (Eduardo Velez) Added FTS admin role
- c28647d - (Mark Boyd) add budgetYear column to flow model and add import for it
- e8301d4 - (Mark Boyd) fix flow import to allow processing specific flows by ID
- c948666 - (Mark Boyd) add conditions to prevent 2025 years from getting added as usage year objects
- 549c634 - (Mark Boyd) Merged in mboyd/HPC-988-in-kind (pull request #168)
HPC-988 in kind
add scope to hide inactive emergencies and apply scope to controllers
- a20b273 - (Mark Boyd) add scope to hide inactive emergencies and apply scope to controllers
- 96028c6 - (Mark Boyd) Merged in feature/HPC-924-migrate-emergencies (pull request #164)
HPC-924: Migrate emergencies
- 7bb068f - (Mark Boyd) add migrations for flows to ensure columns exist for import
- c52040b - (Tim Martin) Merged in feature/HPC-1017-download-echo-xml (pull request #166)
Added logic for downloading ECHO file
- 187ff9e - (Mark Boyd) change relationship between emergencies and objectExclude to be 1-1
- 532ffd0 - (Mark Boyd) fix erroneous name for column attribute
- ed910c0 - (Eduardo Velez) remove function call after upsert, no instance is provided
- 2b426ae - (Eduardo Velez) remove include on upsert
- 3f222df - (Eduardo Velez) Getting objectExclude table to populate for emergencies
- 258a885 - (Tim Martin) Merged in feature/location-scopes (pull request #165)
add variable for all models to reference in scopes to location model definition file
- c8c1f46 - (Tim Martin) Added logic for downloading ECHO file
- 03f41d2 - (Mark Boyd) add import for first 100 in-kind contributions
- ed28439 - (Mark Boyd) add variable for all models to reference in scopes to location model definition file
- a5b8e11 - (Eduardo Velez) Changed structure of objectExclude
- 6dd4d74 - (Eduardo Velez) Changed structure of objectExclude
- a002329 - (Eduardo Velez) Added condtional statement for objectExclude include
- fcee230 - (Eduardo Velez) deleted unwanted file
- e46a261 - (Eduardo Velez) Added missing include
- f000add - (Eduardo Velez) edits based on comments
- a5fa866 - (Eduardo Velez) remove debug file
- 61013e9 - (Eduardo Velez) merge conflicts
- df9448d - (Eduardo Velez) HPC-924: Migrate emergencies
- ef5ad96 - (Mark Boyd) code error fix
- 27d363e - (Mark Boyd) merge in develop
- 1e07a48 - (Mark Boyd) Merged in feature/import-improvements (pull request #163)
Feature/import improvements
- 31eeb94 - (Mark Boyd) update taxonomy import to respect update flag
- 3ff04df - (Mark Boyd) added logic to replace contribution type "InKind" with "In-kind"
- 5cfb0bc - (Mark Boyd) abstract timer functions as a utility and implement timer for import processes
- c7a9ce8 - (Mark Boyd) update instructions for creating FTS legacy database in MySQL container
- 393e28a - (Mark Boyd) changed connection to instantiated as the first callback in the chain for imports for clarity and to ensure it is ready
- c9a39f7 - (Mark Boyd) change logic for shutting down import if connection is not active
- 4818e9a - (Mark Boyd) add code to stop import process if there is connection to legacy data
- 502ebdb - (Eduardo Velez) debuging import
- 86b8511 - (Mark Boyd) add script to drop FTS models
- c0dac41 - (Mark Boyd) add import of flows related to Sudan 2012 emergency
- 22fec82 - (Mark Boyd) change flow import allow multiple flow imports processed in parallel
- f8f2f91 - (Mark Boyd) add more conditions to isolate basic flows for import
- 81f1062 - (Mark Boyd) moved callback utility functions to global utility file
- 27c46ae - (Mark Boyd) move files to enforce consistent file structure
- 4bb926b - (Mark Boyd) refactor category group seeding to put group types and names in a single function
- caaecb9 - (Mark Boyd) remove drop models action on service startup & split up required and test data seeding in service startup
- 41b852d - (Mark Boyd) split seeding functions up between required and test data
- 95eac83 - (Mark Boyd) add storage of legacy IDs for seeded test flow data
- 1933c2b - (Eduardo Velez) Merged in feature/HPC-1018-add-xml-parser (pull request #160)
Added libraries for xml parsing (xml2js) and FTP client (jsftp)
change database to read from for imports on dev and stage environments
- e7875db - (Mark Boyd) change database to read from for imports on dev and stage environments
- bd331a2 - (Mark Boyd) Merged in mboyd/additional-flow-data (pull request #161)
HPC-1031/HPC-1076: Additional flow data
Importing regions and associating them with locations
- 1831c2b - (Mark Boyd) add logic to import of regions for locations to skip previously imported records
- 6fdd44b - (Mark Boyd) improve data import status messages
- 73f49c6 - (Mark Boyd) change createObjectCategoryRef function to use findOrCreate instead of upsert for performance gain
- 2aec3ed - (Mark Boyd) move error catching callback in createObjectCategoryRef to conform to code style
- 2c4db6e - (Mark Boyd) add separate query to correctly sign updated dates for import flows & update flow controllers to not exclude inactive flows when searching by ID
- c81b2e5 - (Tim Martin) Added libraries for xml parsing (xml2js) and FTP client (jsftp)
- a682fc7 - (Mark Boyd) adding flow elements. cannot seem to set updatedAt manually and need to confirm that activeStatus & inactiveReason is set correctly for flows with emergency year of 2025
- d342494 - (Mark Boyd) merged in develop
- 7cf7d38 - (Mark Boyd) finished code to attach regions to locations, added location categories to endpoint for specific locations, refactored location controller and model to use scopes for model includes
- 88771b9 - (Tim Martin) Merged in feature/HPC-916-change-emergency-type-and-plan-type-to-category (pull request #158)
Allow seed.js to run from commandline
- b0675c5 - (Eduardo Velez) allow seed.js to run from commandline
- 45afbe5 - (Mark Boyd) documenting new import options
- 73f1456 - (Mark Boyd) merged in develop
- b32e743 - (Mark Boyd) Merged in feature/HPC-916-change-emergency-type-and-plan-type-to-category (pull request #157)
Feature/hpc 916 change emergency type and plan type to category
- ef2fa62 - (Eduardo Velez) merge conflict
- 8afb54d - (Eduardo Velez) refactored common seed
- e9af4bf - (Mark Boyd) fixed incorrect require paths
- 918c7d9 - (Mark Boyd) changed plan seeding to look for plans by ID, not name, to avoid SQL validation errors when trying to create plans with an existing ID
- 82daf9e - (Mark Boyd) changed default category seeding to use createCategory function for consistency
- 61a6e23 - (Mark Boyd) building import for associating regions to locations
- 06078ae - (Eduardo Velez) Remove unwanted line
- 74eb9bd - (Eduardo Velez) removed unwanted lines
- b984982 - (Eduardo Velez) merge conflicts
- 757ff38 - (Mark Boyd) adding location import file to handle attaching region categories to locations
- 492225a - (Tim Martin) Merged in mboyd/flow-text-fields (pull request #156)
Flow: Add import for description & notes fields
HPC-1055: exclude objects
- 2989dfd - (Eduardo Velez) Clean up
- d25f004 - (Mark Boyd) added import for regions category group
- ae818ca - (Eduardo Velez) merge conflicts
- 843f171 - (Mark Boyd) removed console.log
- fe1379b - (Mark Boyd) added minimist for handling command line arguments to scripts
- 483a938 - (Mark Boyd) improved handling for already imported flows and added ability to update already imported flows
- 2cf7414 - (Eduardo Velez) merging develop
- 5449237 - (Mark Boyd) improved handling for flow description
- d654a51 - (Mark Boyd) HPC-1036: added import for notes field on flow
- ca6acf4 - (Mark Boyd) added fields for description and notes to flow. added support for arguments to flow import and added import for flow description
- e219df4 - (Mark Boyd) removed unnecessary require
- 306713f - (Mark Boyd) added scope for excluding projects by module
- f5374b0 - (Mark Boyd) added scope to plan model giving ability to exclude them by module & added implementation of that scope to the plan controller listing all plans for RPM
- 6bd8e5f - (Mark Boyd) moved visiblity conditions from class method to scope
- 8ae45ce - (Mark Boyd) added model for excluding objects from different modules, added associations between exclude model and emergencies/plans/projects, tested using exclude model for emergencies
- d667236 - (Mark Boyd) implemented condition to exclude emergencies with reference in objectExcludes table from full emergencies list using Sequelize literal, need to see if it can be achieved using basic Sequelize query options
- f4bb075 - (Mark Boyd) implemented objectExcludes model and testing the exclusion of emergencies from the full list when a corresponding record exists in the objectExcludes table
- 03eab25 - (Mark Boyd) Merged in mboyd/HPC-1039-inactive-reason (pull request #154)
HPC-1039: inactive reason
- 410d6db - (Mark Boyd) refactored to support adding terms from custom list or from legacy data
- 39ef900 - (Mark Boyd) Merged in mboyd/HPC-962-contribution-types (pull request #153)
HPC-962: contribution types
HPC-914: flow locations
- 589a010 - (Mark Boyd) implementing import of new Inactive reason category group
- d40b296 - (Mark Boyd) HPC-962 & HPC-1033: added import for contributionType categories and references to flows
- dff533d - (Mark Boyd) moved order of validation & sanitization category functions
- e2f9e29 - (Mark Boyd) added ability to provide replacements for categories per group during import
- c7af74f - (Mark Boyd) changed taxonomy imports to use squel for building query strings
- 10cbdd2 - (Mark Boyd) commiting addition of squel package
- c5057cc - (Mark Boyd) refactored, added squel package for building query strings, added import for link between flow and destination locations
- 82c4606 - (Mark Boyd) added import for links between flows and destination location objects
- dc34be9 - (Mark Boyd) starting to implement association of locations to flows
- 7bca253 - (Joe Turgeon) Merged in mboyd/HPC-961-flow-dates (pull request #151)
HPC-961: flow dates
- ba97f9b - (Mark Boyd) merged in develop
- 8e314c0 - (Mark Boyd) updated README, finished implementing import for flowDate
- d076cff - (Mark Boyd) added documentation to README about postgres/sequelize timezone behavior
- db19a6f - (Tim Martin) Merged in import/full-data (pull request #150)
updated documentation with current link to full FTS export from backend
- f798dd5 - (Mark Boyd) updated documentation with current link to full FTS export from backend
- 27f9e5a - (Tim Martin) Merged in fix/add-model-arg-in-seed-funcs (pull request #148)
Added models arg to seed functions
HPC-963: Import of aid types and attachment to flows
- 44bba74 - (Mark Boyd) merging in develop branch
- 7a2ee16 - (Tim Martin) Merged in mboyd/HPC-1003-import-config (pull request #145)
HPC-1003: Import config
- 7efadef - (Tim Martin) Merged in feature/HPC-974-prevent-saving-outdated-plan-data (pull request #143)
HPC-974: Prevent saving outdated plan data
- d80a9bc - (Eduardo Velez) Added models arg to seed functions
- 8d810b4 - (Eduardo Velez) doing quick fix
- 2a9f935 - (Mark Boyd) finished import of aid types and attachment to flows
- b27e6ad - (Mark Boyd) fixed incorrect function reference
- 6662034 - (Mark Boyd) merging in develop
- 96739d8 - (Mark Boyd) clarifying import instructions
- 51be000 - (Mark Boyd) changed config to read connection info from string, removing duplicate instantiations of connection to FTS legacy data
- 1588aa5 - (Mark Boyd) updating mySQL settings to handle large dumps, updating name of FTS legacy DB in config, finishing instructions
- 80cafbe - (Mark Boyd) removed automation of mySQL db from server.js, added FTS legacy DB info to config, writing instructions for setting up local FTS legacy DB
- e95470b - (Mark Boyd) adding integration tests to ensure that mySQL db exists
- 6320270 - (Mark Boyd) changed mySQL connection to FTS source database to be read from environment config
- 23e621f - (Eduardo Velez) remove unwanted lines
- 7bc8142 - (Eduardo Velez) added missing file
- c2d2329 - (Eduardo Velez) HPC-974: Prevent saving outdated plan data
- 6f1d83e - (Mark Boyd) added decisionDate to flow import
- 0473436 - (Mark Boyd) added decisionDate to flow import, but timezone is off when stored
- e5354c2 - (Tim Martin) Updated version to 0.6.1
- 3df7f6b - (Tim Martin) Merged in feature/HPC-977-add-parents-csv (pull request #149)
Fixed issue with duplicate coreEntities
- 04904e3 - (Tim Martin) Fixed issue with duplicate coreEntities
Added parentIDs for associated objectives for cluster objectives and activities
- 43ff1c4 - (Tim Martin) Added parentIDs for associated objectives for cluster objectives and activities
- 3868643 - (Eduardo Velez) Merged in mboyd/HPC-1002-multi-value (pull request #144)
HPC-1002: Store behavior for mutliple associations between flows and objects of given type
Cleanup
- 1b7dd66 - (Mark Boyd) cleaned up code to conform to coding style standards
- 90a9e11 - (Mark Boyd) added column to flowObject model for storing how flow amounts should be distributed among objects of a given type
- fdad5ea - (Mark Boyd) refactored data imports to use single mySQL connection thread
- 933fbec - (Mark Boyd) removed duplicate config line
- ed77654 - (Tim Martin) Merged in mboyd/HPC-927-usage-year (pull request #140)
HPC-927 usage year
Remove some console logs that didn't get removed after finishing development
- 17b9c17 - (Michael Kochendorfer) Remove some console logs that didn't get removed after finishing development
- d52014b - (Mark Boyd) added destination usage year flow object association
- 5e16512 - (Mark Boyd) updated server.js to ensuring seeding happens for test env, refactored object & flowObject creation, implemented import of source UsageYear objcts on flows
- 2e683c2 - (Tim Martin) Merged in mkochendorfer/HPC-873-invite-user (pull request #137)
HPC-873 Add service endpoint to register users in H.ID
Fixed issue with location find functions
Added migration for template field
- d4466e8 - (Tim Martin) Fixed issue with location find including the flow objects Removed include all
- bbd2d38 - (Tim Martin) Merged in feature/HPC-920-add-iso3-to-location (pull request #133)
Feature/hpc 920 add iso3 to location
HPC-864: Implementation migration process for HPC service
- 2d2003a - (Eduardo Velez) merge conflicts
- 453fb14 - (Eduardo Velez) merge conflicts
- 642e628 - (Michael Kochendorfer) HPC-873 Add service endpoint to register users in H.ID
- 5e53664 - (Tim Martin) Merged in mboyd/HPC-964-taxonomy-sectors (pull request #136)
HPC-964: taxonomy sectors
- 7d5b743 - (Mark Boyd) implemented import of sector terms and attachment to flows
- 9a12485 - (Mark Boyd) refactoring error handling to avoid using callbacks multiple times
- 11aea0e - (Joe Turgeon) Merged in fix/add-mysql-package (pull request #135)
Added MySQL package to service
- f39ac4c - (Mark Boyd) added MySQL package to service
- 294026e - (Tim Martin) Merged in mboyd/HPC-890-basic-flow-migration (pull request #134)
HPC-871/HPC-890: Basic flow migration
- ff11bd9 - (Mark Boyd) added logging to specify which thread ID for the external data connection has been closed
- 73a4e9a - (Tim Martin) Added migration for template field
- f4ca410 - (Mark Boyd) added endpoint to lookup flows by their legacy ID
- 406a802 - (Mark Boyd) fixing controllers to reference correct alias for categoryGroup model
- 4960fc6 - (Mark Boyd) finalizing basic flow import
- 810cbce - (Mark Boyd) added required callbacks for category reference creation to fix race condition where last record was being skipped
- 636852d - (Mark Boyd) added validation code during taxonomy import to skip "not specified" terms
- a1b87b8 - (Mark Boyd) standardizing use of async callbacks across seed/import code
- 8343f2e - (Mark Boyd) changed variable names to conform to coding style/standards
- 5a460fb - (Mark Boyd) simplifying category imports
- d8771f9 - (Mark Boyd) refactoring seeding & import code
- 8ec84c9 - (Mark Boyd) refactoring taxonomy imports and ensuring that object category refs are all created correctly
- 8b8d15c - (Mark Boyd) changed categoryRef creation to use upsert, otherwise values were getting skipped
- 3415b15 - (Mark Boyd) not all category refs are being attached to flows, needs more investigation
- 02f8f84 - (Mark Boyd) continued work on flow category seeding
- ea06111 - (Mark Boyd) more work
- 1e959f1 - (Mark Boyd) more work on associating flows to categories
- f998a99 - (Mark Boyd) working on category seeding based on legacy IDs
- be45b0f - (Eduardo Velez) Change iso3 to string length of three
- f15d36b - (Eduardo Velez) Change iso3 to string length of three
- bc2c4a4 - (Eduardo Velez) HPC-920: Update locations import from HR.info to include iso3 code
- fbf9e2c - (Mark Boyd) adding reference to relevant categories during flow import
- 1c3f2a0 - (Eduardo Velez) fixed typo
- 7dad59b - (Eduardo Velez) HPC-864: Implementation migration process for HPC service
- 4cc9594 - (Mark Boyd) implemented storage of category legacy IDs as they are migrated
- a75e829 - (Mark Boyd) merged in mboyd/HPC-871-simple-taxonomies
- 8bf6969 - (Mark Boyd) adding storage of category legacy IDs to taxonoy imports
- f6501fc - (Mark Boyd) refactoring category seeding
- c602641 - (Mark Boyd) refactoring category group seeding
- 99c517e - (Mark Boyd) re-factoring category models to associate based on category type string, not integer
- 1cbf521 - (Mark Boyd) updating model associations
- a73eb00 - (Mark Boyd) changing categoryGroup model to associate groups by a type string, not by ID
- b789a3a - (Mark Boyd) added model for category legacy IDs
- a97ab8b - (Mark Boyd) changing column name for categoryLegacy model
- 6819be6 - (Mark Boyd) implementing categoryLegacy model to make migrating referenced terms easier
- 7320d4b - (Mark Boyd) code style fixes & improvements
- 555a52b - (Mark Boyd) modified category group names
- 9dfe6cc - (Mark Boyd) removed migrations for emergency type and appeal type terms. these terms will have to be de-duped with existing HPC storage, so will be handled later.
- 478c78e - (Mark Boyd) added legacy model to be dropped on service startup
- e9a9347 - (Mark Boyd) flow migration of basic properties such as amount and currency properties is working & implemented legacy model to store legacy IDs for flows and other objects
- 9eb7157 - (Mark Boyd) updated flow & associated models to remove unique constraint for flow ID, since flow IDs will repeat in flow table for different version IDs
- b69bd49 - (Mark Boyd) merged in develop
- f7d7244 - (Mark Boyd) initial pass at basic flow migration with basic properties
- b4281be - (Mark Boyd) added flowDate & decisionDate to flow model
- 8a27ccb - (Mark Boyd) fixed erroneous table references for aidTypes migration
- 3390bde - (Mark Boyd) re-factoring joins for taxonomy imports to enforce only migrating terms with connections to entities
- d0b14b8 - (Mark Boyd) added sectors to taxonomy migration
- 2ea02cb - (Tim Martin) Fixed issue with goals
- bbe2cf5 - (Tim Martin) Changed version to 0.5.0
- 861c007 - (Tim Martin) Merged in feature/sequelize-logging (pull request #129)
Added ability to disable Sequelize database transaction logging per environment config
Added new TypeCodes
- 372908f - (Tim Martin) Added new TypeCodes Changed web content logic to match plan/get
- 5d9f915 - (Mark Boyd) added ability to disable Sequelize database transaction logging per environment config
- ea4d7a2 - (Tim Martin) Updated version number to 0.4.0
- 3bc49c2 - (Tim Martin) Merged in feature/add-participant-name (pull request #130)
Added code to save participant name
- 03fbce4 - (Tim Martin) Added code to save participant name
- ba3b033 - (Tim Martin) Merged in mboyd/HPC-889-object-types (pull request #127)
HPC-889: Refactoring object types to be a string, not an ID
adding MySQL image & configuration to service
- 523e521 - (Mark Boyd) updating data location for mysql
- 4bd156d - (Mark Boyd) adding MySQL image & configuration to service
- b107460 - (Mark Boyd) removing MySQL container settings from this branch
- b651875 - (Mark Boyd) revert package.json to develop
- ca9d4dc - (Mark Boyd) removed migration code from this branch
- 7729647 - (Mark Boyd) finished updating reports to use new object type as string, not ID
- 044ea68 - (Mark Boyd) altering boundary reports logic to respect new object type string
- b49856e - (Mark Boyd) finished converting seed process to use new object type string
- 8a6feb4 - (Mark Boyd) updated data seeding to use new object type string, instead of ID
- 4c5f466 - (Mark Boyd) updating flowObjectType model to use a type string as the primary key, not an ID
- 238910e - (Mark Boyd) added migration for emergency type terms
- 7733601 - (Mark Boyd) added new columns to flow & category models, finished initial implementation of full migration for terms from basic taxonomies
- ac1403f - (Mark Boyd) refactoring category seeding & initial migration of contribution status terms is working
- 3c460a2 - (Mark Boyd) added hostname for mysql container and verified that mysql container can be accessed and read from HPC service container
- 21e7dff - (Mark Boyd) added UNOCHA mySQL image to HPC service to handle storing source databases for migrations
- 015f9ee - (Tim Martin) Added version tag 3.1
- 8dd6844 - (Tim Martin) Merged in evelez/HPC-892-removing-all-indicators (pull request #126)
HPC-892: Removing All Indicators Doesn't Remove Indicators
- 65b155c - (Eduardo Velez) HPC-892: Removing All Indicators Doesn't Remove Indicators
- 77d2f6c - (Joe Turgeon) Version 0.3.0.
- 450ebf6 - (Joe Turgeon) Merged in bug/HPC-872-plan-list-updated-by (pull request #125)
Added logic to return lastUpdatedBy participant to plan list query
- 9c40a6f - (Tim Martin) Added error logging
- ca70b9d - (Tim Martin) Added participant model to the lastUpdatedBy field
- c2f8035 - (Tim Martin) Added lastUpdatedBy field to plan
- db5de3a - (Tim Martin) Merged in bug/criteria-var-error-fix (pull request #124)
Fix undifined var criteria error
- b8e6889 - (Eduardo Velez) Fix undifined var criteria error
- c20af06 - (Tim Martin) Merged in bug/HPC-863/plan-read-failure (pull request #123)
HPC-863: Plan Read Failure
- 394579c - (Grayside) HPC-863: Return webFileEntity data in API responses.
- 2cde7f6 - (Grayside) HPC-863: Continued refactoring of web entity retrieval [WIP]
- 393af48 - (Joe Turgeon) Merged in feature/HPC-834-create-plan-csv-export (pull request #122)
Fixes to CSV output per Nick's request
- 4db1faa - (Tim Martin) Fixes to CSV output per Nick's request
- 37a0d7a - (Tim Martin) Merged in feature/HPC-860-fix_raml2html_perms (pull request #121)
HPC-860: Ensuring raml2html script is executable as part of Grunt script.
- 576e4ed - (Joe Turgeon) HPC-860: Ensuring raml2html script is executable as part of Grunt script.
- d988338 - (Joe Turgeon) Merged in task/nodemon-ignore (pull request #120)
Add bin/ and tmp/ to nodemon's ignore list to facilitate script development.
- e0f2dbe - (Grayside) HPC-863: Separate web entities into their own controller.
- b0ecb75 - (Grayside) Merge remote-tracking branch 'origin/develop' into bug/HPC-863/plan-read-failure
- fb68908 - (Grayside) Add bin/ and tmp/ to nodemon's ignore list to facilitate script development.
- d5d17e0 - (Adam Ross) Merged in bug/HPC-participant-cluster-issue (pull request #119)
Added clusters to getAllPlans include in order to accommodate participant manager
- 5ecc550 - (Tim Martin) Added clusters to getAllPlans query in order to accommodate participant manager
- ad1eeb4 - (Joe Turgeon) Updating Dockerfile to include Grunt CLI and fix links issues. Adding --force to grunt in postinstall to ensure npm install is not blocked.
- 1ab7629 - (Tim Martin) Merged in mboyd/HPC-865-updated-data (pull request #117)
Updated seed data and logic for reports 2 & 3
- 82a1c5b - (Joe Turgeon) Disable nginx rate limiting for the dev/stage service.
- 5361a4b - (Tim Martin) Merged in task/remove-emergency-model-drop (pull request #118)
Removed emergency model drop
- 1fe9463 - (Tim Martin) Removed emergency model drop
- feaf6fa - (Mark Boyd) removed unnecessary comment
- 0ee744c - (Mark Boyd) updated logic for report 2 to always respect flow balance for parked flows when calculating sums & added logic for report 3 to only use the amount, since the value of child flows will always be automatically deducted as outflows
- 0f903e2 - (Joe Turgeon) Version 0.2.0.
- 7a3c225 - (Joe Turgeon) Merged in feature/HPC-515-change_rpm_hostname (pull request #116)
HPC-515: Updating base URL for prod RPM app.
- f5a5589 - (Joe Turgeon) HPC-515: Updating base URL for prod RPM app.
- 8685b81 - (Tim Martin) Merged in feature/HPC-834-create-plan-csv-export (pull request #115)
HPC-834 - Create plan csv export
- dacf800 - (Tim Martin) Removed code
- a421db2 - (Tim Martin) Merged in mkochendorfer/HPC-847-global-cluster-ordering (pull request #114)
HPC-847 Sort global cluster name list alphabetically
HPC-595 Add level three emergency field to the emergency model
- 1dc3136 - (Tim Martin) Merge branches 'feature/HPC-834-create-plan-csv-export' and 'develop' of bitbucket.org:phase2tech/hpc_service into feature/HPC-834-create-plan-csv-export
- 0064434 - (Tim Martin) Added web content
- 17a2d2d - (Michael Kochendorfer) HPC-847 Sort global cluster name list alphabetically
- d5a8d4d - (Michael Kochendorfer) HPC-595 Add level three emergency field to the emergency model
- b52d9f0 - (Eduardo Velez) Merged in feature/HPC-861-plan-list-issue (pull request #112)
Removed include from getAllPlans function
- fd2362d - (Tim Martin) Removed include from getAllPlans function
- 648aa92 - (Tim Martin) Added additional logic for indicators
- bf4d88c - (Tim Martin) Merged in task/README-updates (pull request #111)
Task/readme updates
- a444a9f - (Grayside) Update README for testing and API documentation practices.
- abf8c84 - (Grayside) Remove doc routes from the version resource to avoid low-value production work.
- 3490d0b - (Tim Martin) Merged in feature/HPC-846-plan-list-sort-by-most-recent-update (pull request #110)
HPC-846: Plan list: Sort by most recently updated
HPC-860: Ensure all files and docs directories are created before use.
- 5fced06 - (Eduardo Velez) HPC-846: Plan list: Sort by most recently updated
- 3af3df0 - (Grayside) HPC-860: Ensure all files and docs directories are created before use.
- ba224c9 - (Tim Martin) Merged in task/emergency-stability (pull request #106)
HPC-748: Emergency and Emergency Type response code enhancement
HPC-748: Plan Controller stability
- e0bdd19 - (Tim Martin) Changed logic for parent code
- 8291ded - (Tim Martin) Moved logic into planExport controller Added additional logic
- 94d9da6 - (Tim Martin) Merged in feature/seed-csv-files (pull request #108)
Seed CSV files of FTS data
Fix FTS deadlocks
- eb90d03 - (Mark Boyd) changed reference to parked category name to be uppercase
- 7686779 - (Mark Boyd) changed model dropping process to specify drop order and use async.eachSeries to ensure order is maintained
- 1c550a2 - (Mark Boyd) removing dropModel property from FTS models
- 301318f - (Mark Boyd) added stream-transform node module for handling stream from CSV input
- e748d80 - (Mark Boyd) removed dropModel property from models, since models to drop need to specified in correct order directly in server.js
- f9454a5 - (Mark Boyd) manually specifying drop models order to avoid deadlocks
- 6ec6ed0 - (Mark Boyd) updated models to ensure uniqueness of values during data seeding
- 626e5af - (Mark Boyd) added flow link seeding from CSV
- 613f754 - (Mark Boyd) seeding of flow categories working correctly from CSV import
- 5cc4714 - (Mark Boyd) adding code to skip non-CSV seed files
- 5c92ae8 - (Mark Boyd) renamed CSV processing function
- 8c512d2 - (Mark Boyd) breaking up & refactoring seeding code for clarity
- a2c5603 - (Mark Boyd) reorganizing files
- 7cf153c - (Mark Boyd) removed JSON for seeding
- d66a4f4 - (Mark Boyd) flow objects are seeded correctly
- c254c2b - (Joe Turgeon) Merged in feature/HPC-833-create-clientid-model (pull request #105)
Configure client access for CSV endpoints
- cbc24dc - (Mark Boyd) flows & flow objects are created from CSV, but incorect values for clusters and not handling multi-value entries yet
- c300c1c - (Tim Martin) Updated comments
- 1ef028f - (Tim Martin) Added testMode bypass
- edc7730 - (Tim Martin) Added more logic for plan details
- 9fe8ec7 - (Mark Boyd) added CSV library & initial version of reading data from a CSV
- 8d1bda2 - (Grayside) HPC-748: Emergency and Emergency Type response code enhancement.
- 1a36364 - (Tim Martin) Added endpoint and auth for plan CSV
- f8e8f6e - (Tim Martin) Merged in mboyd/HPC-840-linked-flow (pull request #104)
HPC-840: Prototyping parked/linked flows
HPC-812: API Design Docs
- 6b2d4d9 - (Mark Boyd) re-adding dropModel behavior to categoryGroup and flowLink models
- 0a7b79a - (Mark Boyd) removing dropModel behavior from categoryGroup & flowLink models to prevent deadlocks, updating flowObject seeding to use findOrCreate
- 84bc1e8 - (Mark Boyd) added new seed data
- 8db7a2b - (Mark Boyd) reverted change to Sequelize logging options
- e9c5f51 - (Mark Boyd) updated report 3 to include correct balance for parked flows & removed unnecessary logging from FTS data seeding
- b6510a8 - (Mark Boyd) updated report 2 to include a sum of the flows for each group of flows by destination
- bcda16a - (Grayside) HPC-812: Basic cleanup of RAML spec and Gruntfile.
- ce56b2f - (Mark Boyd) updated controller for flow by ID response to include categories and category groups
- 2ac60c9 - (Mark Boyd) fixed report 2 to only seek child flows if the flow type is parked
- c2ead4b - (Grayside) HPC-812: Additional refinements to plan creation.
- a6d186b - (Mark Boyd) fixed associations between category models, refactored FTS flow seeding, updated boundary responses to include categories with flows
- 0189e1a - (Grayside) HPC-748: Stability, response code, logging enhancements for Plan controller.
- 7c34ea0 - (Mark Boyd) added seeding for category groups
- b90c0a9 - (Grayside) Merge remote-tracking branch 'origin/develop' into task/HPC-812/api-docs
- 1c3ee9e - (Tim Martin) Merged in feature/HPC-726-prod_files_path (pull request #101)
HPC-726: Updating path of file uploads on prod to use Gluster share.
- 21fdc9d - (Mark Boyd) fixed error in seed data
- 238eed1 - (Joe Turgeon) HPC-726: Updating path of file uploads on prod to use Gluster share.
- e6f8fde - (Tim Martin) Merged in feature/HPC-726-prod_dockerfile (pull request #100)
HPC-726: Switching Docker image back in Dockerfile as prod uses the app's nginx.
Improvements to FTS data seeding process
- d82b402 - (Joe Turgeon) HPC-726: Switching Docker image back in Dockerfile as prod uses the app's nginx.
- faea380 - (Mark Boyd) updating category models & adding associations
- ef6a9c4 - (Grayside) Merge remote-tracking branch 'origin/develop' into task/HPC-748/plan-stability
- 284b71a - (Grayside) HPC-748: Stabilize and enhance error reporting and handling of plan controller.
- cc5e00b - (Mark Boyd) added category & categoryGroup models
- 6eb9a80 - (Mark Boyd) more corrections to seed data
- 65e302d - (Mark Boyd) improving fts seeding process to be more fault tolerant in case reading of JSON seed data fails
- 1988335 - (Tim Martin) Merged in mboyd/data-fixes (pull request #98)
fixed data errors & added new records
- 5a6ab98 - (Mark Boyd) fixed data errors & added new records
- fc76652 - (Joe Turgeon) Merged in task/plan-template-stability (pull request #95)
Enhanced error handling and HTTP response codes for Plan Template controller.
- 31b29d7 - (Tim Martin) Added json2csv dependency
- b98a10f - (Tim Martin) Merged in feature/HPC-832-csv-plan-list (pull request #97)
Removed fields
- 5ef44fa - (Tim Martin) Removed fields
- ffa4bec - (Tim Martin) Merged in feature/HPC-832-csv-plan-list (pull request #96)
Feature/hpc 832 csv plan list
- e99888d - (Tim Martin) Removed date formatting
- d834aca - (Tim Martin) Merged develop
- b5558a4 - (Grayside) Enhanced error handling and HTTP response codes for Plan Template controller.
- a012420 - (Tim Martin) Merged in feature/HPC-773-update-plan-and-cluster-web-content-fields (pull request #93)
HPC-773: added new fields needed in web content forms
Update Dockerfile to use the unocha/nginx16-nodejs image.
Feature/hpc 726/add files to plans and clusters
- 637686e - (Grayside) Merge remote-tracking branch 'origin/develop' into feature/HPC-726/add-files-to-plans-and-clusters
Conflicts: app/controllers/rpm/plan.js
- 1b51dc4 - (Tim Martin) Added CSV module
- a73babf - (Tim Martin) Merged in bug/fix-corePlan-races (pull request #94)
Improve error handling of core plan objectives and actobjectives.
- 6a30978 - (Grayside) Improve error handling of core plan objectives and actobjectives.
- 1b6ace3 - (Grayside) HPC-812: Initial setup of RAML-based API documentation.
- 550c286 - (Mark Boyd) implemented initial version of report 2 with downstream flows included
- 13f75d7 - (Mark Boyd) added more seed data for linked flows & updating report 2 to include downstream flows as well as initial flows across the boundary
- 7be4302 - (Eduardo Velez) added missing field
- 34d3e01 - (Eduardo Velez) HPC-773: added new fields needed in web content forms
- 849f79d - (Tim Martin) Merged in bug/docker-compose-env-mount (pull request #90)
Switching to unocha/nginx16-nodejs moved expected node.sh location into /opt/app.
- 3af4f9b - (Grayside) Update Dockerfile to use the unocha/nginx16-nodejs image.
- e650c09 - (Tim Martin) Merged in mboyd/HPC-831-multiple-objects (pull request #89)
HPC-831: multiple objects
- 59f399f - (Grayside) HPC-726: Stabilize app to support tests.
- 00f9e49 - (Grayside) Switching to unocha/nginx16-nodejs moved expected node.sh location into /opt/app.
- 9a185fe - (Grayside) HPC-726: Revise models for addition of webFileEntity.
- 6ea9233 - (Mark Boyd) adding documentation to code
- 0ea07ba - (Mark Boyd) updated seed data & included outbound flows as outflows for grouping objects in boundary reports
- ae53033 - (Tim Martin) Merged in feature/add-rpmadmin-role-to-seed (pull request #88)
Added rpmadmin role to seed for alex tester user
- 64d2a66 - (Tim Martin) Added rpmadmin role to seed for alex tester user
- 72d750e - (Tim Martin) Merged in feature/HPC-726/file-upload-api (pull request #87)
HPC-726: Add File API
- caf744a - (Mark Boyd) added more seed data
- 914ae14 - (Mark Boyd) initial pass at grouping flows with multiple objects per object type into special multi-object groups for boundary reports
- 2b68720 - (Tim Martin) Merged in mboyd/HPC-818-reports-prototyping (pull request #86)
HPC-818: Allow grouping by any object type for boundary reports
- 3f1e32a - (Grayside) Merge remote-tracking branch 'origin/develop' into feature/HPC-726/file-upload-api
Conflicts: config/test.json
- f0c279b - (Grayside) HPC-726: Add File API
- d0ce3b6 - (Tim Martin) Merged in feature/add-nodemon-legacy (pull request #85)
Added legacy flag for nodemon to fix restart issue
- 081ebb7 - (Tim Martin) Added legacy flag for nodemon to fix restart issue
- 348266a - (Mark Boyd) single boundary & multi boundary endpoints now fully support grouping by any object type
- 63237fa - (Tim Martin) Merged in task/version-0-prefix (pull request #84)
Use v0/ prefix for all RPM and common endpoints.
- d0099b0 - (Mark Boyd) able to switch the grouping object type for single boundary reports
- f730179 - (Tim Martin) Merged in feature/HPC-761/author-fix (pull request #83)
HPC-761: Add test coverage and correct error cases breaking author inclusion.
- 62fcf71 - (Grayside) Merge remote-tracking branch 'origin/develop' into task/version-0-prefix
Conflicts: app/routes/common/activity.js
- 1188f92 - (Grayside) Use v0/ prefix for all RPM and common endpoints.
- c433c35 - (Grayside) HPC-761: Additional corrections to activity tests and revert of seed hack.
- f15f9c1 - (Grayside) HPC-761: Add test coverage and correct error cases breaking author inclusion.
- 450d025 - (Tim Martin) Merged in mboyd/FTS-improvements (pull request #82)
FTS model & seeding improvements
- 5663511 - (Mark Boyd) trying to retrieve group object type name from promise callback
- 7954c88 - (Mark Boyd) abstracting code to support grouping boundary reports by any flow object type
- 0ba5ac7 - (Mark Boyd) removed unnecessary requirement of lodash during FTS seeding
- 5bb2d9e - (Mark Boyd) refactored plan seeding to avoid duplication with existing plan data
- c192218 - (Joe Turgeon) Merged in feature/HPC-960/recent-activity (pull request #68)
HPC-760: Recent Activity
- d6232f2 - (Joe Turgeon) Changing status code for empty response to 204. Removing unused npm dependencies.
- 14cfd5c - (Mark Boyd) changing plan seeding to be based on name, not ID, so that plans do not get overwritten or incorrectly referenced by other models
- f320955 - (Mark Boyd) temporarily removing authentication from FTS endpoints to enable easier client testing
- 21c2097 - (Mark Boyd) added code to drop flowLink and flowObject models before re-syncing on every service restart
- 5e23efc - (Tim Martin) Merged in mboyd/seeding-fixes (pull request #81)
removed unnecessary index from flowLink model & changed seeding process to use async callbacks to enforce ordered processing more strictly
- 9e6d79f - (Mark Boyd) improved console logging method
- d215761 - (Mark Boyd) removed unnecessary index from flowLink model & changed seeding process to use async callbacks to enforce ordered processing more strictly
- c4ad004 - (Tim Martin) Merged in feature/error-catching (pull request #80)
added error catching to seeding processes
- c289315 - (Mark Boyd) added error catching to seeding processes
- b4cfd9a - (Tim Martin) Merged in mboyd/HPC-813-report-multiple-boundaries (pull request #79)
HPC-813 report multiple boundaries
- 32f8f2e - (Grayside) HPC-760: Add support for activity author to log and stream.
- 1afb116 - (Mark Boyd) changing reports to support grouping by objects of any type
- 2e8cbcd - (Mark Boyd) removing test changes to configuration
- e4b61af - (Mark Boyd) removed test changes to configuration
- abad102 - (Mark Boyd) merging in develop
- 0aa46ae - (Mark Boyd) merged in develop
- 1895d84 - (Grayside) Merge remote-tracking branch 'origin/develop' into feature/HPC-960/recent-activity
- 51525f9 - (Tim Martin) Merged in task/remove_location_nested_includes (pull request #78)
Removed nested:true flag
- c4eb9a2 - (Tim Martin) Removed nested:true flag
- ac1b3a7 - (Joe Turgeon) Adding '--no-bin-links' flag to npm install.
- 5d2d29b - (Mark Boyd) removing inclusion of nested associations from location controllers
- 833fca6 - (Grayside) Merge remote-tracking branch 'origin/develop' into feature/HPC-960/recent-activity
Conflicts: package.json test/plan.js
FTS integration
- 3c8a1d5 - (Mark Boyd) fixes to flow controllers
- 52e66f0 - (Tim Martin) Merged in task/module_updates2 (pull request #76)
Module updates and implement helmet
- eac745c - (Grayside) Adjusted tests to account for governingEntityCluster rename.
- b8ad3f5 - (Joe Turgeon) Implement helmet for basic HTTP security.
- 3404628 - (Joe Turgeon) Updating module dependencies to latest versions, and removing unused dependencies.
- 950d3af - (Mark Boyd) fixed references to removed models in child & parent flow controllers
- 21ae78e - (Mark Boyd) merge in other branch
- b626e08 - (Mark Boyd) add missing callbacks to plan seeding
- 9b3f852 - (Mark Boyd) minor fix to plan seeding
- 10c50ca - (Mark Boyd) fix broken plan seeding
- 5a64c71 - (Mark Boyd) updated model dropping process
- 75f9f4d - (Mark Boyd) updated model syncing process to sync all models at once to avoid dependency breakdowns. added ability to specify models to drop before syncing and seeding occurs.
- d97f44f - (Mark Boyd) removed extraneous object property
- b30a7f9 - (Mark Boyd) added FTS models and FTS seed data
- e49520d - (Grayside) HPC-760: Add deeper entity identification coverage.
- 6d3ec90 - (Tim Martin) Updating package.json to use non-linked paths for binaries for compatibility with new unocha/nodejs image.
- 3045b6d - (Mark Boyd) Merged in mboyd/plan-seed-fix (pull request #74)
minor fix to plan seeding
- 6474af2 - (Mark Boyd) minor fix to plan seeding
- f028473 - (Tim Martin) Merged in feature/plan-seed-fix (pull request #73)
fix broken plan seeding
- 2bd9170 - (Mark Boyd) fix broken plan seeding
- df1113a - (Tim Martin) Merged in mboyd/FTS-models (pull request #72)
added FTS models and FTS seed data
- 2d593ae - (Mark Boyd) updated model dropping process
- 6d23e2e - (Mark Boyd) updated model syncing process to sync all models at once to avoid dependency breakdowns. added ability to specify models to drop before syncing and seeding occurs.
- 65e619e - (Mark Boyd) removed extraneous object property
- d26b230 - (Mark Boyd) added FTS models and FTS seed data
- 7f64ec6 - (Mark Boyd) resolved merge conflicts
- 243cad7 - (Mark Boyd) adding comments & refactoring code
- 636549d - (Mark Boyd) updating seed data
- 697ab0a - (Grayside) HPC-760: Add category and entity labeling for log display.
- b21ea2b - (Mark Boyd) adding comments to code
- 2e910ef - (Mark Boyd) initial version of categories & reports for multiple boundaries working
- a2dcc31 - (Tim Martin) Merged in task/adaptive-start (pull request #39)
Use nodemon for local development in place of pm2.
- fa2665a - (Tim Martin) Added participant seed
- c5449fc - (Mark Boyd) adding commentary on current status to code & possible resolutions going forward
- a0437e3 - (Tim Martin) Merged in feature/add-seed-data (pull request #71)
Added common seed data
- 78b5f87 - (Mark Boyd) initial version of query for multiple report boudnaries is working
- 3536403 - (Tim Martin) Added common seed data
- 4724bf7 - (Tim Martin) Merged in mboyd/sync-seed-process (pull request #69)
Updated data sychronization & seeding processes
- a50ed47 - (Mark Boyd) merged in develop
- e3853b1 - (Mark Boyd) implementing logic for testing multiple boundaries
- ce05551 - (Mark Boyd) continuing work on creating query for multiple report boundaries
- 90548a9 - (Mark Boyd) prototyping queries for multiple report boundaries
- 16c92f4 - (Tim Martin) Merged in feature/HPC-789-create-participant-data-model (pull request #67)
Create participant data models and logic
- c2a4077 - (Joe Turgeon) HPC-546/HPC-547: Logging improvements and code clean up for participant controllers.
- ac2c484 - (Grayside) HPC-760: Add object-path as a new dependency.
- e80e934 - (Grayside) HPC-760: Add total count of stream activities to response payload.
- 824af70 - (Mark Boyd) fixed merge conflict
- b79ecc4 - (Mark Boyd) added associations to flow from existing RPM & common models
- 46283cf - (Mark Boyd) added new models for FTS specific data
- 28dfdfa - (Mark Boyd) updated data synchronization & seeding process to allow easier targeting of specific models for re-creation on service restart
- 74e6f46 - (Mark Boyd) updated model synchronization process
- a65a2da - (Mark Boyd) renamed linkedFlow model to flowLink, updated seed data, updated model synchronizatoin process
- 2f7e60c - (Mark Boyd) provisional changes to model synchronization process
- ff83ecc - (Mark Boyd) re-implementing model syncing process to allow specification of sync behavior per model
- 3585e6a - (Grayside) HPC-960: Added changesBefore and changesAfter to activity and shifted to deeper granularity support.
- b3bd88a - (Mark Boyd) removed internal organization flows from calculations for report 3
- e01b0a3 - (Mark Boyd) debugging third reporting boundary for complex data set
- 16df623 - (Grayside) HPC-760: Ignore modification date added by Sequelize for no-change entity saves.
- c9d7487 - (Grayside) HPC-760: Add support for pagination of the stream.
- 0d8821a - (Grayside) HPC-760: Repair Plan controller use of activity facility.
- a1f7292 - (Joe Turgeon) HPC-663: Include nested entities when loading participants to allow displaying roles.
- d80a692 - (Grayside) Merge remote-tracking branch 'origin/develop' into feature/HPC-960/recent-activity
Conflicts: app/controllers/rpm/plan.js
- 34d107b - (Grayside) HPC-760: Add Activity integration to the Plan controller [WIP]
- 78c4876 - (Joe Turgeon) HPC-789: Clean up on app credentials checking to handle POST and GET requests.
- cdaed21 - (Tim Martin) Fixed spacing
- b298493 - (Tim Martin) Added logic to remove existing roles for specified module
- 5b2217d - (Tim Martin) Added logic to return roleEntities on participant queries
- 82adf85 - (Tim Martin) Merged in feature/HPC-657-plan-longform-access (pull request #66)
Feature/hpc 657 plan longform access
- 3516736 - (Eduardo Velez) remove unwanted lines
- 1ca4fa1 - (Eduardo Velez) change error respond to 404
- 4be2ea3 - (Tim Martin) Fixed callback
- 1b9a7b1 - (Tim Martin) Added models for participants, roles and roleEntity
- a5ecae8 - (Mark Boyd) further debugging of organization not showing as donor & recipient if the same organization is both
- d9e3ba3 - (Mark Boyd) need to fix issue where organization is not reported as donor and recipient if it is the same organization
- af6d2d3 - (Mark Boyd) finished adding example 3 data
- 3f56273 - (Adam Ross) Merged in feature/HPC-657-plan-longform-access (pull request #65)
HPC-657: Opened a route to view published plans
- 49ab830 - (Mark Boyd) changed how flow links are seeded
- c416dd0 - (Eduardo Velez) HPC-657: Opened a route to view published plans
- 5a164e8 - (Mark Boyd) updated first test data set
- b3c2e55 - (Mark Boyd) updating seed data structure for easier maintainability
- 1044494 - (Mark Boyd) started integrating third set of test data for prototyping boundary queries
- fc286f3 - (Mark Boyd) added models for project and usageYear
- 98f7ca9 - (Grayside) HPC-760: Add test coverage for generating update events via activity creation API.
- 6cdb0cd - (Grayside) HPC-760: Completed Activity facility.
- d55387f - (Grayside) HPC-760: Track changes to entity content and supply via activity stream. [WIP]
- 6170cf2 - (Joe Turgeon) Added start-debug script with nodemon command for consistency.
- 6d79549 - (Mark Boyd) implemented report 4
- bb74283 - (Mark Boyd) implemented report 3 data output
- c32a1c7 - (Joe Turgeon) Merged in feature/HPC-792-dev_env (pull request #63)
HPC-792: Adding config for dev environment.
- cc821a6 - (Joe Turgeon) HPC-792: Adding config for dev environment.
- e2b6b08 - (Mark Boyd) grouping all flows by destination within a boundary, need to add logic to substract values of downstream flows from value of flows into desetination
- b7b6e4a - (Mark Boyd) changed handling for donor and source in report boundaries to group flows with mutliple sources or recipients as undefined
- ca62746 - (Tim Martin) Merged in mboyd/HPC-784-query-testing (pull request #60)
HPC-784: Prototyping flow objects & reporting boundaries
- 3096bcf - (Mark Boyd) abstracted reporting code & functionality, added output for reports 1 & 2
- 2649985 - (Tim Martin) Merged in feature/HPC-615-prod_env_config (pull request #59)
HPC-615: Prod set up
- 2bc8e98 - (Joe Turgeon) HPC-615: Adding Dockerfile and scripts to support building a Docker image with hpc_service code. Updating prod config file.
- 14a1940 - (Tim Martin) Merged in feature/HPC-700-add-indicators-to-objectives (pull request #58)
Fixed issue with activities
- 238ed81 - (Tim Martin) Fixed issue with activities
- 45fa264 - (Adam R) Merged in feature/HPC-700-add-indicators-to-objectives (pull request #57)
Fixed issue with missing globalIndicator includes
- 41b6a1b - (Mark Boyd) removed extraneous associations from models
- 9fd4ac7 - (Mark Boyd) merging in develop branch
- 5583888 - (Mark Boyd) refactored report flow controllers
- 9c226b6 - (Tim Martin) Fixed issue with missing globalIndicator includes
- 41493e5 - (Joe Turgeon) Merged in feature/HPC-700-add-indicators-to-objectives (pull request #55)
Add indicators to objectives and activities
- 70c8e19 - (Tim Martin) Merge branches 'feature/HPC-700-add-indicators-to-objectives' and 'develop' of bitbucket.org:phase2tech/hpc_service into feature/HPC-700-add-indicators-to-objectives
- 216ec74 - (Mark Boyd) added more seed data
- 696e857 - (Mark Boyd) refactored logic for report groupings a bit
- f203812 - (Mark Boyd) added more seed data for example 2 (without locations or globalCluster flow objects)
- 394df54 - (Mark Boyd) significant work to group objects into reporting boundaries
- f9cbf40 - (Tim Martin) Merged in feature/sequelize-issues (pull request #56)
Added explicit model includes for plan/find functions
- 7d696c7 - (Tim Martin) Added explicit model includes for plan/find functions
- 6706bc9 - (Mark Boyd) working on showing flow objects as source and destination if they exist in both
- ba74310 - (Tim Martin) Added searchData field Added logic for activity indicators
- 728ca4d - (Mark Boyd) added seed data for new example, added new controllers for flows by id and by plan id, connected flows with global clusters and locations
- ad96392 - (Mark Boyd) separated seed data into multiple files
- 24161b0 - (Joe Turgeon) Merged in feature/disable_table_resets (pull request #54)
Setting sequelize sync force to false to disable resetting the tables.
- addacf0 - (Joe Turgeon) Setting sequelize sync force to false to disable resetting the tables.
- 83f15f9 - (Mark Boyd) reconfiguring seed data integration
- a2fa99d - (Mark Boyd) refactored seed.js to support calling from CLI or via exported method
- c66e884 - (Mark Boyd) moved seed data into separate folder
- 29790b0 - (Mark Boyd) added controller for returning objects grouped by their reporting category & abstracted seed data into separate JSON files
- 50e6fa3 - (Eduardo Velez) Merged in feature/HPC-732-show-one-plan-template (pull request #52)
Removed additional plan template
- a656720 - (Tim Martin) Added globalIndicator endpoints and controller
- fe0ff24 - (Mark Boyd) creating test query to collect flow amounts crossing boundary into a flow object
- 774e589 - (Tim Martin) Removed additional plan template
- 25020ae - (Mark Boyd) merged in other feature branch
- db49615 - (Mark Boyd) reorganized seed files to allow easy seeding of all data at once
- cdc6bd2 - (Mark Boyd) finalized model associations for flow objects
- 2098d1f - (Mark Boyd) flow objects now associated with correct flowObject reference table records
- b928051 - (Mark Boyd) changed associations between flows and objects to use belongsToMany through flowObjects table
- 9d57713 - (Mark Boyd) added flow object for plans & added plans to list of sources and destinations in flow list controller
- 94197a5 - (Mark Boyd) updated init script to seed data if in test mode & updated flow list controller to include all connected objects for sources and destinations
- 1fecb7e - (Mark Boyd) list of flows now returns sources and destinatinos in separate keys of object
- 7c20ba4 - (Mark Boyd) associations between flows, flow objects, and flow object types are implemented & working
- c17dd65 - (Mark Boyd) connection between flows and organizations through flowObjects is working by including all nested associations when listing flows
- ec8af53 - (Mark Boyd) adding associations between flow models
- 7be062c - (Mark Boyd) added models and seed data for flow object types and flow objects
- ac4d878 - (Mark Boyd) seeding of all data via seed.js is complete
- c056816 - (Mark Boyd) abstracting seed functions into exported functions to facilitate easy bootstrapping
- c91952f - (Mark Boyd) added organization model & changed seed scripts to allow bootstrapping of each other
- 9d7778b - (Mark Boyd) creating json files to store different sets of seed data
- 3420c81 - (Mark Boyd) finalized model associations for flow objects
- c2d0084 - (Mark Boyd) flow objects now associated with correct flowObject reference table records
- c49af66 - (Mark Boyd) changed associations between flows and objects to use belongsToMany through flowObjects table
- f82066d - (Eduardo Velez) Merged in feature/HPC-759-associate-objectives (pull request #50)
Added associations for objectives
- b7cf804 - (Mark Boyd) added flow object for plans & added plans to list of sources and destinations in flow list controller
- 3397222 - (Tim Martin) Changed customIDs to strings Added data scrubbing to verify string values for customIDs and icons
- 4e8ba35 - (Tim Martin) Updated customID field to INTEGER data type
- a7a545d - (Tim Martin) Updated id fields to be integer values
- 99fa2eb - (Mark Boyd) updated init script to seed data if in test mode & updated flow list controller to include all connected objects for sources and destinations
- 8572afb - (Mark Boyd) list of flows now returns sources and destinatinos in separate keys of object
- 5b86eb8 - (Tim Martin) Removed test files
- e32f427 - (Tim Martin) Changed governingEntityCluster to cluster Updated logic
- 9ae2f64 - (Mark Boyd) associations between flows, flow objects, and flow object types are implemented & working
- e790cd6 - (Mark Boyd) connection between flows and organizations through flowObjects is working by including all nested associations when listing flows
- 3d4c7a6 - (Mark Boyd) adding associations between flow models
- dc33156 - (Mark Boyd) added models and seed data for flow object types and flow objects
- b0abc68 - (Eduardo Velez) Merged in feature/HPC-699-attachmentEntityIndicators (pull request #49)
Added attachmentEntityIndicators
- e124ef7 - (Tim Martin) Fixed issue with id
- 088d2da - (Mark Boyd) seeding of all data via seed.js is complete
- cf61f86 - (Mark Boyd) abstracting seed functions into exported functions to facilitate easy bootstrapping
- 60b32c8 - (Mark Boyd) added organization model & changed seed scripts to allow bootstrapping of each other
- f7c6ae5 - (Tim Martin) Updated description fields to text
- 054ea74 - (Tim Martin) Removed unnecessary comment
- 250a08d - (Tim Martin) Added additional logic for saving indicators Fixed issue with sequelize query errors caused by entity names being too long
- 94642ce - (Tim Martin) Merged in mboyd/HPC-752-linked-flows (pull request #48)
HPC-752: Flow and linked flow modeling & test seed data
- 200d7f7 - (Mark Boyd) updated associations on linkedFlow model with aliases so the correct association can be used in querying later
- 76c4fb7 - (Mark Boyd) updated controllers to provide sorting of parent and child flows & finalized model definitions
- 688d474 - (Mark Boyd) controllers for returnign flow parents and children now return attributes about flow parent and children, respectively
- db5a00d - (Mark Boyd) updating model definitions for flows and linked flows & trying to include flow information in output for linked flows
- a1280c4 - (Mark Boyd) updated test seed data & added controller for returning all children of a flow
- 735f70f - (Mark Boyd) updated controller to return first parent for a flow
- 47dba04 - (Mark Boyd) added some API endpoints for flows
- 684b8a8 - (Mark Boyd) adding more seed data & starting to write testing queries
- a3d637b - (Mark Boyd) set up basic models for flows and linked flows. added seed data for flows and linked flows
- db36013 - (Adam R) Merged in evelez/change-desc-fields-to-type-text (pull request #47)
Change description fields to type TEXT
- 3b2580c - (Tim Martin) Added logic for saving and association attachmentEntityIndicators
- 4452a4e - (Eduardo Velez) Change description fields to type TEXT
- d58bbb9 - (Grayside) nodemon should ignore changes in test coverage.
- 9141d2c - (Tim Martin) Added attachmentEntityIndicator
- 15ccc2d - (Joe Turgeon) Merged in evelez/HPC-600-web-content (pull request #45)
HPC-600: Change content field from String to Text
- 3b64fd3 - (Eduardo Velez) HPC-600: Change content field from String to Text
- c83c567 - (Joe Turgeon) Merged in feature/HPC-707-add-caseload-model (pull request #44)
Created attachmentEntityCaseload object
- 0360383 - (Tim Martin) Created attachmentEntityCaseload object Added logic to create and associate new attachmentEntityCaseloads to governingEntityClusters
- 1804b98 - (Joe Turgeon) Merged in feature/HPC-703-create-attachmentEntityCost (pull request #43)
Created attachmentEntityCost data model and associations
- 2d80ea3 - (Tim Martin) Updated comments
- 63cd110 - (Tim Martin) Added logic for association of single simple entities to a governingEntityCluster Associated attachmentEntityCost to governingEntityCluster via new saveSingleSimpleEntity function
- 1a37588 - (Tim Martin) Merged in feature/fix-directory-structure-issues (pull request #42)
Fixed path issue
- c773dac - (Tim Martin) Fixed path issue
- 9df64ec - (Tim Martin) Merged in feature/fix-directory-structure-issues (pull request #41)
Changes/fixes to support new project file structure
- 273bf55 - (Tim Martin) Changes/fixes to support new project file structure
- c178d71 - (Tim Martin) Merged in task/mvc-clarity (pull request #32)
Clarity improvements to file structure and README
HPC-727: Support ordering of clusters
- 563ddf3 - (Joe Turgeon) HPC-727: Adding comment for different relationship definition.
- 45834a2 - (Joe Turgeon) HPC-727: Refactoring saveSimpleEntity to clear associations first and then add then individually to allow handling metadata. Saving order in weight field for any supported models.
- e76cd83 - (Joe Turgeon) HPC-727: Adding weight field to the plan/cluster join table, and adding order clause on weight to plan queries.
- a984254 - (Grayside) Use nodemon for local development in place of pm2.
- 8b578ef - (Joe Turgeon) Merged in task/HPC-740/rename-webcontent-in-payload (pull request #38)
HPC-740: rename webcontent in payload
- 600f9e2 - (Joe Turgeon) Reverting change to npm start script.
- 8a03b11 - (Joe Turgeon) Merged in task/HPC-636/cluster-web-content (pull request #37)
HPC-636: Add Web Content to Clusters.
- ca3f495 - (Grayside) Reverse accidental disable of sequelize sync.
- 068e16f - (Grayside) HPC-740: webContentEntities -> content rename, with related design streamlining.
- ed61dc5 - (Grayside) Corrected git conflicts from latest merge.
- 7f0ad2f - (Grayside) HPC-636: Add Web Content to Clusters.
- c4d6445 - (Adam R) Merged in bug/whitespace (pull request #36)
Minor whitespace corrections in test directory.
- 533b56d - (Grayside) Minor whitespace corrections in test directory.
- e4e0681 - (Adam R) Merged in feature/HPC-637-cluster_objectives (pull request #35)
Saving activities and objectives attached to clusters
- 3302ef6 - (Joe Turgeon) HPC-637: Associating governingEntityCluster with corePlanEntityObjective and corePlanEntityActivity. Updates to handle saving activities and objectives nested under clusters.
- 347f3be - (Joe Turgeon) HPC-637: Fixes for cluster entity save extension.
- f433628 - (Joe Turgeon) HPC-637: Extending cluster entity save routine to handle nested cluster objectives and activities. Altering saveSimpleEntity to add a transformer callback and ability to handle nested values.
- 8c869b2 - (Joe Turgeon) Merged in task/HPC-620/plan-web-content (pull request #34)
HPC-620: Model, Controller, and Test coverage for Web Content in Plans
- 10e2a7f - (Grayside) HPC-620: Revise plan controller and tests to read/save Web Content.
- a7c9a91 - (Eduardo Velez) Merged in feature/HPC-637-seed_data (pull request #33)
HPC-637: Adding seed.js code for core plan Objectives and Activities.
- ac48bd3 - (Joe Turgeon) HPC-637: Adding seed.js code for core plan Objectives and Activities. Also fixing the association of clusters, emergencies, objectives, and activities with plan in seed data.
- faa4239 - (Grayside) Merge remote-tracking branch 'origin/develop' into task/HPC-620/plan-web-content
- 1bac224 - (Eduardo Velez) Merged in feature/HPC-717-add_coreplanentityactivity (pull request #31)
HPC-717: Adding corePlanEntityActivity model and handling in plan save.
- 1239a86 - (Grayside) HPC-620: Add WebContentEntity data model.
- cc836fa - (Grayside) README readability improvements.
- 684b846 - (Grayside) Rearrange directory structure to streamline the top-level to match MVC practices.
- b74fa1a - (Tim Martin) Merged in feature/HPC-597-fix_new_plan_save (pull request #30)
HPC-597: Set default for governing cluster to prevent data loss when creating a plan.
- 614df52 - (Joe Turgeon) HPC-597: Set default for governing cluster to prevent data loss when creating a plan.
- 3902b71 - (Joe Turgeon) HPC-717: Adding corePlanEntityActivity model and handling in plan save.
- ddaebda - (Joe Turgeon) Merged in feature/HPC-632-core-plan-entity (pull request #29)
Added corePlanEntityObjectives with plan association
- 5b348c3 - (Tim Martin) Added corePlanEntityObjectives with plan association
- a1d37ad - (Eduardo Velez) Merged in feature/HPC-714-plan-type-endpoints (pull request #28)
Added logic to create/update planStructures on plan save
- ec9b854 - (Tim Martin) Added logic to create/update planStructures on plan save Fixed issue on create where unique IDs weren't being generated
- 72419bd - (Tim Martin) Merged in evelez/async-seed (pull request #27)
Use async when seeding data to prevent ref errors
- 350a20f - (Eduardo Velez) Use async when seeding data to prevent ref errors
- 1e153ff - (Tim Martin) Merged in evelez/HPC-534-emergency-show-type (pull request #26)
HPC-534: Return emergency type info with emergency
- 0f0e75e - (Eduardo Velez) HPC-534: Return emergency type info with emergency
- dcb29a1 - (Tim Martin) Merged in feature/HPC-714-plan-type-endpoints (pull request #25)
Updated seed
- b3d811e - (Tim Martin) Updated seed
- df3a62e - (Eduardo Velez) Merged in feature/HPC-714-plan-type-endpoints (pull request #24)
Added cluster number to governingEntityCluster
- 5fc2c2d - (Tim Martin) Associated emergencies to plan during save
- c45a3f1 - (Tim Martin) Added cluster number to governingEntityCluster Added ability to attach multiple globalClusters to governingEntityCluster
- 2e8797f - (Eduardo Velez) Merged in feature/HPC-714-plan-type-endpoints (pull request #23)
Added planType routes, controller and test cases
- 9e9de9d - (Tim Martin) Added planType routes, controller and test cases
- 44d7e32 - (Tim Martin) Merged in feature/HPC-599-save-plan-details (pull request #22)
Feature/hpc 599 save plan details
- 5d77546 - (Eduardo Velez) HPC-599: Add governingEntityCluster functionally
- fe40858 - (Tim Martin) Added additional logic
- 2eb80ea - (Tim Martin) Merged in evelez/HPC-534-address-location-cron-issues (pull request #21)
HPC-534: Swicth force option in sequelize.sync to true for the time being so db gets wiped on schema changes
- cfd6cdd - (Eduardo Velez) HPC-534: Swicth force option in sequelize.sync to true for the time being so db gets wiped on schema changes
- 426e1d3 - (Tim Martin) Added logic to return new plan after saving
- b82e520 - (Tim Martin) Added logic to save plan details
- ddd69ef - (Tim Martin) Merged in evelez/HPC-599-added-locaion-into-plan-model (pull request #20)
HPC-599: Added location to plan model
- 2b7949c - (Eduardo Velez) HPC-599: Added location to plan model
- ddeefdd - (Eduardo Velez) Merged in feature/HPC-598-create-plan-template-model (pull request #19)
Added planTemplate model, routes, controller and test cases
- 5d1875b - (Tim Martin) Added planTemplate model, routes, controller and test cases Removed XSD field from PlanStructure Added seed data
- fca3eb5 - (Eduardo Velez) Merged in feature/HPC-694-create-governing-entity (pull request #18)
Added governingEntity
- 4d31693 - (Tim Martin) Created governingEntity Created endpoints for planStatus
- d360893 - (Tim Martin) Merged in evelez/improve-startup-process (pull request #17)
Use config to populate db server and db name
- 937dfd0 - (Eduardo Velez) adding backslash to db server
- 9b02331 - (Eduardo Velez) Use config to populate db server and db name
- 7bf25ef - (Eduardo Velez) Merged in feature/HPC-692-plan-structure-model (pull request #16)
Added plan and plan structure models, controllers and endpoints
- 1666855 - (Tim Martin) Fixed name of variable
- 7a9afc7 - (Tim Martin) Removed commented code
- 778c23f - (Tim Martin) Merged in evelez/improve-startup-process (pull request #15)
Added logic for creating a db and cleaned up seed.js
- 1180358 - (Eduardo Velez) Added logic for creating a db and cleaned up seed.js
- 2e679d4 - (Tim Martin) Added new models, controllers and endpoints for - Plan - Plan Structure - Plan Status
- f436dcf - (Eduardo Velez) Merged in feature/HPC-645-update-devtools-vm (pull request #14)
Modified the docker config to support new devtools VM
- 7f36efa - (Tim Martin) Modified the docker config to support new devtools VM
- 664dd20 - (Eduardo Velez) Merged in feature/HPC-521-setup-testing-framework (pull request #13)
Feature/hpc 521 setup testing framework
- d3acbef - (Tim Martin) Removed unnecessary comma
- 2a97119 - (Tim Martin) Added test config as script parameter
- adbde99 - (Tim Martin) Merged in feature/HPC-640-create-and-populate-global-clusters (pull request #12)
HPC-640: Create global cluster model and populate from HRInfo API
- 28d99a4 - (Tim Martin) Added test docker image and config
- bca79da - (Tim Martin) Updated emergencyType endpoints Added test cases for emergencyTypes
- 403dcbc - (Eduardo Velez) HPC-640: Create global cluster model and populate from HRInfo API
Conflicts: controllers/rpm/emergency.js
- 33fdb54 - (Tim Martin) Testing platform config
- 9ab4bd2 - (Tim Martin) Merged in feature/HPC-603-location-data-model-and-hrinfo-import (pull request #11)
Added functionality to save location refs
- 2a9b8f9 - (Eduardo Velez) Rename emergncy route name
- 00d9d41 - (Eduardo Velez) remove unwanted lines
- 4db4a30 - (Eduardo Velez) merge conflicts
- 6631ad0 - (Eduardo Velez) added functionality to save location refs
- 5dd4c00 - (Joe Turgeon) Merged in feature/HPC-509-API-security (pull request #10)
Added API security middleware
- ec50905 - (Tim Martin) Removed commented code
- ad344f4 - (Tim Martin) Added API security parameters
- 85d61e0 - (Tim Martin) Added middleware
- ca58d20 - (Tim Martin) Merged in feature/HPC-603-location-data-model-and-hrinfo-import (pull request #9)
HPC-603: Locations data model and HRInfo import
- b820913 - (Eduardo Velez) Removed unwanted lines
- 159fd4e - (Eduardo Velez) HPC-603: Locations data model and HRInfo import
- bdd25e0 - (Joe Turgeon) Merged in feature/HPC-517-stage_env_config (pull request #8)
HPC-517: Updating service and nginx config for the stage env.
- dece1a0 - (Joe Turgeon) HPC-517: Updating service and nginx config for the stage env.
- 2f0dbbd - (Tim Martin) Merged in feature/HPC-517-stage_env_config (pull request #7)
HPC-517: Adding nginx and container config files for BlackMesh stage env.
- 3621cc2 - (Joe Turgeon) HPC-517: Adding nginx and container config files for BlackMesh stage env.
- 42636f4 - (Eduardo Velez) Merged in feature/HPC-549-emergency-data-model (pull request #6)
Feature/hpc 549 emergency data model
- b2b04da - (Eduardo Velez) location ref work
- 3f074bb - (Tim Martin) Restructured the controllers and models folders
- 85f5f08 - (Tim Martin) Removed entityType
- ed09ba5 - (Tim Martin) Added emergency type controller
- 4eeb9d7 - (Tim Martin) Added controller for emergency and removed logic from routes
- c5e5e2e - (Tim Martin) Removed restify-routes module and added logic to load routes files recursively Changed code to use basic server route declarations
- 7059c1a - (Tim Martin) Added location associations and seed data
- 0c960b9 - (Tim Martin) Added logic to load models recursively
- 022cb4a - (Tim Martin) Merged develop into master
- dd409aa - (Tim Martin) Merged in feature/HPC-542-setup-sequelize (pull request #5)
Modified readme
- 40607a0 - (Tim Martin) Modified read
- ae9b4e8 - (Eduardo Velez) Merged in feature/HPC-542-setup-sequelize (pull request #4)
Changed emergency-type endpoints and association logic
- e4eda13 - (Tim Martin) changed emergency-type endpoints and association logic
- afff80e - (Tim Martin) Merged in feature/HPC-542-setup-sequelize (pull request #3)
DB connection string fix
- 7dd2448 - (Tim Martin) DB connection string fix
- 98b9ebb - (Eduardo Velez) Merged in feature/HPC-542-setup-sequelize (pull request #2)
Setup sequelize
- bb61cba - (Tim Martin) Changed to findById for emergency get
- a59a475 - (Tim Martin) Added emergency types to the emergency model
- e0a2b9b - (Tim Martin) Merged in task/change_package_start (pull request #1)
Change package.json start script to use non-symlink node module binaries.
- 02c745a - (Tim Martin) Added emergency types
- 6bde4bf - (Tim Martin) Sequelize config
- 3e9cd4e - (Joe Turgeon) Change package.json start script to use non-symlink node module binaries.
- 3fe1332 - (Tim Martin) no message
- 5b3ec65 - (Tim Martin) Added db changes
- fe13efa - (Tim Martin) Removed unnecessary file
- a6bac8f - (Tim Martin) Added PostgreSQL VM and docker config
- 9c91fb7 - (Tim Martin) Added Docker config
- 08ee917 - (Tim Martin) Merge branches 'master' and 'master' of ssh://bitbucket.org/phase2tech/hpc_service
- bbac369 - (Tim Martin) no message
- fc8ec19 - (Tim Martin) README.md edited online with Bitbucket
- e9bf6bb - (Tim Martin) no message