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

Grad release 1.22 #267

Merged
merged 16 commits into from
Jul 9, 2024
Merged

Grad release 1.22 #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d42b271
Upgrade ZAPSCAN to 0.7.0 (#258)
kamal-mohammed Apr 23, 2024
b8b80c1
Update pom.xml
githubmamatha Apr 24, 2024
e48a88e
Grad2-2632 school api call is replaced with trax api. (#260)
githubmamatha May 10, 2024
7105df4
Update pom.xml
githubmamatha May 23, 2024
258c277
Merge branch 'main' into grad-release
githubmamatha May 23, 2024
9ad080c
Update SchoolService.java
githubmamatha May 23, 2024
755a281
GRAD2-2590: task is complete.
infstar Jun 4, 2024
d82d378
Merge pull request #263 from bcgov/feature/GRAD2-2590
infstar Jun 5, 2024
a0947b0
Update pom.xml
githubmamatha Jun 19, 2024
f73ee58
Merge branch 'main' into grad-release
githubmamatha Jun 19, 2024
0a241d5
GRAD2-2799-P3 GRAD Incident: REGALG is creating SCCP certificates for…
arybakov-cgi Jun 24, 2024
8b020d4
Updated to Ubuntu 22.04
Jun 26, 2024
2d90c0c
Merge pull request #265 from bcgov/develop/alex-GRAD2-2799
arybakov-cgi Jun 26, 2024
c00055b
GRAD2-2799-P3 GRAD Incident: REGALG is creating SCCP certificates for…
arybakov-cgi Jun 27, 2024
872f59e
Update pom.xml
githubmamatha Jul 9, 2024
8e2c733
Merge branch 'main' into grad-release
githubmamatha Jul 9, 2024
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
2 changes: 1 addition & 1 deletion api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>ca.bc.gov.educ</groupId>
<artifactId>educ-grad-distribution-api</artifactId>
<version>1.8.61</version>
<version>1.8.62</version>
<name>educ-grad-distribution-api</name>
<description>Ministry of Education GRAD DISTRIBUTION API</description>

Expand Down
15 changes: 13 additions & 2 deletions api/src/main/java/ca/bc/gov/educ/api/distribution/util/EducDistributionApiUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Calendar;
import java.util.Date;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
Expand Down Expand Up @@ -178,7 +179,7 @@ public static String parsingDateForCertificate(String sessionDate) {
String actualSessionDate = sessionDate + "/01";
String sDates = null;
try {
Date temp = parseDate(actualSessionDate, EducDistributionApiConstants.SECOND_DEFAULT_DATE_FORMAT);
Date temp = toLastDayOfMonth(parseDate(actualSessionDate, EducDistributionApiConstants.SECOND_DEFAULT_DATE_FORMAT));
sDates = formatDate(temp, EducDistributionApiConstants.DEFAULT_DATE_FORMAT);
} catch (ParseException pe) {
logger.error(ERROR,pe.getMessage());
Expand All @@ -190,7 +191,7 @@ public static Date parsingTraxDate(String sessionDate) {
String actualSessionDate = sessionDate + "/01";
Date sDate = null;
try {
Date temp = EducDistributionApiUtils.parseDate(actualSessionDate, EducDistributionApiConstants.SECOND_DEFAULT_DATE_FORMAT);
Date temp = toLastDayOfMonth(EducDistributionApiUtils.parseDate(actualSessionDate, EducDistributionApiConstants.SECOND_DEFAULT_DATE_FORMAT));
String sDates = EducDistributionApiUtils.formatDate(temp, EducDistributionApiConstants.DEFAULT_DATE_FORMAT);
sDate = EducDistributionApiUtils.parseDate(sDates, EducDistributionApiConstants.DEFAULT_DATE_FORMAT);
} catch (ParseException pe) {
Expand Down Expand Up @@ -253,6 +254,16 @@ public static synchronized void zipFile(File fileToZip, String fileName, ZipOutp
}
}

static Date toLastDayOfMonth(Date date) {
if(date != null) {
Calendar cal = Calendar.getInstance();
cal.setTime(date);
cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
return cal.getTime();
}
return null;
}

/**
public static boolean isValid(File file) {
ZipFile zipfile = null;
Expand Down
3 changes: 2 additions & 1 deletion api/src/main/java/ca/bc/gov/educ/api/distribution/util/GradLocalDateDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;

import static ca.bc.gov.educ.api.distribution.util.EducDistributionApiConstants.SECOND_DEFAULT_DATE_FORMAT;

Expand All @@ -34,7 +35,7 @@ public LocalDate deserialize(JsonParser jsonParser, DeserializationContext deser
if(slashCount > 0) {
formatter = DateTimeFormatter.ofPattern(SECOND_DEFAULT_DATE_FORMAT);
}
return LocalDate.parse(dateAsString, formatter);
return LocalDate.parse(dateAsString, formatter).with(TemporalAdjusters.lastDayOfMonth());
} else if(jsonParser.hasToken(JsonToken.VALUE_NUMBER_INT)) {
long timestamp = jsonParser.getValueAsLong();
return LocalDate.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault());
Expand Down
3 changes: 2 additions & 1 deletion api/src/main/java/ca/bc/gov/educ/api/distribution/util/GradLocalDateTimeDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;

import static ca.bc.gov.educ.api.distribution.util.EducDistributionApiConstants.*;

Expand All @@ -35,7 +36,7 @@ public LocalDateTime deserialize(JsonParser jsonParser, DeserializationContext d
if(slashCount > 0) {
formatter = DateTimeFormatter.ofPattern(SECOND_DEFAULT_DATE_FORMAT);
}
return LocalDateTime.parse(dateAsString, formatter);
return LocalDateTime.parse(dateAsString, formatter).with(TemporalAdjusters.lastDayOfMonth());
} else if(jsonParser.hasToken(JsonToken.VALUE_NUMBER_INT)) {
long timestamp = jsonParser.getValueAsLong();
return LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault());
Expand Down
Loading