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

feat: 1435 different parent tree gw values and date update #1491

Merged
merged 32 commits into from
Aug 13, 2024
Merged

feat: 1435 different parent tree gw values and date update #1491

merged 32 commits into from
Aug 13, 2024

Conversation

craigyu
Copy link
Collaborator

@craigyu craigyu commented Aug 9, 2024 •
edited by github-actions bot
Loading

Description

Completes the implementation part of #1435, tests needed
!!! Needs to wipe the draft table after merge !!!
ETL should be unaffected

I will fix and add tests on Monday, let's get changes in so we can test and spot issues. Currently, affected tests are commented out but marked with TODO.

I will also remove the oracle-api endpoint /api/orchards/parent-trees/vegetation-codes/{vegCode}, the new endpoint is now /api/parent-trees/vegetation-codes/{vegCode}

Changelog

New

  • Migration file that adds default bv values

Changed

  • how parents are fetched by a vegetation code
  • genetic worth values are filled by matching primary SPU id, use default for everything else
  • parent tree's genetic worth value is displayed in red and with brackets if it's using default value
  • Frontend now fetches orchards from backend API instead of Oracle-api so it can have an spu id
  • Stores UTC on backend, display Vancouver date/time on frontend

Removed

  • None

How was this tested?

  • 🧠 Not needed
  • 👀 Eyeball
  • 🤖 Added tests

What gif/image best describes this PR or how it makes you feel?

Thanks for the PR!

Deployments, as required, will be available below:

Please create PRs in draft mode. Mark as ready to enable:

After merge, new images are deployed in:

Thanks for the PR!

Deployments, as required, will be available below:

Please create PRs in draft mode. Mark as ready to enable:

After merge, new images are deployed in:

craigyu added 18 commits July 29, 2024 10:36
@craigyu
fix: stash WIP
ca30cb8
@craigyu
fix: pt query
4012dca
@craigyu
Merge commit '488f4a8331055e7067cdabc87724ffb3ea78462c' into feat/143…
4c2306a 
…5-different-parent-tree-gw-values
@craigyu
feat: new parent tree endpoint
9ebb9b3
@craigyu
fix: frontend adjustment with new endpoint
cf6f4d4
@craigyu
fix: add spu to orchard dto
904ebd1
@craigyu
fix: skeleton display while orchard fetching
6fa88b8
@craigyu
fix: enforce UTC timestamp
544c110
@craigyu
fix: frontend refactor
ee1ab94
@craigyu
fix: parent tree from outside
4c77b55
@craigyu
feat: add red colour to estimated gw
cad0f22
@craigyu
fix: adds bracket
4877192
@craigyu
Merge commit 'fbce61e477ca4734d8744237de14941263bf3e9c' into feat/143…
8380e48 
…5-different-parent-tree-gw-values

# Conflicts:
#	backend/src/main/java/ca/bc/gov/backendstartapi/service/TscAdminService.java
#	backend/src/test/java/ca/bc/gov/backendstartapi/repository/seedlot/SeedlotEntityRelationalTest.java
#	backend/src/test/java/ca/bc/gov/backendstartapi/repository/seedlot/SeedlotRelationalTest.java
#	backend/src/test/java/ca/bc/gov/backendstartapi/service/SeedlotCollectionMethodServiceTest.java
#	backend/src/test/java/ca/bc/gov/backendstartapi/service/SeedlotFormPutTest.java
@craigyu
fix: styles
c307c04
@craigyu
fix: refactor for submit seedlot
285e018
@craigyu
fix: set untested_ind
21d1ec2
@craigyu
fix: tested ind reverse not possible
63a2a45
@craigyu
fix: comment
87f271f
@craigyu craigyu self-assigned this Aug 9, 2024
@craigyu craigyu linked an issue Aug 9, 2024 that may be closed by this pull request
Different parent tree GW values + utc date changes #1435
Closed
@craigyu craigyu mentioned this pull request Aug 9, 2024
Merged
3 tasks
@craigyu craigyu mentioned this pull request Aug 9, 2024
Closed
mgaseta
mgaseta approved these changes Aug 9, 2024
View reviewed changes
Copy link
Collaborator

@mgaseta mgaseta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice job @craigyu!

