Story/q20 19 #23

Pooja444 · 2021-12-14T23:27:58Z

Guidelines for Pull Requests

If you haven't yet read our code review guidelines, please do so, You can find them here.

Please confirm the following by adding an x for each item (turn [ ] into [x]).

I have removed all code style changes that are not necessary (e.g. changing blanks across the whole file that don’t need to be changed, adding empty lines in parts other than your own code)
I am not making any changes to files that don’t have any effect (e.g. imports added that don’t need to be added)
I do not have any sysout statements in my code or commented out code that isn’t needed anymore
I am not reformatting any files in the wrong format or without cause.
I am not changing file encoding or line endings to something else than UTF-8, LF
My pull request does not show an insane amount of files being changed although my ticket only requires a few files being changed
I have added Javadoc/documentation where appropriate
I have added test cases where appropriate
I have explained any part of my code/implementation decisions that is not be self-explanatory

Please provide a brief description of your ticket

(you can copy the ticket if it hasn't changed)

https://diging.atlassian.net/browse/Q20-19
On the collection page, it should be possible to browse all networks in collection -
basically a paginated list of all networks ordered by submission date. When the user clicks on a network it would be visualized (similar to the old quadriga).

Anything else the reviewer needs to know?

This story is dependent on story Q20-3, Q20-7, Q20-12, Q20-18 and since all of these stories are yet to be merged, this PR may show a lot of file changes that are actually part of the above stories. This will go away once all of these are merged

…tests

….0 into story/Q20-18

jdamerow

It really throws me off that the ConceptPower classes capitalize the "P" 😅 the app is called "Conceptpower". Maybe change the class names? :)

jdamerow · 2024-11-07T15:15:28Z

quadriga/src/main/java/edu/asu/diging/quadriga/core/conceptpower/model/ConceptCache.java

+        // If both old and new cache values are null/blank/empty, nothing has changed
+        // If old value is null/blank/empty, new value is not null/blank/empty, difference present
+        // If old value is not null/blank/empty, new value is null/blank/empty, difference present
+        // If both are not null/blank/empty, we need to check difference


this should probably go into the javadoc (which is missing)

jdamerow · 2024-11-07T15:17:31Z

quadriga/src/main/java/edu/asu/diging/quadriga/core/conceptpower/model/ConceptCache.java

+        if (isDifferentString(conceptCache.getPos(), this.getPos())) return -1;
+        if (isDifferentString(conceptCache.getTypeId(), this.getTypeId())) return -1;
+        if (isDifferentString(conceptCache.getUri(), this.getUri())) return -1;
+        if (isDifferentString(conceptCache.getWord(), this.getWord())) return -1;


this is not following our formatting guidelines. or it could be put as an OR statement (formatted one condition a line), so that only once -1 is returned.

jdamerow · 2024-11-07T15:17:48Z

quadriga/src/main/java/edu/asu/diging/quadriga/core/conceptpower/model/ConceptType.java

+        if(isDifferentString(type.getDescription(), this.getDescription())) return -1;
+        if(isDifferentString(type.getName(), this.getName())) return -1;
+        if(isDifferentString(type.getUri(), this.getUri())) return -1;
+        return 0;


same as before

jdamerow · 2024-11-07T15:21:30Z

...edu/asu/diging/quadriga/core/conceptpower/service/impl/ConceptPowerConnectorServiceImpl.java

+    @Override
+    public ConceptPowerReply getConceptPowerReply(String conceptURI) {
+        Map<String, String> pathVariables = new HashMap<>();
+        pathVariables.put("concept_uri", conceptURI);


these are not path variables, are they? but parameters?

jdamerow · 2024-11-07T15:24:42Z

...edu/asu/diging/quadriga/core/conceptpower/service/impl/ConceptPowerConnectorServiceImpl.java

+            logger.error("Could not get concept for URI: " + conceptURI + " at URL: " + conceptPowerURL, e);
+        }
+
+        return null;


it looks like don't where you use the return value, you don't check for null, which means it'll throw a nullpointer if conceptpower is down? or throws an error? The better approach would probably be throw an exception if there is no response or an exception from conceptpower, and then handle it appropriate where it makes sense.

jdamerow · 2024-11-07T15:30:14Z

...ain/java/edu/asu/diging/quadriga/core/conceptpower/service/impl/ConceptPowerServiceImpl.java

