Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

disposition merge to dev, dotnet 8 update, ef update. #3682

Merged
merged 43 commits into from
Jan 2, 2024
Merged

disposition merge to dev, dotnet 8 update, ef update. #3682

merged 43 commits into from
Jan 2, 2024

Conversation

devinleighsmith
Copy link
Collaborator

No description provided.

devinleighsmith and others added 30 commits November 15, 2023 09:01
@devinleighsmith
add date and time aliases to frontend. Add model typing to backend.
1d0fd93 
frontend/backend now use typings to better reflect desired use of field (id timestamp vs dateonly).
@devinleighsmith
psp-6887 update backend/frontend to support dateonly/ts
e558d5c
@dfilteau @FuriousLlama
IS-68.00 Database Schema - Disposition File (bcgov#3611)
cdec314 
* Provide Missing Seed Scripts for Alter Up in IS-65.00

- 134_DML_PIMS_PROP_MGMT_ACTIVITY_STATUS_TYPE.sql
- 135_DML_PIMS_PROP_MGMT_ACTIVITY_TYPE.sql
- 136_DML_PIMS_PROP_MGMT_ACTIVITY_SUBTYPE.sql

* Updated Alter Scripts

* IS-66.00 Database Schema

PSP_PIMS S66.00 Sprint 65 2023-Oct-24
- Added tables:
  - PIMS_PROJECT_PRODUCT
  - PIMS_PROJECT_PRODUCT_HIST
  - PIMS_PROPERTY_ACTIVITY_DOCUMENT
  - PIMS_PROPERTY_ACTIVITY_DOCUMENT_HIST
- Altered tables:
  - PIMS_PRODUCT
  - PIMS_PRODUCT_HIST
  - PIMS_TAKE
  - PIMS_TAKE_HIST
- Dropped tables:
  - PIMS_PROP_PROP_CLASSIFICATION_HIST
- Added test scripts:
  - 057_PIMS_PROJECT_PRODUCT.sql
  - 058_PIMS_TAKE.sql
- Altered test scripts:
  - 040_PIMS_PRODUCT.sql
  - 048_PIMS_COMPENSATION_REQUISITION.sql
- Requires additional metadata to meet standards

* Modified Alter_Up

* IS-68.00 Database Schema - Disposition File

PSP_PIMS S68.00 Disposition Sprint 67 2023-Nov-22
- Added tables:
  - PIMS_DISPOSITION_FILE
  - PIMS_DISPOSITION_FILE_HIST
  - PIMS_DISPOSITION_FILE_STATUS_TYPE
  - PIMS_DISPOSITION_FILE_TEAM
  - PIMS_DISPOSITION_FILE_TEAM_HIST
  - PIMS_DISPOSITION_FUNDING_TYPE
  - PIMS_DISPOSITION_INITIATING_DOC_TYPE
  - PIMS_DISPOSITION_STATUS_TYPE
  - PIMS_DISPOSITION_TYPE
  - PIMS_DSP_FL_TEAM_PROFILE_TYPE
  - PIMS_DSP_INITIATING_BRANCH_TYPE
  - PIMS_DSP_PHYS_FILE_STATUS_TYPE
  - PIMS_PROPERTY_DISPOSITION_FILE
  - PIMS_PROPERTY_DISPOSITION_FILE_HIST
- Added seed scripts:
  - 138_DML_PIMS_DISPOSITION_FILE_STATUS_TYPE.sql
  - 139_DML_PIMS_DISPOSITION_STATUS_TYPE.sql
  - 140_DML_PIMS_DISPOSITION_TYPE.sql
  - 141_DML_PIMS_DISPOSITION_INITIATING_DOC_TYPE.sql
  - 142_DML_PIMS_DSP_PHYS_FILE_STATUS_TYPE.sql
  - 143_DML_PIMS_DSP_INITIATING_BRANCH_TYPE.sql
  - 144_DML_PIMS_DSP_FL_TEAM_PROFILE_TYPE.sql
  - 145_DML_PIMS_DISPOSITION_FUNDING_TYPE.sql
- Added test scripts:
  - 060_PIMS_DISPOSITION_FILE.sql
  - 061_PIMS_PROPERTY_DISPOSITION_FILE.sql
  - 062_PIMS_DISPOSITION_FILE_TEAM.sql
- Requires additional metadata to meet standards

---------

Co-authored-by: Manuel Rodriguez <marobej@gmail.com>
@FuriousLlama
Scaffold/disposition (bcgov#3615)
e37a0a7 
* Generated scaffold

* Scaffolded
@eddherrera
PSP-7330 : Create disposition Claims (bcgov#3616)
d1c5291 
Co-authored-by: Eduardo Herrera <Eduardo.Herrera@quartech.com>
@devinleighsmith
Psp 7281 (bcgov#3617)
4fd93c5 
* psp-7281 disposition file framework.

* test corrections

* lint correction.

* code review corrections.

* correct input mapping.

* correct typo.
@FuriousLlama @github-actions
Disposition alignment (bcgov#3623)
435cc2b 
* Added check status logic when updating acq and related entities | psp-7006 (bcgov#3602)

* Added status checking to details, take, compensation and other acq file pages

* Updated backend and updated tests

* Fixed lint

* Refactored solver to be simpler

* Added tests

* Pr comments

* Added the sys-admin to edit acquisition fields

* CI: Bump version to v4.0.0-67.24

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@FuriousLlama
Disposition menu (bcgov#3625)
6fcb6a1 
* Created disposition tray file

* Added dispoisiton claims
@devinleighsmith
psp-7281 unit tests for disposition framework and adding missing look…
c03458a 
…up code. (bcgov#3619)

Co-authored-by: Smith <Devin.Smith@quartech.com>
dotnet8, ef8 migration.
fb5e1a5
Merge remote-tracking branch 'origin/psp-6887' into dotnet8_update
6b0ad6c
merge with date changes.
ef9de9d
@devinleighsmith
Psp 6951 - view disposition file details. (bcgov#3626)
31b2787 
* psp-6949 view disposition file summary.

* update keycloak test url.

---------

Co-authored-by: Smith <Devin.Smith@quartech.com>
@asanchezr
PSP-6952 disposition list view (bcgov#3627)
43373bc 
* Disposition List - basic view, styles and models

* Move and rename common list view component

* Refactor expandable file properties into common component

* Wire up disposition results sub-component

* Disposition list filter component

* Implement disposition search controller.

- updates to service and repository
- model updates

* Enable frontend routing to disposition list view

* Add service call to disposition search endpoint

* Load lookup codes, team members into disposition list filter

* Add new endpoint for list of team members

* Backend mapping fixes

* Add missing lookup table

* Use the right lookup tables for filtering disposition list

* Fix formik field name

* Implement remaining filters

* Fix merge conflict

* Fix number conversion bug

* Fix sorting issues on disposition list

* PR feedback
@devinleighsmith
dateonly type corrections.
14c1a4c
@devinleighsmith
.net 8.0 github update.
fd49d7c
@devinleighsmith
test updates, update openshift configuration.
1f5210d
@FuriousLlama @github-actions
@devinleighsmith @asanchezr
Disposition/align2 (bcgov#3640)
538a6d0 
* Added check status logic when updating acq and related entities | psp-7006 (bcgov#3602)

* Added status checking to details, take, compensation and other acq file pages

* Updated backend and updated tests

* Fixed lint

* Refactored solver to be simpler

* Added tests

* Pr comments

* Added the sys-admin to edit acquisition fields

* CI: Bump version to v4.0.0-67.24

* Updated placeholder display (bcgov#3620)

* CI: Bump version to v4.0.0-67.25

* dialog correction. (bcgov#3629)

Co-authored-by: Smith <Devin.Smith@quartech.com>

* CI: Bump version to v4.0.0-67.26

* Keycloak Refactor (bcgov#3624)

* Refactored keycloak sync to use the keycloak repository used by the API. ALso removed tools.Core and removed redundant models

* pr fixes

* CI: Bump version to v4.0.0-67.27

* System error modal | psp-7304 (bcgov#3628)

* Updated Generic modal to use a variant

* Improved System error modal

* Lit fixes

* Info fixes

* CI: Bump version to v4.0.0-67.28

* psp-7346 correct bracket usage, ensure logic limited to file close only. (bcgov#3622)

* psp-7346 correct bracket usage, ensure logic limited to file close only.

* comment from code review.

* test correction.

---------

Co-authored-by: Smith <Devin.Smith@quartech.com>

* CI: Bump version to v4.0.0-67.29

* requested source marked as nullable for validation. (bcgov#3630)

Co-authored-by: Smith <Devin.Smith@quartech.com>

* CI: Bump version to v4.0.0-67.30

* allow showing the edit screen for management activity while the popout is open. (bcgov#3632)

Co-authored-by: Smith <Devin.Smith@quartech.com>

* CI: Bump version to v4.0.0-67.31

* Pims api to Frontend ts generator and generated files (bcgov#3618)

* Refactored concept models. Created a new library and cleaned dependencies between projects. Cleaned names of reused concepts and standarized concept namespace. Cleaned extension and help files

* Fixed lints

* Initial generator work

* Cleaned up files and improved translation

* Updated namespaces and path for the api models

* Updated generator and cleaned up code

* Added make command to generate ts api files and lint them.

* First generation of the pims api.

* Cleaned up generator and handled generic types. Improved header docks.

* Fixed solution

* Updated models for keycloak sync and fixed lint warnings

* Fixed registering mappers

* CI: Bump version to v4.0.0-67.32

* Bump DEV version - IS68 (bcgov#3636)

* CI: Bump version to v4.0.0-68.1

* Manual merges and re-generated snaps

* moved disposition models to the new api-models project

* re-generated api models

* Changed disposition property to property model type

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: devinleighsmith <41091511+devinleighsmith@users.noreply.github.com>
Co-authored-by: Smith <Devin.Smith@quartech.com>
Co-authored-by: Alejandro Sanchez <emailforasr@gmail.com>
@FuriousLlama @github-actions
Disposition/menu entry (bcgov#3639)
5a52cfe 
* Added check status logic when updating acq and related entities | psp-7006 (bcgov#3602)

* Added status checking to details, take, compensation and other acq file pages

* Updated backend and updated tests

* Fixed lint

* Refactored solver to be simpler

* Added tests

* Pr comments

* Added the sys-admin to edit acquisition fields

* CI: Bump version to v4.0.0-67.24

* Updated placeholder display (bcgov#3620)

* CI: Bump version to v4.0.0-67.25

* Added the disposition entry into the menu list

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@eddherrera
PSP-6948 : Create a disposition file (bcgov#3631)
6875779
@asanchezr
PSP-6952 tests (bcgov#3634)
9c9c899 
* Disposition backend unit tests

* Frontend unit tests

* Update mock lookup codes

* Additional frontend tests

* Revert mock roles (will create tech-debt to fix those)

* Update snapshots

* Update snapshots
@dfilteau @FuriousLlama
IS-69.00 Database Schema (bcgov#3642)
3cf3016 
* IS-69.00 Database Schema

PSP_PIMS S69.00 Sprint 69 2023-Dec-06
- Added tables:
  - PIMS_DISPOSITION_CHECKLIST_ITEM
  - PIMS_DISPOSITION_CHECKLIST_ITEM_HIST
  - PIMS_DISPOSITION_FILE
  - PIMS_DISPOSITION_FILE_HIST
  - PIMS_DISPOSITION_FILE_DOCUMENT
  - PIMS_DISPOSITION_FILE_DOCUMENT_HIST
  - PIMS_DISPOSITION_FILE_NOTE
  - PIMS_DISPOSITION_FILE_NOTE_HIST
  - PIMS_DISPOSITION_FILE_PROPERTY
  - PIMS_DISPOSITION_FILE_PROPERTY_HIST
  - PIMS_DISPOSITION_FILE_STATUS_TYPE
  - PIMS_DISPOSITION_FILE_TEAM
  - PIMS_DISPOSITION_FILE_TEAM_HIST
  - PIMS_DISPOSITION_FUNDING_TYPE
  - PIMS_DISPOSITION_INITIATING_DOC_TYPE
  - PIMS_DISPOSITION_OFFER
  - PIMS_DISPOSITION_OFFER_HIST
  - PIMS_DISPOSITION_OFFER_STATUS_TYPE
  - PIMS_DISPOSITION_PURCHASER
  - PIMS_DISPOSITION_PURCHASER_HIST
  - PIMS_DISPOSITION_SALE
  - PIMS_DISPOSITION_SALE_HIST
  - PIMS_DISPOSITION_STATUS_TYPE
  - PIMS_DISPOSITION_TYPE
  - PIMS_DSP_CHKLST_ITEM_STATUS_TYPE
  - PIMS_DSP_CHKLST_ITEM_TYPE
  - PIMS_DSP_CHKLST_SECTION_TYPE
  - PIMS_DSP_FL_TEAM_PROFILE_TYPE
  - PIMS_DSP_INITIATING_BRANCH_TYPE
  - PIMS_DSP_PHYS_FILE_STATUS_TYPE
  - PIMS_DSP_PURCH_AGENT
  - PIMS_DSP_PURCH_AGENT_HIST
  - PIMS_DSP_PURCH_SOLICITOR
  - PIMS_DSP_PURCH_SOLICITOR_HIST
- Added seed scripts:
  - 138_DML_PIMS_DISPOSITION_FILE_STATUS_TYPE.sql
  - 139_DML_PIMS_DISPOSITION_STATUS_TYPE.sql
  - 140_DML_PIMS_DISPOSITION_TYPE.sql
  - 141_DML_PIMS_DISPOSITION_INITIATING_DOC_TYPE.sql
  - 142_DML_PIMS_DSP_PHYS_FILE_STATUS_TYPE.sql
  - 143_DML_PIMS_DSP_INITIATING_BRANCH_TYPE.sql
  - 144_DML_PIMS_DSP_FL_TEAM_PROFILE_TYPE.sql
  - 145_DML_PIMS_DISPOSITION_FUNDING_TYPE.sql
  - 146_DML_PIMS_DSP_CHKLST_ITEM_STATUS_TYPE.sql
  - 147_DML_PIMS_DSP_CHKLST_SECTION_TYPE.sql
  - 148_DML_PIMS_DSP_CHKLST_ITEM_TYPE.sql
  - 149_DML_PIMS_DISPOSITION_OFFER_STATUS_TYPE.sql
- Altered seed scripts:
  - 128_DML_PIMS_LAND_ACT_TYPE.sql
- Added test scripts:
  - 060_PIMS_DISPOSITION_FILE.sql
  - 061_PIMS_DISPOSITION_FILE_PROPERTY.sql
  - 062_PIMS_DISPOSITION_FILE_TEAM.sql
  - 063_PIMS_DISPOSITION_FILE_NOTE.sql
  - 064_PIMS_DISPOSITION_FILE_DOCUMENT.sql
  - 065_PIMS_DISPOSITION_OFFER.sql
  - 066_PIMS_DISPOSITION_SALE.sql
  - 067_PIMS_DISPOSITION_PURCHASER.sql
  - 068_PIMS_DSP_PURCH_SOLICITOR.sql
  - 069_PIMS_DSP_PURCH_AGENT.sql
  - 070_PIMS_DISPOSITION_CHECKLIST_ITEM.sql
- Requires additional metadata to meet standards

* Static Variable Version Corrected

* Renamed folder to make it work with cml

* Updated test scripts

* Moved 69 changes to 68 folder

* Update test notes and checklist

---------

Co-authored-by: Manuel Rodriguez <marobej@gmail.com>
@FuriousLlama
Generated Scaffold (bcgov#3660)
6c6e56d
@eddherrera
Fix disposition scaffold (bcgov#3664)
a3aa26a 
Co-authored-by: Eduardo Herrera <Eduardo.Herrera@quartech.com>
@FuriousLlama
Merge branch 'dev' into disposition_align
16e493a
@FuriousLlama
manual merge
7d484d5
@asanchezr
Merge pull request bcgov#3668 from FuriousLlama/disposition_align
70fae36 
Disposition alignment from Dev
@asanchezr
PSP-6954 disposition documents (bcgov#3672)
35e46ca 
* Add disposition file document repository

* Update document relationship constants and mappings

* Document service updates

* Document controller updates and permission fixes

* Add documents to disposition file frontend

* Fix typo

* Minor corrections

* Align permissions for deleting documents

* Add backend unit tests

* Update snapshots
@devinleighsmith
Psp 6955 disposition notes. (bcgov#3673)
762fa14 
* psp-6955 add disposition notes.

* test corrections.

* merge corrections.
@asanchezr
PSP-7269 create disposition from map popup (bcgov#3675)
e230d02 
* PSP-7269 create disposition from map

* Test updates
eddherrera and others added 7 commits December 21, 2023 12:54
@eddherrera
PSP-7247 : View disposition file (offers and sale) (bcgov#3669)
81d77b5 
Co-authored-by: Eduardo Herrera <Eduardo.Herrera@quartech.com>
Merge remote-tracking branch 'upstream/dev' into dotnet8_update
bd9a461
Merge branch 'dotnet8_update' into psp-6887
345470d 
# Conflicts:
#	source/backend/api/Areas/Keycloak/Mapping/AccessRequest/AccessRequestOrganizationMap.cs
#	source/backend/api/Areas/Keycloak/Mapping/AccessRequest/AccessRequestUserMap.cs
#	source/backend/api/Areas/Keycloak/Mapping/User/UserMap.cs
#	source/backend/api/Areas/Reports/Mapping/User/UserMap.cs
#	source/backend/api/Mapping/User/UserMap.cs
#	source/backend/api/Pims.Api.csproj
#	source/backend/api/Services/CompensationRequisitionService.cs
#	source/backend/apimodels/Models/Base/TypeMap.cs
#	source/backend/apimodels/Models/Concepts/AcquisitionFile/AgreementMap.cs
#	source/backend/apimodels/Models/Concepts/AcquisitionFile/AgreementModel.cs
#	source/backend/apimodels/Models/Concepts/Note/NoteMap.cs
#	source/backend/apimodels/Models/Concepts/Take/TakeMap.cs
#	source/backend/entities/PimsBaseContext.cs
#	source/backend/entities/ef/PimsDispositionFile.cs
#	source/backend/entities/ef/PimsDispositionFileHist.cs
#	source/backend/entities/ef/PimsDispositionFileStatusType.cs
#	source/backend/entities/ef/PimsDispositionFileTeam.cs
#	source/backend/entities/ef/PimsDispositionFileTeamHist.cs
#	source/backend/entities/ef/PimsDispositionFundingType.cs
#	source/backend/entities/ef/PimsDispositionInitiatingDocType.cs
#	source/backend/entities/ef/PimsDispositionStatusType.cs
#	source/backend/entities/ef/PimsDispositionType.cs
#	source/backend/entities/ef/PimsDocument.cs
#	source/backend/entities/ef/PimsDspFlTeamProfileType.cs
#	source/backend/entities/ef/PimsDspInitiatingBranchType.cs
#	source/backend/entities/ef/PimsDspPhysFileStatusType.cs
#	source/backend/entities/ef/PimsNote.cs
#	source/backend/entities/ef/PimsOrganization.cs
#	source/backend/entities/ef/PimsPerson.cs
#	source/backend/entities/ef/PimsProperty.cs
#	source/backend/entities/ef/PimsRegion.cs
#	source/frontend/src/models/api/Agreement.ts
Merge remote-tracking branch 'upstream/disposition' into dotnet8_update
72fb124
DateOnly corrections, warnings, disposition appraisal entity/model co…
f542f3e 
…rrrections.
Merge remote-tracking branch 'origin/dotnet8_update' into dotnet8_update
0dea7c3
disposition file test corrections.
6872594
@devinleighsmith devinleighsmith added the enhancement New feature or request label Dec 22, 2023
@devinleighsmith devinleighsmith self-assigned this Dec 22, 2023
@github-actions GitHub Actions
Copy link
Contributor

✅ No secrets were detected in the code.

@codecov Codecov
Copy link

codecov bot commented Dec 22, 2023 •
edited
Loading

Codecov Report

Attention: 299 lines in your changes are missing coverage. Please review.

Comparison is base (eadaa1b) 69.62% compared to head (382a6e7) 71.49%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##              dev    #3682      +/-   ##
==========================================
+ Coverage   69.62%   71.49%   +1.87%     
==========================================
  Files        1373     1423      +50     
  Lines       34438    36146    +1708     
  Branches     6489     6775     +286     
==========================================
+ Hits        23977    25843    +1866     
+ Misses      10204    10038     -166     
- Partials      257      265       +8
Flag Coverage Δ
unittests 71.49% <71.95%> (+1.87%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
...ping/AccessRequest/AccessRequestOrganizationMap.cs 100.00% <100.00%> (ø)
...loak/Mapping/AccessRequest/AccessRequestUserMap.cs 100.00% <100.00%> (ø)
...backend/api/Areas/Keycloak/Mapping/User/UserMap.cs 100.00% <100.00%> (ø)
...backend/api/Areas/Leases/Models/Search/LeaseMap.cs 100.00% <100.00%> (ø)
.../Areas/Property/Mapping/Property/AssociationMap.cs 100.00% <100.00%> (ø)
.../backend/api/Areas/Reports/Mapping/User/UserMap.cs 100.00% <100.00%> (ø)
source/backend/api/Controllers/LookupController.cs 100.00% <100.00%> (ø)
source/backend/api/Mapping/Lookup/LookupMap.cs 100.00% <100.00%> (ø)
...urce/backend/api/Mapping/Lookup/OrganizationMap.cs 100.00% <100.00%> (ø)
source/backend/api/Mapping/User/OrganizationMap.cs 100.00% <100.00%> (ø)
... and 64 more

... and 68 files with indirect coverage changes

@github-actions GitHub Actions
Copy link
Contributor

✅ No secrets were detected in the code.

@github-actions GitHub Actions
Copy link
Contributor

✅ No secrets were detected in the code.

@github-actions GitHub Actions
Copy link
Contributor

✅ No secrets were detected in the code.

@github-actions GitHub Actions
Copy link
Contributor

✅ No secrets were detected in the code.

@devinleighsmith
Copy link
Collaborator Author

@eddherrera please review this when possible.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 2, 2024

✅ No secrets were detected in the code.

@eddherrera eddherrera self-requested a review January 2, 2024 18:54
@eddherrera
Copy link
Collaborator

eddherrera commented Jan 2, 2024 •
edited
Loading

@eddherrera please review this when possible.

Looks good, the only change I had to make to make it work on my local was the following setting to the connection string for the .env file.

Otherwise I get connections errors to the database.

image

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 2, 2024

✅ No secrets were detected in the code.

@devinleighsmith devinleighsmith merged commit 1db563b into bcgov:dev Jan 2, 2024
8 of 9 checks passed
@devinleighsmith devinleighsmith mentioned this pull request Aug 19, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eddherrera eddherrera eddherrera approved these changes

Assignees

@devinleighsmith devinleighsmith

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@devinleighsmith @eddherrera @dfilteau @FuriousLlama @asanchezr