Added a few markups, but nothing major, I'll tag them as resolved so we can merge the PR as soon as possible, but you can take a look at them later.

backend/src/main/java/ca/bc/gov/backendstartapi/service/OrchardService.java Show resolved Hide resolved
backend/src/main/java/ca/bc/gov/backendstartapi/service/OrchardService.java Outdated Show resolved Hide resolved
backend/src/main/java/ca/bc/gov/backendstartapi/service/SeedlotService.java Outdated Show resolved Hide resolved
backend/src/main/java/ca/bc/gov/backendstartapi/service/SeedlotService.java Outdated Show resolved Hide resolved
frontend/src/components/SeedlotRegistrationSteps/ParentTreeStep/TableComponents/index.tsx Outdated Show resolved Hide resolved
frontend/src/components/SeedlotRegistrationSteps/ParentTreeStep/constants.tsx Show resolved Hide resolved
RMCampos
RMCampos suggested changes Aug 9, 2024
View reviewed changes
Copy link
Contributor

@RMCampos RMCampos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great job Craig! Only a few items. 💯 🥇

backend/src/main/java/ca/bc/gov/backendstartapi/endpoint/GeneticWorthEndpoint.java Outdated Show resolved Hide resolved
backend/src/main/java/ca/bc/gov/backendstartapi/endpoint/OrchardEndpoint.java Outdated Show resolved Hide resolved
backend/src/main/java/ca/bc/gov/backendstartapi/entity/GeneticWorthEntity.java Show resolved Hide resolved
backend/src/main/java/ca/bc/gov/backendstartapi/entity/GeneticWorthEntity.java Outdated Show resolved Hide resolved
oracle-api/src/main/java/ca/bc/gov/oracleapi/entity/projection/ParentTreeProj.java Show resolved Hide resolved
oracle-api/src/main/java/ca/bc/gov/oracleapi/service/ParentTreeService.java Outdated Show resolved Hide resolved
oracle-api/src/main/java/ca/bc/gov/oracleapi/repository/ParentTreeRepository.java Outdated Show resolved Hide resolved
frontend/src/utils/SeedlotUtils.ts Outdated
Comment on lines 47 to 49
createdAt: utcToLocalFormat(seedlot.auditInformation.entryTimestamp),
lastUpdatedAt: utcToLocalFormat(seedlot.auditInformation.updateTimestamp),
approvedAt: utcToLocalFormat(seedlot.approvedTimestamp)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question (non-blocking): I'm not sure we're actually displaying the time. I can see only dates here. That's the way it should be?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't recall seeing time on Figma, i think adding time the column will be too wide in tables, let's consult @mmarsoleta later in the standup

@craigyu craigyu requested a review from RMCampos August 12, 2024 17:17
@craigyu
Merge commit '5fe264246b80c2f1094010c55faeef1460ea875f' into feat/143…
b32f40b 
…5-different-parent-tree-gw-values

# Conflicts:
#	frontend/src/components/SeedlotReviewSteps/ExtractionStorage/Read/index.tsx
RMCampos
RMCampos approved these changes Aug 12, 2024
View reviewed changes
Copy link
Contributor

@RMCampos RMCampos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@craigyu craigyu merged commit f404764 into main Aug 13, 2024
21 of 25 checks passed
@craigyu craigyu deleted the feat/1435-different-parent-tree-gw-values branch August 13, 2024 00:29
@mgaseta mgaseta mentioned this pull request Aug 13, 2024
Closed
@craigyu craigyu restored the feat/1435-different-parent-tree-gw-values branch August 26, 2024 15:42
@DerekRoberts DerekRoberts deleted the feat/1435-different-parent-tree-gw-values branch September 19, 2024 23:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mgaseta mgaseta mgaseta approved these changes

@RMCampos RMCampos RMCampos approved these changes

@DerekRoberts DerekRoberts Awaiting requested review from DerekRoberts DerekRoberts is a code owner

@SLDonnelly SLDonnelly Awaiting requested review from SLDonnelly SLDonnelly is a code owner

Assignees

@craigyu craigyu

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Different parent tree GW values + utc date changes
3 participants
@craigyu @RMCampos @mgaseta