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 · 2022-06-08T19:26:34Z

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

+
+    /**
+     * 
+     */


remove if there is no javadoc

jdamerow · 2022-06-08T19:26:40Z

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

+    /**
+     * 
+     */
+    private static final long serialVersionUID = 6260562492095202271L;


should start at 1

jdamerow · 2022-06-08T19:27:14Z

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

+    /**
+     * 
+     */
+    private static final long serialVersionUID = 4228339422371096758L;


same as before

jdamerow · 2022-06-08T19:29:59Z

quadriga/pom.xml

@@ -44,6 +44,9 @@
        <citesphere.base.url></citesphere.base.url>
        <citesphere.client.id></citesphere.client.id>
        <citesphere.client.secret></citesphere.client.secret>
+
+        <conceptpower.base.url></conceptpower.base.url>
+        <conceptpower.id.url></conceptpower.id.url>


is this used?

jdamerow · 2022-06-08T19:30:23Z

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

+    private String conceptPowerBaseURL;
+
+    @Value("${conceptpower_id_url}")
+    private String conceptPowerIdURL;


that's the endpoint not the url, right?

jdamerow · 2022-06-08T19:41:17Z

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

+
+        if (size != null) {
+            sizeLimit = size;
+            sizeLimit = sizeLimit < 1 ? 10 : sizeLimit;


why not changing size? is a new variable necessary?

jdamerow · 2022-06-08T19:41:50Z

quadriga/src/main/java/edu/asu/diging/quadriga/web/model/GraphNodeType.java

+    SUBJECT(1),
+    OBJECT(1);
+
+    private int groupId;


? neesd javadoc

jdamerow · 2022-06-08T19:42:21Z

quadriga/src/main/java/edu/asu/diging/quadriga/web/service/impl/GraphCreationServiceImpl.java

+    @Autowired
+    private ConceptPowerService conceptPowerService;
+
+    private Logger logger = LoggerFactory.getLogger(getClass());


shoudl be first

jdamerow · 2022-06-08T19:44:17Z

quadriga/src/main/resources/config.properties

-citesphere_client_secret=${citesphere.client.secret}
-citesphere_base_url=${citesphere.base.url}
+conceptpower_base_url=${conceptpower.base.url}
+conceptpower_id_url=/rest/Concept?id={concept_uri}


that's the endpoint not the url

jdamerow · 2022-06-08T19:45:04Z

quadriga/src/main/resources/config.properties

+conceptpower_id_url=/rest/Concept?id={concept_uri}
+
+citesphere_client_id=OAUTHCLIENT32
+citesphere_client_secret=03c2b326-88ba-4a38-866a-fc6f35ed0423


these should not be in here (secret information!) and also should be defined in the pom.

I regenerated the secret since this is compromised now.

jdamerow

There are unaddressed comments.

jdamerow · 2022-06-10T15:04:56Z

quadriga/pom.xml

-
+
+        <conceptpower.base.url></conceptpower.base.url>
+        <conceptpower.id.endpoint></conceptpower.id.endpoint>


is that used anywhere?

@jdamerow , It's value is currently defined in config.properties. Shall I remove this entry from pom.xml or give the value here?

remove it here

jdamerow

there is a lot of code here that's also in the other PR I just reviewed, isn't there? Please reopen once the common code has been merged.

jdamerow · 2023-05-24T17:06:37Z

quadriga/pom.xml

-
+
+        <conceptpower.base.url></conceptpower.base.url>
+        <conceptpower.id.endpoint></conceptpower.id.endpoint>


remove it here

jdamerow · 2023-05-24T17:08:00Z

also, there are conflicts.

# Conflicts: # quadriga/pom.xml # quadriga/src/main/java/edu/asu/diging/quadriga/core/model/Collection.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/service/CollectionManager.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/service/impl/EventGraphServiceImpl.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/service/impl/MappedTripleGroupServiceImpl.java # quadriga/src/main/java/edu/asu/diging/quadriga/web/DisplayCollectionController.java

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

pkharge marked this pull request as ready for review May 25, 2022 19:34

Prachi Kharge added 2 commits May 25, 2022 12:59

[Q20-19] removed appName

740c589

[Q20-19] added page and size as request param

5570d08

jdamerow requested changes Jun 8, 2022

View reviewed changes

jdamerow closed this Jun 8, 2022

Prachi Kharge added 2 commits June 9, 2022 15:56

[Q20-19] pr review comments

6626db7

[Q20-19] review comment

ce57820

pkharge reopened this Jun 9, 2022

Prachi Kharge added 2 commits June 9, 2022 16:23

[Q20-19] refactor

050afff

[Q20-19] refactor

0a429ba

jdamerow requested changes Jun 10, 2022

View reviewed changes

jdamerow closed this Jun 10, 2022

[Q20-19] Addressed review comments.

4f77dc2

ShivaniYerram reopened this May 23, 2023

jdamerow requested changes May 24, 2023

View reviewed changes

jdamerow closed this May 24, 2023

pooja-thalur added 2 commits September 17, 2024 15:24

[Q20-19] review comments addressed

2db6fc6

pooja-thalur reopened this Sep 20, 2024

pooja-thalur closed this Sep 20, 2024

pooja-thalur added 8 commits September 24, 2024 08:50

[Q20-19] fixing codefactor issue

7519a39

[Q20-19] codefactor issue

2527a8b

[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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Story/q20 19 #23

Story/q20 19 #23

Pooja444 commented Dec 14, 2021 •

edited by pooja-thalur

Loading

jdamerow Jun 8, 2022

jdamerow Jun 8, 2022

jdamerow Jun 8, 2022

jdamerow Jun 8, 2022

jdamerow Jun 8, 2022

jdamerow Jun 8, 2022

jdamerow Jun 8, 2022

jdamerow Jun 8, 2022

jdamerow Jun 8, 2022

jdamerow Jun 8, 2022

jdamerow Jun 8, 2022

jdamerow left a comment

jdamerow Jun 10, 2022

pkharge Jun 10, 2022 •

edited

Loading

jdamerow May 24, 2023

jdamerow left a comment

jdamerow May 24, 2023

jdamerow commented May 24, 2023



		<conceptpower.base.url></conceptpower.base.url>
		<conceptpower.id.endpoint></conceptpower.id.endpoint>

Story/q20 19 #23

Are you sure you want to change the base?

Story/q20 19 #23

Conversation

Pooja444 commented Dec 14, 2021 • edited by pooja-thalur Loading

Guidelines for Pull Requests

Please provide a brief description of your ticket

Anything else the reviewer needs to know?

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

Choose a reason for hiding this comment

jdamerow left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pkharge Jun 10, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jdamerow left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jdamerow commented May 24, 2023

Pooja444 commented Dec 14, 2021 •

edited by pooja-thalur

Loading

pkharge Jun 10, 2022 •

edited

Loading