WFPREV-127 Add activity endpoints #468

ssylver93 · 2025-01-29T23:22:59Z

No description provided.

…eature/WFPREV-127

yzlucas · 2025-01-30T17:21:39Z

server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/entities/ActivityEntity.java

+    private String activityDescription;
+
+    @NotNull
+    @Column(name = "activity_start_date")


I think activity_start_date, and activity_end_date are mandatory field, not nullable in database schema?

Thanks, done

server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/entities/ActivityEntity.java

yzlucas · 2025-01-30T17:36:55Z

Looks good. Had some question around nullable thing, please feel free to resolve conversation once confirm.
I assume the postman script and GraalVm config will be added?

ssylver93 · 2025-01-30T17:39:13Z

Looks good. Had some question around nullable thing, please feel free to resolve conversation once confirm. I assume the postman script and GraalVm config will be added?

@yzlucas yeah I need to add Postman and GraalVM config, I'll add them with my commit for the nullable = false attributes

yzlucas · 2025-01-30T17:40:41Z

server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/entities/ActivityEntity.java

+    private String activityName;
+
+    @NotNull
+    @Column(name = "activity_description", length = 4000)


please also add this as nullable = false

Thanks, done

yzlucas · 2025-01-30T17:41:33Z

server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/entities/ActivityEntity.java

+    private UUID activityFundingSourceGuid;
+
+    @NotNull
+    @Column(name = "activity_name", length = 4000)


Thanks, done

dhlevi

Are you missing configurations for GraalVM?

dhlevi · 2025-01-30T18:15:08Z

server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/services/ActivityService.java