+    private boolean updateConceptCache(ConceptCache conceptCache, ConceptCache conceptCacheOld, String uri) {
+
+        // ConceptPower returned a concept and either no conceptCache entry exists in the DB
+        // or if one exists, it is different from the current conceptCache entry


this should probably be part of the javadoc

jdamerow · 2024-11-07T15:32:04Z

...ain/java/edu/asu/diging/quadriga/core/conceptpower/service/impl/ConceptPowerServiceImpl.java

+        List<ConceptEntry> conceptEntries = conceptPowerReply.getConceptEntries();
+        ConceptCache conceptCache = null;
+
+        if (conceptEntries != null && !conceptEntries.isEmpty()) {


turn this if around and just return if this condition is not met. It'll unindent all the following code.

...ga/src/main/java/edu/asu/diging/quadriga/core/service/impl/MappedTripleGroupServiceImpl.java

jdamerow · 2024-11-07T15:39:24Z

quadriga/src/main/resources/config.properties

 neo4j.url=${neo4j.url}
 neo4j.database=${neo4j.database}

+conceptpower_base_url=${conceptpower.base.url}


there is no conceptpower.base.url property in the pom, is there? If this property is required here, it needs to be added to the pom.

jdamerow · 2024-11-07T15:39:43Z

quadriga/src/main/resources/config.properties

+
 citesphere_client_id=${citesphere.client.id}
-citesphere_client_secret=${citesphere.client.secret}
+citesphere_client_secret=${citesphere.client.id}


this does not look right

jdamerow · 2025-02-07T21:08:39Z

...ain/java/edu/asu/diging/quadriga/core/conceptpower/service/impl/ConceptPowerServiceImpl.java

+
+        ConceptCache conceptCache = conceptCacheService.getConceptByUri(uri);
+
+        conceptCacheUpdateInterval=0;


this seems wrong

jdamerow · 2025-02-07T21:11:47Z

quadriga/src/main/java/edu/asu/diging/quadriga/web/DisplayCollectionController.java

+
+//      Determine page number and size for network pagination      
+        page = (page == null || page < 0) ? 0 : page - 1;
+        size = (size == null || size < 1) ? 10 : size;


instead of checking for null you can just specify a default value in the RequestParam annotation

jdamerow · 2025-02-07T21:13:45Z

quadriga/src/main/resources/config.properties

 neo4j.url=${neo4j.url}
 neo4j.database=${neo4j.database}

+conceptpower_base_url=${conceptpower.base.url}


I think this has still not been added to the pom?

jdamerow · 2025-02-07T21:14:50Z

Make it so, Jenkins.

jdamerow · 2025-02-07T21:21:01Z

Tests are failing

Pooja444 and others added 30 commits August 31, 2021 15:43

[story/Q20-11] completed edit collections implementation, added unit …

03e7120

…tests

[story/Q20-11] addressed review comments for edit collections

e4a5a8b

[story/Q20-11] addressed review comments

0a74117

[story/Q20-12] added collectionId param while submitting network

2ada5f9

[story/Q20-12] added collectionId to EventGraph

19f9069

[story/Q20-3] added token validity check

ba4267b

[Q20-7] Adding Citephere config

2167f2a

[story/Q20-3] added token validation logic

bd62381

[Q20-7] - Fetch apps from citesphere after registering quadriga

3d8be96

[story/Q20-3] completed check token dev, started unit tests

83e9aa8

[Q20-7] - Working on front-end for multiple app selection

df99e9e

[story/Q20-3] partially completed unit tests

a23bc9a

[story/Q20-3] added few more test cases

d31e504

[story/Q20-3] completed all unit tests

b1c48b8

[story/Q20-3] added required=true for authHeader

4b261e3

[Q20-7] - Replaced pop-up selection with list selection

a2a3ccf

[story/Q20-12] changed Objects.isNull to simple null check

5ead2a8

[story/Q20-3] changed Objects.isNull to simple null check

5e63e67

[Q20-7] - Completed front-end for add collections part

e6db79d

[Q20-7] - fixed test case

ecab67d

[story/Q20-18] added view to display collection info

d3cbe2a

[story/Q20-18] added creationTime to network graph

dc4c9c3

[story/Q20-18] added last network submission info

4ddadf0

[story/Q20-12] addressed review comments

27ed3e7

[story/Q20-12] resolved merge conflicts with story Q20-11

ad11972

[story/Q20-12] removed double test cases

82122dc

[story/Q20-12] caught IllegalArgumentException while finding collection

1425d51

[story/Q20-12] removed unnecessary null check

a6375e7

[story/Q20-18] Merge branch 'develop' of github.com:diging/quadriga-2…

f2f3873

….0 into story/Q20-18

[story/Q20-12] removed unncessary file changes

2035910

pooja-thalur added 6 commits September 24, 2024 09:27

[Q20-19] indentation changes

6fe474e

[Q20-19] upgrading security core dependency

7edb536

[Q20-19] dependency upgrade

09d697f

[Q20-19] jackson dependency upgraded

4228f31

[Q20-19] reverting dependency update changes

c18e489

[Q20-19] unnecessary change removed

5cbc2a1

pooja-thalur reopened this Sep 25, 2024

jdamerow requested changes Nov 7, 2024

View reviewed changes

jdamerow closed this Nov 7, 2024

pooja-thalur added 4 commits December 17, 2024 16:36

[Q20-19] resolving review comments

54f4fd2

[Q20-19] addressing review comments

76f159e

[Q20-19] review comments addressed

718301c

[Q20-19] fixed testcases

c361808

pooja-thalur reopened this Dec 20, 2024

pooja-thalur added 2 commits December 20, 2024 09:31

[Q20-19] codefactor issues resolved

2f7c527

[Q20-19] codefactor issues fixed

2e028dd

pooja-thalur closed this Dec 20, 2024

[Q20-19] reverted the config change

996f7d7

pooja-thalur reopened this Jan 2, 2025

Merge branch 'develop' into story/Q20-19

34bc8d0

pooja-thalur mentioned this pull request Feb 5, 2025

Story/q20 21 #38

Draft

9 tasks

jdamerow requested changes Feb 7, 2025

View reviewed changes

jdamerow closed this Feb 7, 2025

pooja-thalur added 4 commits May 2, 2025 15:51

Merge branch 'develop' into story/Q20-19

2b6135b

[Q20-19] fixed failing testcase

856d232

[Q20-19] added conceptpower base url in pom

7552331

[Q20-19] addressed review comments

e86b6aa

pooja-thalur reopened this May 7, 2025


		ConceptCache conceptCache = conceptCacheService.getConceptByUri(uri);

		conceptCacheUpdateInterval=0;

Story/q20 19 #23

Are you sure you want to change the base?

Story/q20 19 #23

Uh oh!

Conversation

Pooja444 commented Dec 14, 2021 • edited by pooja-thalur Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Guidelines for Pull Requests

Please provide a brief description of your ticket

Anything else the reviewer needs to know?

Uh oh!

jdamerow left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jdamerow commented Feb 7, 2025

Uh oh!

jdamerow commented Feb 7, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Pooja444 commented Dec 14, 2021 •

edited by pooja-thalur

Loading