-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SELC-5166] Refactor mongodb query to use reactive method
- Loading branch information
1 parent
2249f08
commit cd938f2
Showing
9 changed files
with
147 additions
and
108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| # syntax=docker/dockerfile:1.6@sha256:ac85f380a63b13dfcefa89046420e1781752bab202122f8f50032edf31be0021 | ||
| FROM maven:3-eclipse-temurin-17@sha256:0d328fa6843bb26b60cf44d69833f241ffe96218fb29fa19df7a6603863eaae7 AS builder | ||
|
|
||
| WORKDIR /src | ||
| COPY --link pom.xml . | ||
|
|
||
| WORKDIR /src/test-coverage | ||
| COPY --link ./test-coverage/pom.xml . | ||
|
|
||
| WORKDIR /src/apps | ||
| COPY --link ./apps/pom.xml . | ||
|
|
||
| WORKDIR /src/apps/institution-send-mail-scheduler | ||
| COPY --link ./apps/institution-send-mail-scheduler/pom.xml . | ||
| COPY ./apps/institution-send-mail-scheduler/src/main/ ./src/main/ | ||
|
|
||
| WORKDIR /src | ||
|
|
||
| RUN echo "<settings>\n" \ | ||
| "<servers>\n" \ | ||
| "<server>\n" \ | ||
| "<id>\${repositoryId}</id>\n" \ | ||
| "<username>\${repoLogin}</username>\n" \ | ||
| "<password>\${repoPwd}</password>\n" \ | ||
| "</server>\n" \ | ||
| "</servers>\n" \ | ||
| "</settings>\n" > settings.xml | ||
|
|
||
| ARG REPO_ONBOARDING | ||
| ARG REPO_USERNAME | ||
| ARG REPO_PASSWORD | ||
|
|
||
| RUN mvn --global-settings settings.xml --projects :institution-send-mail-scheduler -DrepositoryId=${REPO_ONBOARDING} -DrepoLogin=${REPO_USERNAME} -DrepoPwd=${REPO_PASSWORD} --also-make clean package -DskipTests | ||
|
|
||
| FROM openjdk:17-jdk@sha256:528707081fdb9562eb819128a9f85ae7fe000e2fbaeaf9f87662e7b3f38cb7d8 AS runtime | ||
|
|
||
| ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' | ||
| ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" | ||
|
|
||
| WORKDIR /app | ||
|
|
||
| COPY --from=builder /src/apps/institution-send-mail-scheduler/target/quarkus-app/lib/ ./lib/ | ||
| COPY --from=builder /src/apps/institution-send-mail-scheduler/target/quarkus-app/*.jar ./ | ||
| COPY --from=builder /src/apps/institution-send-mail-scheduler/target/quarkus-app/app/ ./app/ | ||
| COPY --from=builder /src/apps/institution-send-mail-scheduler/target/quarkus-app/quarkus/ ./quarkus/ | ||
|
|
||
| ADD https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.2.11/applicationinsights-agent-3.2.11.jar ./applicationinsights-agent.jar | ||
| RUN chmod 755 ./applicationinsights-agent.jar | ||
|
|
||
| EXPOSE 8080 | ||
| USER 1001 | ||
|
|
||
| ENTRYPOINT ["sh", "-c", "java $JAVA_OPTIONS -jar /app/quarkus-run.jar"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 11 additions & 37 deletions
48
...d-mail-scheduler/src/main/java/it/pagopa/selfcare/institution/entity/PecNotification.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,22 @@ | ||
| package it.pagopa.selfcare.institution.entity; | ||
|
|
||
| import io.quarkus.mongodb.panache.common.MongoEntity; | ||
| import lombok.Getter; | ||
| import org.bson.codecs.pojo.annotations.BsonId; | ||
| import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoEntity; | ||
| import lombok.Data; | ||
| import lombok.EqualsAndHashCode; | ||
| import lombok.experimental.FieldNameConstants; | ||
| import org.bson.types.ObjectId; | ||
|
|
||
| @Getter | ||
| @MongoEntity(collection="pecNotification") | ||
| public class PecNotification { | ||
| @BsonId | ||
| @EqualsAndHashCode(callSuper = true) | ||
| @Data | ||
| @FieldNameConstants(asEnum = true) | ||
| @MongoEntity(collection="PecNotification") | ||
| public class PecNotification extends ReactivePanacheMongoEntity{ | ||
|
|
||
| private ObjectId id; | ||
| private Integer moduleDayOfTheEpoch; | ||
| private String productId; | ||
| private String institutionId; | ||
| private String institutionMail; | ||
|
|
||
| public void setInstitutionMail(String institutionMail) { | ||
| this.institutionMail = institutionMail; | ||
| } | ||
|
|
||
| public void setId(ObjectId id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public void setModuleDayOfTheEpoch(Integer moduleDayOfTheEpoch) { | ||
| this.moduleDayOfTheEpoch = moduleDayOfTheEpoch; | ||
| } | ||
|
|
||
| public void setProductId(String productId) { | ||
| this.productId = productId; | ||
| } | ||
|
|
||
| public void setInstitutionId(String institutionId) { | ||
| this.institutionId = institutionId; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "PecNotification{" + | ||
| "id=" + id + | ||
| ", moduleDayOfTheEpoch=" + moduleDayOfTheEpoch + | ||
| ", productId='" + productId + '\'' + | ||
| ", institutionId='" + institutionId + '\'' + | ||
| ", institutionMail='" + institutionMail + '\'' + | ||
| '}'; | ||
| } | ||
| private String createdAt; | ||
| } |
9 changes: 0 additions & 9 deletions
9
...r/src/main/java/it/pagopa/selfcare/institution/repository/PecNotificationsRepository.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 5 additions & 4 deletions
9
apps/institution-send-mail-scheduler/src/main/resources/application.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,16 @@ | ||
| quarkus.mongodb.database=pecNotification | ||
|
|
||
| institution-send-mail.connection-string = ${MONGODB-CONNECTION-STRING:http://localhost:8080} | ||
| quarkus.mongodb.connection-string = ${MONGODB-CONNECTION-STRING} | ||
| quarkus.mongodb.database = selcMsCore | ||
| institution-send-mail.sender-mail = ${MAIL_SENDER_ADDRESS:[email protected]} | ||
| ## In PROD env must be false for sending real mail | ||
| institution-send-mail.destination-mail = ${MAIL_DESTINATION_TEST:true} | ||
| institution-send-mail.destination-mail = ${MAIL_DESTINATION_TEST:false} | ||
| ## If MAIL_DESTINATION_TEST is true, app send mail to this address | ||
| institution-send-mail.destination-mail-test-address = ${MAIL_DESTINATION_TEST_ADDRESS:[email protected]} | ||
|
|
||
| institution-send-mail.notification-path= ${MAIL_TEMPLATE_NOTIFICATION_PATH:test.json} | ||
|
|
||
| institution-send-mail.notification-query-size = 1000 | ||
| institution-send-mail.notification-query-size = 1 | ||
| institution-send-mail.notification-sending-frequency = 30 | ||
| institution-send-mail.notification-start-date = 2024-01-01 | ||
|
|
||
|
|
||
Oops, something went wrong.