+        try {
+            // Verify project fiscal exists and belongs to project
+            ProjectFiscalEntity projectFiscal = projectFiscalRepository.findById(UUID.fromString(fiscalGuid))
+                    .orElseThrow(() -> new EntityNotFoundException(FISCAL_NOT_FOUND + fiscalGuid));


You could use MessageFormat.format("{0}: {1}", FISCAL_NOT_FOUND, fiscalGuid);
So you don't need to add the Colon and Space to the constant string. Same for other spots. Optional of course, what's here is fine.

Good tip, I've updated now

dhlevi · 2025-01-30T18:21:44Z

server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/services/ActivityService.java

+    public void assignAssociatedEntities(ActivityModel resource, ActivityEntity entity) {
+        if (resource.getActivityStatusCode() != null) {
+            String forestAreaCode1 = resource.getActivityStatusCode().getActivityStatusCode();
+            ActivityStatusCodeEntity activityStatusCode = loadActivityStatusCode(forestAreaCode1);


You're only calling the load<code> methods in this one spot. Why have them in their own methods? You can just use the code directly here?

Changed to access the code directly

dhlevi · 2025-01-30T18:23:12Z

server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/services/ActivityService.java

+    public ActivityStatusCodeEntity loadActivityStatusCode(String activityStatusCode) {
+        return activityStatusCodeRepository
+                .findById(activityStatusCode)
+                .orElseThrow(() -> new IllegalArgumentException("ActivityStatusCode not found: " + activityStatusCode));


You're calling "or else throw" but the thrown error is never handled anywhere up the chain. Are we assuming this is just a global throw that should fail the whole process?

Catch statements added to ActivityController

dhlevi · 2025-01-30T18:26:56Z

server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/services/ActivityService.java

+        activityRepository.deleteById(UUID.fromString(activityGuid));
+    }
+
+    public void assignAssociatedEntities(ActivityModel resource, ActivityEntity entity) {


Binding these codes to objects from resource to entity should be handled by hibernate already. Thats what the @ManyToOne(fetch = FetchType.EAGER, optional = true) bits are doing. Why are we manually applying them here from the same value? What am I missing?

I think assigning them manually is needed as when I break at line 197, the code models do not have each field populated, just their relevant code string

When these codes do not get manually assigned the insert gives the error org.hibernate.TransientPropertyValueException: object references an unsaved transient instance - save the transient instance before flushing : ca.bc.gov.nrs.wfprev.data.entities.ActivityEntity.activityStatusCode -> ca.bc.gov.nrs.wfprev.data.entities.ActivityStatusCodeEntity

Ah. This will be an issue with the relationship fetch/cascade rules. We can look into that later

dhlevi · 2025-01-30T18:40:22Z

Are you missing configurations for GraalVM?

I see Lucas mentioned above and you replied that it's coming, so ignore this comment!

…eature/WFPREV-127

sonarqubecloud · 2025-01-30T22:59:07Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
87.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

ssylver93 added 20 commits January 23, 2025 14:20

WFPREV-127 add Activity Status Code to codes endpoint

2497289

Revert SecurityConfig

74c4af7

Add lat long to project create & update in Postman collection

3339d83

Merge branch 'main' of https://github.com/bcgov/nr-bcws-wfprev into f…

7d2bffb

…eature/WFPREV-127

Merge branch 'main' of https://github.com/bcgov/nr-bcws-wfprev into f…

0119646

…eature/WFPREV-127

WFPREV-127 add Risk Rating and Contract Phase to codes endpoint

de1e97e

Update postman collection

32d8568

Fix merge conflict

00e9763

Merge branch 'main' of https://github.com/bcgov/nr-bcws-wfprev into f…

cf10181

…eature/WFPREV-127

Fix testGetActivityCategoryCodeById_Exception

ae5eb95

Fix merge conflict

fbbe89a

Merge branch 'main' of https://github.com/bcgov/nr-bcws-wfprev into f…

ab3cf1c

…eature/WFPREV-127

Add activity endpoints

1370d26

Remove duplicates for sonar

3e21a63

More tests

8b13756

Add more tests

2790113

Make fields static

7aee9e5

Add more tests

07a0c98

Fix sonar issues

edfcf52

Reorder imports

50b467b

ssylver93 requested review from yzlucas and dhlevi January 30, 2025 02:36

yzlucas reviewed Jan 30, 2025

View reviewed changes

server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/entities/ActivityEntity.java Show resolved Hide resolved

yzlucas reviewed Jan 30, 2025

View reviewed changes

dhlevi previously approved these changes Jan 30, 2025

View reviewed changes

ssylver93 added 2 commits January 30, 2025 12:14

Merge branch 'main' of https://github.com/bcgov/nr-bcws-wfprev into f…

389b999

…eature/WFPREV-127

Changes after code review

b5db41d

ssylver93 dismissed dhlevi’s stale review via b5db41d January 30, 2025 22:22

ssylver93 force-pushed the feature/WFPREV-127 branch from 04511ab to b5db41d Compare January 30, 2025 22:22

ssylver93 added 2 commits January 30, 2025 14:36

Fix sonar issues

0601b54

Make activity start/end dates non nullable in db

43eebf5

yzlucas self-requested a review January 30, 2025 23:00

yzlucas approved these changes Jan 30, 2025

View reviewed changes

ssylver93 merged commit fa25b3d into main Jan 31, 2025
7 checks passed

ssylver93 deleted the feature/WFPREV-127 branch January 31, 2025 00:21

ssylver93 temporarily deployed to dev January 31, 2025 00:31 — with GitHub Actions Inactive

ssylver93 temporarily deployed to dev January 31, 2025 00:32 — with GitHub Actions Inactive

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WFPREV-127 Add activity endpoints #468

WFPREV-127 Add activity endpoints #468

ssylver93 commented Jan 29, 2025

yzlucas Jan 30, 2025 •

edited

Loading

ssylver93 Jan 30, 2025

yzlucas commented Jan 30, 2025

ssylver93 commented Jan 30, 2025

yzlucas Jan 30, 2025

ssylver93 Jan 30, 2025

yzlucas Jan 30, 2025

ssylver93 Jan 30, 2025

dhlevi left a comment

dhlevi Jan 30, 2025

ssylver93 Jan 30, 2025

dhlevi Jan 30, 2025

ssylver93 Jan 30, 2025

dhlevi Jan 30, 2025

ssylver93 Jan 30, 2025

dhlevi Jan 30, 2025

ssylver93 Jan 30, 2025

dhlevi Jan 30, 2025

dhlevi commented Jan 30, 2025

sonarqubecloud bot commented Jan 30, 2025

WFPREV-127 Add activity endpoints #468

WFPREV-127 Add activity endpoints #468

Conversation

ssylver93 commented Jan 29, 2025

yzlucas Jan 30, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yzlucas commented Jan 30, 2025

ssylver93 commented Jan 30, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dhlevi left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dhlevi commented Jan 30, 2025

sonarqubecloud bot commented Jan 30, 2025

Quality Gate passed

yzlucas Jan 30, 2025 •

edited

Loading