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

Fix end and start date comparators and make them all static so we don… #6943

Merged
merged 1 commit into from
Dec 4, 2023
Merged

Fix end and start date comparators and make them all static so we don… #6943

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 30 additions & 7 deletions orcid-core/src/main/java/org/orcid/core/utils/v3/activities/FundingComparators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.orcid.core.utils.v3.SourceUtils;
import org.orcid.pojo.ajaxForm.FundingForm;
import org.orcid.pojo.grouping.FundingGroup;
import org.orcid.pojo.grouping.PeerReviewGroup;

public class FundingComparators {

Expand All @@ -17,17 +18,25 @@ public class FundingComparators {
private final String DATE_SORT_KEY = "date";

private final String TYPE_SORT_KEY = "type";

private final String START_DATE_KEY = "start";

private final String END_DATE_KEY = "end";

public FundingComparators() {}

public Comparator<FundingGroup> getInstance(String key, boolean sortAsc, String orcid) {
Comparator<FundingGroup> comparator = null;
if (DATE_SORT_KEY.equals(key)) {
comparator = new FundingComparators().DATE_COMPARATOR;
comparator = FundingComparators.DATE_COMPARATOR;
} else if (TITLE_SORT_KEY.equals(key)) {
comparator = new FundingComparators().TITLE_COMPARATOR;
comparator = FundingComparators.TITLE_COMPARATOR;
} else if (TYPE_SORT_KEY.equals(key)) {
comparator = new FundingComparators().TYPE_COMPARATOR;
comparator = FundingComparators.TYPE_COMPARATOR;
} else if (START_DATE_KEY.equals(key)) {
comparator = FundingComparators.START_DATE_COMPARATOR;
} else if (END_DATE_KEY.equals(key)) {
comparator = FundingComparators.END_DATE_COMPARATOR;
}

if (sortAsc) {
Expand All @@ -37,7 +46,7 @@ public Comparator<FundingGroup> getInstance(String key, boolean sortAsc, String
}
}

public Comparator<FundingGroup> TITLE_COMPARATOR = (g1, g2) -> {
public static Comparator<FundingGroup> TITLE_COMPARATOR = (g1, g2) -> {
if (g1.getTitle() == null && g2.getTitle() == null) {
return 0;
}
Expand All @@ -51,7 +60,7 @@ public Comparator<FundingGroup> getInstance(String key, boolean sortAsc, String
return g1.getTitle().toLowerCase().compareTo(g2.getTitle().toLowerCase());
};

public Comparator<FundingGroup> TYPE_COMPARATOR = (g1, g2) -> {
public static Comparator<FundingGroup> TYPE_COMPARATOR = (g1, g2) -> {
FundingForm f1 = g1.getFundings().get(0);
FundingForm f2 = g2.getFundings().get(0);

Expand All @@ -69,7 +78,21 @@ public Comparator<FundingGroup> getInstance(String key, boolean sortAsc, String
return f1.getFundingType().getValue().compareTo(f2.getFundingType().getValue());
};

public Comparator<FundingGroup> END_DATE_COMPARATOR = (g1, g2) -> {
public static Comparator<FundingGroup> START_DATE_COMPARATOR = (g1, g2) -> {
if (g1.getStartDate() == null && g2.getStartDate() == null)
return TITLE_COMPARATOR.compare(g1, g2) * -1; // reverse secondary order;;
//Null = to present and should sort first
if (g1.getStartDate() == null)
return 1;
if (g2.getStartDate() == null)
return -1;
if (g1.getStartDate().compareTo(g2.getStartDate()) == 0){
return TITLE_COMPARATOR.compare(g1, g2) * -1; // reverse secondary order;;
}
return g1.getStartDate().compareTo(g2.getStartDate());
};

public static Comparator<FundingGroup> END_DATE_COMPARATOR = (g1, g2) -> {
if (g1.getEndDate() == null && g2.getEndDate() == null)
return TITLE_COMPARATOR.compare(g1, g2) * -1; // reverse secondary order;;
//Null = to present and should sort first
Expand All @@ -83,7 +106,7 @@ public Comparator<FundingGroup> getInstance(String key, boolean sortAsc, String
return g1.getEndDate().compareTo(g2.getEndDate());
};

public Comparator<FundingGroup> DATE_COMPARATOR = (g1, g2) -> {
public static Comparator<FundingGroup> DATE_COMPARATOR = (g1, g2) -> {
if (g1.getStartDate() == null && g2.getStartDate() == null) {
return TITLE_COMPARATOR.compare(g1, g2) * -1; // reverse secondary order;;
}
Expand Down