From c2581cc46160a772c3084f3bbf862f7f68392371 Mon Sep 17 00:00:00 2001 From: harish Date: Mon, 30 Sep 2024 14:42:38 +0530 Subject: [PATCH 01/31] updated fe base url form prod --- src/main/resources/application-production.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties index be371126..8de9367a 100644 --- a/src/main/resources/application-production.properties +++ b/src/main/resources/application-production.properties @@ -9,3 +9,4 @@ spring.h2.console.enabled=true base-url=http://bandi-api.gepafin.it isVatCheckGloballyDisabled = false +fe.base.url=http://bandi.gepafin.it \ No newline at end of file From ef5c8e967b54442c1fb023ea2714b8333c2d593d Mon Sep 17 00:00:00 2001 From: harish Date: Mon, 30 Sep 2024 15:06:45 +0530 Subject: [PATCH 02/31] updated fe base url --- src/main/resources/application-production.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties index 8de9367a..8acc1e0c 100644 --- a/src/main/resources/application-production.properties +++ b/src/main/resources/application-production.properties @@ -9,4 +9,4 @@ spring.h2.console.enabled=true base-url=http://bandi-api.gepafin.it isVatCheckGloballyDisabled = false -fe.base.url=http://bandi.gepafin.it \ No newline at end of file +fe.base.url=http://gepafin-production-fe.s3-website.eu-central-1.amazonaws.com \ No newline at end of file From 52c65aa2d09ee80aac618f54af8fdd82a543c128 Mon Sep 17 00:00:00 2001 From: nishainnogent Date: Mon, 30 Sep 2024 18:26:42 +0530 Subject: [PATCH 03/31] Updated code --- .../java/net/gepafin/tendermanagement/dao/FormDao.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java index 36ff8eb8..9cdf3fed 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java @@ -141,6 +141,13 @@ public class FormDao { ); } } + else { + Utils.setIfUpdated(formEntity::getLabel, formEntity::setLabel, formRequest.getLabel()); + Utils.setIfUpdated(formEntity::getContent, formEntity::setContent, setContentResponseBean(formRequest.getContent())); + formEntity.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); + formEntity = saveFormEntity(formEntity); + return convertFormEntityToFormResponseBean(formEntity); + } } } } From c8b738a0f205794a7550567d722ed186bcd4c206 Mon Sep 17 00:00:00 2001 From: harish Date: Tue, 1 Oct 2024 16:53:15 +0530 Subject: [PATCH 04/31] Added saml configation for production --- .../tendermanagement/config/SamlConfig.java | 16 +++++++---- .../config/SamlSuccessHandler.java | 1 + .../application-production.properties | 6 +++- src/main/resources/application.properties | 4 +++ .../production/saml/idp-certificate.pem | 3 ++ .../resources/production/saml/private-key.pem | 28 +++++++++++++++++++ .../resources/production/saml/public-cert.pem | 24 ++++++++++++++++ 7 files changed, 76 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/production/saml/idp-certificate.pem create mode 100644 src/main/resources/production/saml/private-key.pem create mode 100644 src/main/resources/production/saml/public-cert.pem diff --git a/src/main/java/net/gepafin/tendermanagement/config/SamlConfig.java b/src/main/java/net/gepafin/tendermanagement/config/SamlConfig.java index 02a0ae27..c66e26f1 100644 --- a/src/main/java/net/gepafin/tendermanagement/config/SamlConfig.java +++ b/src/main/java/net/gepafin/tendermanagement/config/SamlConfig.java @@ -49,6 +49,12 @@ public class SamlConfig { @Value("${base-url}") String baseUrl; + + @Value("${spid.ipd.base.url}") + String ipdBaseUrl; + + @Value("${active.profile.folder}") + String activeProfileFolder; @Bean public RelyingPartyRegistrationRepository relyingPartyRegistrationRepository() { @@ -66,8 +72,8 @@ public class SamlConfig { } }) .assertionConsumerServiceLocation(acsUrl) - .assertingPartyDetails(details -> details.entityId("https://federatest.umbriadigitale.it/gw/metadata") - .singleSignOnServiceLocation("https://federatest.umbriadigitale.it/gw/SSOProxy/SAML2") + .assertingPartyDetails(details -> details.entityId(ipdBaseUrl + "/gw/metadata") + .singleSignOnServiceLocation(ipdBaseUrl + "/gw/SSOProxy/SAML2") .singleSignOnServiceBinding(Saml2MessageBinding.POST) .wantAuthnRequestsSigned(true) .verificationX509Credentials(credentials -> { @@ -158,7 +164,7 @@ private RequestedAuthnContext buildRequestedAuthnContext() { public PrivateKey readPrivateKey() throws Exception { // Path to your private key PEM file - try (PemReader pemReader = new PemReader(new InputStreamReader(readKey("dev/saml/private-key.pem")))) { + try (PemReader pemReader = new PemReader(new InputStreamReader(readKey(activeProfileFolder + "/saml/private-key.pem")))) { // Read the PEM content byte[] pemContent = pemReader.readPemObject().getContent(); // Decode the PEM content @@ -170,7 +176,7 @@ private RequestedAuthnContext buildRequestedAuthnContext() { } public X509Certificate readCertificate() throws Exception { // Path to your certificate PEM fileFile - try (InputStream inStream = readKey("dev/saml/public-cert.pem")) { + try (InputStream inStream = readKey(activeProfileFolder + "/saml/public-cert.pem")) { CertificateFactory certFactory = CertificateFactory.getInstance("X.509"); return (X509Certificate) certFactory.generateCertificate(inStream); } @@ -178,7 +184,7 @@ private RequestedAuthnContext buildRequestedAuthnContext() { public X509Certificate readIdpCertificate() throws Exception { // Path to your IDP public certificate PEM file - try (InputStream inStream = readKey("dev/saml/idp-certificate.pem")) { + try (InputStream inStream = readKey(activeProfileFolder + "/saml/idp-certificate.pem")) { CertificateFactory certFactory = CertificateFactory.getInstance("X.509"); return (X509Certificate) certFactory.generateCertificate(inStream); } diff --git a/src/main/java/net/gepafin/tendermanagement/config/SamlSuccessHandler.java b/src/main/java/net/gepafin/tendermanagement/config/SamlSuccessHandler.java index a8af08a7..08f1a30e 100644 --- a/src/main/java/net/gepafin/tendermanagement/config/SamlSuccessHandler.java +++ b/src/main/java/net/gepafin/tendermanagement/config/SamlSuccessHandler.java @@ -45,6 +45,7 @@ public class SamlSuccessHandler implements AuthenticationSuccessHandler { public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException { try { + logger.info("SAML login in Authentication Success Handler"); Saml2Authentication samlAuth = (Saml2Authentication) authentication; Saml2AuthenticatedPrincipal principal = (Saml2AuthenticatedPrincipal) samlAuth.getPrincipal(); diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties index 8acc1e0c..f4ea18fa 100644 --- a/src/main/resources/application-production.properties +++ b/src/main/resources/application-production.properties @@ -9,4 +9,8 @@ spring.h2.console.enabled=true base-url=http://bandi-api.gepafin.it isVatCheckGloballyDisabled = false -fe.base.url=http://gepafin-production-fe.s3-website.eu-central-1.amazonaws.com \ No newline at end of file +fe.base.url=http://gepafin-production-fe.s3-website.eu-central-1.amazonaws.com + +#SPID configuration +spid.ipd.base.url=https://login.regione.umbria.it +active.profile.folder=production \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1c16a251..3ce9ed17 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -44,3 +44,7 @@ isVatCheckGloballyDisabled = true vatCheckNewToken: 66026bd891a51044e90e08c4 fe.base.url=http://gepafin-staging-fe.s3-website.eu-central-1.amazonaws.com +#SPID configuration +spid.ipd.base.url=https://federatest.umbriadigitale.it +active.profile.folder=dev + diff --git a/src/main/resources/production/saml/idp-certificate.pem b/src/main/resources/production/saml/idp-certificate.pem new file mode 100644 index 00000000..dd9e7b96 --- /dev/null +++ b/src/main/resources/production/saml/idp-certificate.pem @@ -0,0 +1,3 @@ +-----BEGIN CERTIFICATE----- +MIIHBzCCBe+gAwIBAgIQBa/5uQoACfZc0a+0cFPKaDANBgkqhkiG9w0BAQsFADBwMQswCQYDVQQG EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMS8w LQYDVQQDEyZEaWdpQ2VydCBTSEEyIEhpZ2ggQXNzdXJhbmNlIFNlcnZlciBDQTAeFw0xNDAyMDMw MDAwMDBaFw0xNzAyMDcxMjAwMDBaMIGRMQswCQYDVQQGEwJJVDEOMAwGA1UECBMFSXRhbHkxEDAO BgNVBAcTB1BlcnVnaWExFzAVBgNVBAoTDlJlZ2lvbmUgVW1icmlhMSkwJwYDVQQLEyBTZXJ2aXpp byBJbmZyYXN0cnV0dHVyZSBEaWdpdGFsaTEcMBoGA1UEAwwTKi5yZWdpb25lLnVtYnJpYS5pdDCC ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALx+hg0/SsF+kpakHw24sO8LFawtMiILsEKS jLbqU8LjUcvDj50CVDa/jz21OwdBfCEB6SBVEKp0a61x5RZFKBUnL795y7Na56VWzqA0kyLg7QNn 73Tu0SJPRF0Hm+2ePLLypU+TkIFfC85GO5iXn82E5rb6XRA8blLj/GauQ0DSHkY3ZTQGGzN3La9a ZJ1Tl80cIATY10iuwQdVkLXRx8VriVrS4jVJOOl8vGJ4VWLVwGYUkhmwvoR/zfeNkSQe7USjHmdf Zm4lLMYZjLM0S2wJMRQbj3MscVBKaXMHc6POqMlKrgO1nRK4/1dRYtnJeMCK/uK/ms/MYpxIX2ZG G/MCAwEAAaOCA3kwggN1MB8GA1UdIwQYMBaAFFFo/5CvAgd1PMzZZWRiohK4WXI7MB0GA1UdDgQW BBShweIeUSOk3EJgXqB9164xrkURDDAxBgNVHREEKjAoghMqLnJlZ2lvbmUudW1icmlhLml0ghFy ZWdpb25lLnVtYnJpYS5pdDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG AQUFBwMCMHUGA1UdHwRuMGwwNKAyoDCGLmh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9zaGEyLWhh LXNlcnZlci1nMS5jcmwwNKAyoDCGLmh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9zaGEyLWhhLXNl cnZlci1nMS5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwBATCCAaQwOgYIKwYBBQUH AgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggr BgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABp AGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMA ZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAg AHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAA dwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBl ACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUA cgBlAG4AYwBlAC4wgYMGCCsGAQUFBwEBBHcwdTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlM aWNlcnQuY29tME0GCCsGAQUFBzAChkFodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNl cnRTSEEySGlnaEFzc3VyYW5jZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEB CwUAA4IBAQBPWrp7uoj9qX8h+7iGwyNOB7274/GDQZSqnk52FTQ3Qi8AzM7YV/tNDZG2j1Ran7vG /q214cqsv/gtyxSBfRR4/WgGCIylw5uZv35FsEC0lyAyPJGLKsZSMALqKkeBGQlzsmkNo7TyZgQV XMzoeuQz2mocC+ShpQjn4Uug/FptmbnYKCiKFShc0IAwAj5+U3kPmOhskml2tj+BTXDKpq4m9onY C8eN928I7tkJPvCYGDwdsBkf3EHyM/AUB4oZ/zcnT/8F7SoRfexmD9Eojslzs+hEMKkKg7M/UxJt ySAVQF/BznGvWiWfZtHrtvBCKgXsvUJ3h/7M/SqtRQnpNZ0C +-----END CERTIFICATE----- diff --git a/src/main/resources/production/saml/private-key.pem b/src/main/resources/production/saml/private-key.pem new file mode 100644 index 00000000..12869e56 --- /dev/null +++ b/src/main/resources/production/saml/private-key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCKHE1L4E95N6jG +4bED1vd7c5ZMry6J0qIqojpHAzG1YIEtfL28twxBfN9voNhFL9TD6dGsfWDwYaa7 +LXyMAHLRi7pI+sH852d7sq3xRd1ynKDmt+cU+6kMlDtUPulkbzeU9Z0lGFuS9qJw +CdjYliCuwUxwJsU3tVHTHlV8nAz5RaXw31Gl6u11QpgxLPeFP5AUWHzfduTA2Wr0 +5ePtx5iuMj1oIMv0o50DJaqGmCKtQAtGZMGSKIrtXhLerUAfEteH6M+6POzoKg0F +ZyfLEiuqAE1Ymt16P5PLfTPjRHz4XRBCcd6a+iAAvIpG0yQE9dS7PfNtY1akk51J +La150Ef1AgMBAAECggEAIH3MCX+58rCPekp6VIbsLhThVSUZc78j+5ey0iYEOcF8 +YnEoSg9eSMHR5vcWKiC4k2act1G/zo2KphprZJxuZrHSn3yuyoq+I7HDjjF7iY0j +pWO6b4tNF/J/irBKRCCOGPM3hxSV5pszV9xZMYsQIUzEaNYWK6bymxJV1jz4KGRL +w3nPIpeu8MwMZwOzQwz980bZ2vbr67Ft3GmsflKzM5SesmsW8ZyaYbVfHExvfQxV +nsf9ya0PLQqE9Gi81xY1sVkL3V+niU+AXYZ3w/neuXPz6eaJrxlu4hFdJifWlrQV +vW7mgfOmUuR/bEXr/1c95nZQykobrMqHCRVPpfesQQKBgQDCBrlYKD1XJXfXENnG +32O3TksbxVtL0Eyw1lstp20j6txetHn3F/rx/SFy70J02r2jdFHeP/V1iLrEJ81/ +5QVpsA+Au5Oxwdfee/izUFqhXwSpgvtLoVypBUNcglw/qi2tCKrL10nb0i+bocoD +PGaTIECJ0MWUxTX3SrzqC8XX2QKBgQC2OWw7gGu12eutQBHujTbaZXhjwv2QEBup +UZcVYeVn8KrPrK5621aLgQXUq5Db7GoelB09SXOoqy04WZkYy5XeF+ULRtz0M5ZD +cNgAaQXuuZZdxKWFVXbK1iliGJjcMkd9PEpx5BjM49Gq2r5n3FS5KK9A44iSPMbB +IZoYWsIbfQKBgQCeME08itI4Etw6BAsKEWeDM9oYsjdVAGcGZj3AYxigiANTU2F9 +C5gVY4O56UgNbanfch6tTQga43ciJjFtbJOVL230TvqDmr8dLYX+7Cx4FLgAXEH1 +z4F0bE4XRlFftqe2w7I8rzIQfrVB9g51xPD8UvdLZWMxf/gXvl93klGjQQKBgQCw +JWv5TJdR73jBPZjX50up68JndRrUwq1qjAMm2T3/roX/QCZdfl73dV4kiT/7R1oB +ex2Um8cguW959Cpo7ItPZ/uxXevCZ4eOY6t5IgxpCp9OvwNdkxLE2iagu7Qvzq6K +Ydh4pYxPqr2HkfHSxgpj/e8DI69l5TgfgxLJDhpqpQKBgAgSgck834l8lNZwVPa8 ++Vi9nOtoWy7pyf8pv7sDEKcVkTmUU6+53eZoccW8AUu6ilL1PtrQ7cNPTJcUom80 +IVyJsVTQjDy17mj1DU8Fw15pjFWE4zRfQo9vondblJaxs9aIIG/6x9vDQVjN0hwe +jTOz1k3Du8fEEpKQMgn97J/+ +-----END PRIVATE KEY----- diff --git a/src/main/resources/production/saml/public-cert.pem b/src/main/resources/production/saml/public-cert.pem new file mode 100644 index 00000000..55254d2d --- /dev/null +++ b/src/main/resources/production/saml/public-cert.pem @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIID7TCCAtWgAwIBAgIUQ2G093CKO3nbHlyw68f5998BIjkwDQYJKoZIhvcNAQEL +BQAwgYUxCzAJBgNVBAYTAklUMQ4wDAYDVQQIDAVJdGFseTEQMA4GA1UEBwwHUGVy +dWdpYTEQMA4GA1UECgwHR2VwYWZpbjELMAkGA1UECwwCSVQxEDAOBgNVBAMMB0dl +cGFmaW4xIzAhBgkqhkiG9w0BCQEWFGMubW9yZXR0aUBnZXBhZmluLml0MB4XDTI0 +MTAwMTA5MjIwMloXDTI1MTAwMTA5MjIwMlowgYUxCzAJBgNVBAYTAklUMQ4wDAYD +VQQIDAVJdGFseTEQMA4GA1UEBwwHUGVydWdpYTEQMA4GA1UECgwHR2VwYWZpbjEL +MAkGA1UECwwCSVQxEDAOBgNVBAMMB0dlcGFmaW4xIzAhBgkqhkiG9w0BCQEWFGMu +bW9yZXR0aUBnZXBhZmluLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEAihxNS+BPeTeoxuGxA9b3e3OWTK8uidKiKqI6RwMxtWCBLXy9vLcMQXzfb6DY +RS/Uw+nRrH1g8GGmuy18jABy0Yu6SPrB/Odne7Kt8UXdcpyg5rfnFPupDJQ7VD7p +ZG83lPWdJRhbkvaicAnY2JYgrsFMcCbFN7VR0x5VfJwM+UWl8N9RpertdUKYMSz3 +hT+QFFh833bkwNlq9OXj7ceYrjI9aCDL9KOdAyWqhpgirUALRmTBkiiK7V4S3q1A +HxLXh+jPujzs6CoNBWcnyxIrqgBNWJrdej+Ty30z40R8+F0QQnHemvogALyKRtMk +BPXUuz3zbWNWpJOdSS2tedBH9QIDAQABo1MwUTAdBgNVHQ4EFgQUQ+GP6sby5ZQX +KTgq0/MsCWfdcHcwHwYDVR0jBBgwFoAUQ+GP6sby5ZQXKTgq0/MsCWfdcHcwDwYD +VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAWnzvIOhK4Z/GQA2H0jb+ +tkpPiwXucybEEOwQyb6+ErNGLjM7aj/HXJv70zibchmuPN5yd6C9dmrlajf/qLFz +T+Dfy6zl3r0mNErcT/bgaJzVA87u0z2/DRP77XqwV23zDGK56bp8G2C1nZGq6x2k +zswESJYBquXtBWNEJnreDKOLic9AucSyf8T0C9aeWhC8L0Hz4Bd825J2n54L4YZD +ShkCDSdCOZVdaZNikRv+KyD1SI6HM3KeUNNknW6z7g2jb5PG4dn5U9+lpzOsfoYD +QEBrNG8qFZ7k9DYzh8l1dTo9izSNmudaiyjhgFw+5DZ0pcrhti6h3hnPPysSA8q/ +Mg== +-----END CERTIFICATE----- From ea3423e6ff03e149244f6859b251e39f16f44db3 Mon Sep 17 00:00:00 2001 From: harish Date: Mon, 7 Oct 2024 15:09:16 +0530 Subject: [PATCH 05/31] Added DateOfBirth in UserSamlResponse --- .../tendermanagement/model/response/UserSamlResponse.java | 4 ++++ .../service/impl/AuthenticationService.java | 8 ++++++++ src/main/resources/application-production.properties | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/UserSamlResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/UserSamlResponse.java index da732bd4..8fdcbdea 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/UserSamlResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/UserSamlResponse.java @@ -2,6 +2,8 @@ package net.gepafin.tendermanagement.model.response; import lombok.Data; +import java.time.LocalDateTime; + @Data public class UserSamlResponse { @@ -10,4 +12,6 @@ public class UserSamlResponse { private String firstName; private String lastName; + + private LocalDateTime dateOfBirth; } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java b/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java index a84b325c..03ce8b1c 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java @@ -33,6 +33,7 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler; import org.springframework.stereotype.Service; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; import java.util.Map; @@ -182,6 +183,13 @@ public class AuthenticationService { && !userAttributes.get("cognome").isEmpty()) { userSamlResponse.setLastName(userAttributes.get("cognome").get(0).toString()); } + if (userAttributes.containsKey("dataNascita") && userAttributes.get("dataNascita") != null + && !userAttributes.get("dataNascita").isEmpty()) { + String dateString =userAttributes.get("dataNascita").get(0).toString(); + LocalDate dateOfBirth = LocalDate.parse(dateString); + LocalDateTime dateOfBirthWithTime = dateOfBirth.atStartOfDay(); + userSamlResponse.setDateOfBirth(dateOfBirthWithTime); + } userSamlResponse.setCodiceFiscale(cf); return userSamlResponse; } diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties index f4ea18fa..968d5ac5 100644 --- a/src/main/resources/application-production.properties +++ b/src/main/resources/application-production.properties @@ -9,8 +9,8 @@ spring.h2.console.enabled=true base-url=http://bandi-api.gepafin.it isVatCheckGloballyDisabled = false -fe.base.url=http://gepafin-production-fe.s3-website.eu-central-1.amazonaws.com - +#fe.base.url=http://gepafin-production-fe.s3-website.eu-central-1.amazonaws.com +fe.base.url=http://bandi.gepafin.it #SPID configuration spid.ipd.base.url=https://login.regione.umbria.it active.profile.folder=production \ No newline at end of file From 6f9df2ab50934fc662abc17c5dc2b986882ca8fb Mon Sep 17 00:00:00 2001 From: harish Date: Tue, 8 Oct 2024 17:27:27 +0530 Subject: [PATCH 06/31] updated production FE base url --- src/main/resources/application-production.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties index 968d5ac5..0aba783c 100644 --- a/src/main/resources/application-production.properties +++ b/src/main/resources/application-production.properties @@ -10,7 +10,7 @@ base-url=http://bandi-api.gepafin.it isVatCheckGloballyDisabled = false #fe.base.url=http://gepafin-production-fe.s3-website.eu-central-1.amazonaws.com -fe.base.url=http://bandi.gepafin.it +fe.base.url=https://bandi.gepafin.it #SPID configuration spid.ipd.base.url=https://login.regione.umbria.it active.profile.folder=production \ No newline at end of file From 38415f942f46c58ccc42d352b3d12d647b8e391d Mon Sep 17 00:00:00 2001 From: rbonazzo-KZ <66477605+rbonazzo-KZ@users.noreply.github.com> Date: Tue, 8 Oct 2024 14:08:24 +0200 Subject: [PATCH 07/31] Update application-production.properties Base URL Bandi API --- src/main/resources/application-production.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties index 0aba783c..7aed447a 100644 --- a/src/main/resources/application-production.properties +++ b/src/main/resources/application-production.properties @@ -6,11 +6,11 @@ spring.datasource.driver-class-name=org.postgresql.Driver # JPA Configuration spring.h2.console.enabled=true -base-url=http://bandi-api.gepafin.it +base-url=https://bandi-api.gepafin.it isVatCheckGloballyDisabled = false #fe.base.url=http://gepafin-production-fe.s3-website.eu-central-1.amazonaws.com fe.base.url=https://bandi.gepafin.it #SPID configuration spid.ipd.base.url=https://login.regione.umbria.it -active.profile.folder=production \ No newline at end of file +active.profile.folder=production From 5b1d0f435ac8c3d5885734791470a85ffa0e4d33 Mon Sep 17 00:00:00 2001 From: rbonazzo-KZ <66477605+rbonazzo-KZ@users.noreply.github.com> Date: Tue, 8 Oct 2024 14:14:04 +0200 Subject: [PATCH 08/31] Update application-production.properties --- src/main/resources/application-production.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties index 7aed447a..135cf1aa 100644 --- a/src/main/resources/application-production.properties +++ b/src/main/resources/application-production.properties @@ -6,7 +6,7 @@ spring.datasource.driver-class-name=org.postgresql.Driver # JPA Configuration spring.h2.console.enabled=true -base-url=https://bandi-api.gepafin.it +base-url=http://bandi-api.gepafin.it isVatCheckGloballyDisabled = false #fe.base.url=http://gepafin-production-fe.s3-website.eu-central-1.amazonaws.com From e69a17abfe92d1162bcfd4a3baa40508c1279c6a Mon Sep 17 00:00:00 2001 From: rajesh Date: Tue, 8 Oct 2024 20:03:48 -0700 Subject: [PATCH 09/31] Updated config --- .../net/gepafin/tendermanagement/config/SamlFailureHandler.java | 2 +- .../net/gepafin/tendermanagement/config/SecurityConfig.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/config/SamlFailureHandler.java b/src/main/java/net/gepafin/tendermanagement/config/SamlFailureHandler.java index 81df79e3..171b7e12 100644 --- a/src/main/java/net/gepafin/tendermanagement/config/SamlFailureHandler.java +++ b/src/main/java/net/gepafin/tendermanagement/config/SamlFailureHandler.java @@ -15,7 +15,7 @@ import jakarta.servlet.http.HttpServletResponse; @Component public class SamlFailureHandler implements AuthenticationFailureHandler { - private final Logger logger = LoggerFactory.getLogger(SamlSuccessHandler.class); + private final Logger logger = LoggerFactory.getLogger(SamlFailureHandler.class); @Value("${fe.base.url}") private String feBaseUrl; diff --git a/src/main/java/net/gepafin/tendermanagement/config/SecurityConfig.java b/src/main/java/net/gepafin/tendermanagement/config/SecurityConfig.java index 91424195..ec38b268 100644 --- a/src/main/java/net/gepafin/tendermanagement/config/SecurityConfig.java +++ b/src/main/java/net/gepafin/tendermanagement/config/SecurityConfig.java @@ -107,7 +107,7 @@ public class SecurityConfig { .requestMatchers("/swagger-ui/**").permitAll() // Swagger docs .requestMatchers("/v1/api-docs/**").permitAll() // API docs .anyRequest().authenticated()) - .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED)) .addFilterBefore(corsFilter(), UsernamePasswordAuthenticationFilter.class) .addFilterBefore(new JWTFilter(tokenProvider), UsernamePasswordAuthenticationFilter.class) // Add SAML2 login configuration (for BENEFICIARI) From d47fda85f0dd4330ef837bb175d5ac5779a9b71a Mon Sep 17 00:00:00 2001 From: rajesh Date: Tue, 8 Oct 2024 20:19:31 -0700 Subject: [PATCH 10/31] Temp commented code --- .../tendermanagement/service/impl/AuthenticationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java b/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java index 03ce8b1c..106f42b4 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java @@ -153,7 +153,7 @@ public class AuthenticationService { UserEntity userEntity = userRepository.findByBeneficiaryCodiceFiscale(cf) .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG))); - samlResponseLogRepository.delete(samlResponseLogEntity); + //samlResponseLogRepository.delete(samlResponseLogEntity); return getJWTTokenBean(userEntity, Boolean.TRUE); } From 13cc0a032426bd5709ea9581a56439034d84f53b Mon Sep 17 00:00:00 2001 From: rbonazzo-KZ <66477605+rbonazzo-KZ@users.noreply.github.com> Date: Wed, 9 Oct 2024 12:05:54 +0200 Subject: [PATCH 11/31] Update application-production.properties CHange base_url --- src/main/resources/application-production.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties index 135cf1aa..7aed447a 100644 --- a/src/main/resources/application-production.properties +++ b/src/main/resources/application-production.properties @@ -6,7 +6,7 @@ spring.datasource.driver-class-name=org.postgresql.Driver # JPA Configuration spring.h2.console.enabled=true -base-url=http://bandi-api.gepafin.it +base-url=https://bandi-api.gepafin.it isVatCheckGloballyDisabled = false #fe.base.url=http://gepafin-production-fe.s3-website.eu-central-1.amazonaws.com From e2be043c73c25ca2cfd6a1b9b05edad249ef4442 Mon Sep 17 00:00:00 2001 From: rbonazzo-KZ <66477605+rbonazzo-KZ@users.noreply.github.com> Date: Wed, 9 Oct 2024 12:11:35 +0200 Subject: [PATCH 12/31] Update application-production.properties --- src/main/resources/application-production.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties index 7aed447a..135cf1aa 100644 --- a/src/main/resources/application-production.properties +++ b/src/main/resources/application-production.properties @@ -6,7 +6,7 @@ spring.datasource.driver-class-name=org.postgresql.Driver # JPA Configuration spring.h2.console.enabled=true -base-url=https://bandi-api.gepafin.it +base-url=http://bandi-api.gepafin.it isVatCheckGloballyDisabled = false #fe.base.url=http://gepafin-production-fe.s3-website.eu-central-1.amazonaws.com From 77068ee7f4085841944f23a4ae27118874c74798 Mon Sep 17 00:00:00 2001 From: rajeshkhore <36757840+rajeshkhore@users.noreply.github.com> Date: Wed, 9 Oct 2024 16:06:01 +0530 Subject: [PATCH 13/31] Update application-production.properties updated base-url --- src/main/resources/application-production.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties index 135cf1aa..7aed447a 100644 --- a/src/main/resources/application-production.properties +++ b/src/main/resources/application-production.properties @@ -6,7 +6,7 @@ spring.datasource.driver-class-name=org.postgresql.Driver # JPA Configuration spring.h2.console.enabled=true -base-url=http://bandi-api.gepafin.it +base-url=https://bandi-api.gepafin.it isVatCheckGloballyDisabled = false #fe.base.url=http://gepafin-production-fe.s3-website.eu-central-1.amazonaws.com From 571a14e1fdebcb59f6474520c1efb60b03e5a7fb Mon Sep 17 00:00:00 2001 From: rajesh Date: Thu, 10 Oct 2024 11:56:08 -0700 Subject: [PATCH 14/31] resolved conflicts --- .../gepafin/tendermanagement/config/SecurityConfig.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/gepafin/tendermanagement/config/SecurityConfig.java b/src/main/java/net/gepafin/tendermanagement/config/SecurityConfig.java index ec38b268..90c278d4 100644 --- a/src/main/java/net/gepafin/tendermanagement/config/SecurityConfig.java +++ b/src/main/java/net/gepafin/tendermanagement/config/SecurityConfig.java @@ -24,12 +24,12 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; import org.springframework.web.servlet.handler.HandlerMappingIntrospector; - import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.servers.Server; +import jakarta.servlet.http.HttpServletResponse; import net.gepafin.tendermanagement.config.jwt.JWTFilter; import net.gepafin.tendermanagement.config.jwt.TokenProvider; @@ -108,6 +108,12 @@ public class SecurityConfig { .requestMatchers("/v1/api-docs/**").permitAll() // API docs .anyRequest().authenticated()) .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED)) + .exceptionHandling(exceptionHandling -> exceptionHandling + .authenticationEntryPoint((request, response, authException) -> { + // Send 403 Forbidden when there is no JWT token provided + response.sendError(HttpServletResponse.SC_FORBIDDEN, "Forbidden: Authentication token is missing or invalid"); + }) + ) .addFilterBefore(corsFilter(), UsernamePasswordAuthenticationFilter.class) .addFilterBefore(new JWTFilter(tokenProvider), UsernamePasswordAuthenticationFilter.class) // Add SAML2 login configuration (for BENEFICIARI) From 8a14059b0c73d7ae166106b31f9347055ae0a21c Mon Sep 17 00:00:00 2001 From: rajesh Date: Fri, 11 Oct 2024 10:19:23 +0530 Subject: [PATCH 15/31] Done ticket GEPAFINBE-39 --- pom.xml | 6 + .../constants/GepafinConstant.java | 1 + .../tendermanagement/dao/ApplicationDao.java | 84 ++++++++++++- .../dao/SystemEmailTemplatesDao.java | 116 ++++++++++++++++++ .../entities/SystemEmailTemplatesEntity.java | 56 +++++++++ .../response/SystemEmailTemplateResponse.java | 16 +++ .../SystemEmailTemplatesRespository.java | 17 +++ .../service/SystemEmailTemplatesService.java | 13 ++ .../service/impl/ApplicationServiceImpl.java | 3 +- .../impl/SystemEmailTemplatesServiceImpl.java | 27 ++++ .../tendermanagement/util/DateTimeUtil.java | 16 +++ .../tendermanagement/util/MailUtil.java | 78 ++++++++++++ .../gepafin/tendermanagement/util/Utils.java | 27 ++++ src/main/resources/application-dev.properties | 1 + .../application-production.properties | 3 +- src/main/resources/application.properties | 12 ++ .../db/changelog/db.changelog-1.0.0.xml | 25 ++++ ...il_template_for_application_submission.sql | 34 +++++ 18 files changed, 531 insertions(+), 4 deletions(-) create mode 100644 src/main/java/net/gepafin/tendermanagement/dao/SystemEmailTemplatesDao.java create mode 100644 src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java create mode 100644 src/main/java/net/gepafin/tendermanagement/model/response/SystemEmailTemplateResponse.java create mode 100644 src/main/java/net/gepafin/tendermanagement/repositories/SystemEmailTemplatesRespository.java create mode 100644 src/main/java/net/gepafin/tendermanagement/service/SystemEmailTemplatesService.java create mode 100644 src/main/java/net/gepafin/tendermanagement/service/impl/SystemEmailTemplatesServiceImpl.java create mode 100644 src/main/java/net/gepafin/tendermanagement/util/MailUtil.java create mode 100644 src/main/resources/db/dump/insert_system_email_template_for_application_submission.sql diff --git a/pom.xml b/pom.xml index b0a632d8..db1f4b8f 100644 --- a/pom.xml +++ b/pom.xml @@ -179,6 +179,12 @@ 5.3.0 + + com.mailgun + mailgun-java + 1.0.2 + + org.apache.santuario xmlsec diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java index 2effa6d2..62e90058 100644 --- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java +++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java @@ -199,6 +199,7 @@ public class GepafinConstant { public static final String DELEGATION_NOT_FOUND = "delegation.not.found"; public static final String USER_COMPANY_RELATION_NOT_FOUND = "user.company.relation.not.found"; public static final String DELEGATION_DELETE_SUCCESS = "delegation.delete.success"; + public static final String HH_MM_SS = "HH:mm:ss"; } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index ba6339a7..b690a3e6 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -3,6 +3,7 @@ package net.gepafin.tendermanagement.dao; import net.gepafin.tendermanagement.config.Translator; import net.gepafin.tendermanagement.constants.GepafinConstant; import net.gepafin.tendermanagement.entities.*; +import net.gepafin.tendermanagement.entities.SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum; import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum; import net.gepafin.tendermanagement.enums.DocumentSourceTypeEnum; import net.gepafin.tendermanagement.enums.RoleStatusEnum; @@ -14,16 +15,20 @@ import net.gepafin.tendermanagement.repositories.*; import net.gepafin.tendermanagement.service.CallService; import net.gepafin.tendermanagement.service.DocumentService; import net.gepafin.tendermanagement.service.FormService; +import net.gepafin.tendermanagement.service.SystemEmailTemplatesService; import net.gepafin.tendermanagement.util.DateTimeUtil; import net.gepafin.tendermanagement.util.FieldValidator; +import net.gepafin.tendermanagement.util.MailUtil; import net.gepafin.tendermanagement.util.Utils; import net.gepafin.tendermanagement.util.Validator; import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException; import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; import net.gepafin.tendermanagement.web.rest.api.errors.Status; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Component; @@ -75,6 +80,19 @@ public class ApplicationDao { @Autowired private ProtocolRepository protocolRepository; + + @Autowired + private SystemEmailTemplatesService systemEmailTemplatesService; + + @Autowired + private MailUtil mailUtil; + + @Value("${default_System_Receiver_Email}") + private String defaultSystemReceiverEmail; + + @Value("${gepafin_email}") + private String gepafinEmail; + public ApplicationResponseBean createApplication(ApplicationRequestBean applicationRequestBean, UserEntity userEntity, Long formId, Long applicationId) { @@ -516,7 +534,7 @@ public class ApplicationDao { } } - public ApplicationResponse updateApplicationStatus(Long applicationId, ApplicationStatusTypeEnum status) { + public ApplicationResponse updateApplicationStatus(UserEntity userEntity, Long applicationId, ApplicationStatusTypeEnum status) { ApplicationEntity applicationEntity = validateApplication(applicationId); if(Boolean.TRUE.equals(applicationEntity.getStatus().equals(status.getValue()))){ @@ -547,6 +565,8 @@ public class ApplicationDao { applicationEntity.setProtocol(protocolEntity); applicationEntity.setStatus(ApplicationStatusTypeEnum.SUBMIT.getValue()); applicationEntity.setSubmissionDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); + sendMailToUserAndCompany(userEntity, applicationEntity); + sendMailTodefaultSystemAndGepafin(userEntity, applicationEntity); } else { applicationEntity.setStatus(status.getValue()); } @@ -555,7 +575,7 @@ public class ApplicationDao { return getApplicationResponse(applicationEntity); } - public Integer calculateProgress(Long totalSteps, Long completedSteps) { + public Integer calculateProgress(Long totalSteps, Long completedSteps) { if (FieldValidator.isNullOrZero(totalSteps)) { throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.TOTAL_STEPS_NOT_BE_ZERO)); } @@ -639,4 +659,64 @@ public class ApplicationDao { protocolRepository.save(protocolEntity); return protocolEntity; } + + private void sendMailToUserAndCompany(UserEntity userEntity, ApplicationEntity applicationEntity) { + CallEntity call =applicationEntity.getCall(); + CompanyEntity company = applicationEntity.getCompany(); + ProtocolEntity protocol = applicationEntity.getProtocol(); + SystemEmailTemplateResponse systemEmailTemplateResponse = systemEmailTemplatesService + .retrieveTemplateByTypeAndCall(SystemEmailTemplatesEntityTypeEnum.APPLICATION_SUBMISSION_TO_USER_AND_COMPANY, + call, null); + + // Create the map for subject placeholders + Map subjectPlaceholders = new HashMap<>(); + subjectPlaceholders.put("{{call_name}}", call.getName()); + subjectPlaceholders.put("{{company_name}}", company.getCompanyName()); + + // Create the map for body placeholders + Map bodyPlaceholders = new HashMap<>(); + bodyPlaceholders.put("{{call_name}}", call.getName()); + bodyPlaceholders.put("{{protocol_number}}", protocol.getProtocolNumber().toString()); + bodyPlaceholders.put("{{date}}", DateTimeUtil.formatLocalDateTime(protocol.getCreatedDate(), GepafinConstant.YYYY_MM_DD_SLASH)); + bodyPlaceholders.put("{{time}}", DateTimeUtil.parseLocalTimeToString(protocol.getTime(), GepafinConstant.HH_MM_SS)); + + // Replace placeholders in the subject and body + String subject = Utils.replacePlaceholders(systemEmailTemplateResponse.getSubject(), subjectPlaceholders); + String body = Utils.replacePlaceholders(systemEmailTemplateResponse.getHtmlContent(), bodyPlaceholders); + + + mailUtil.sendByMailGun(subject, body, List.of(userEntity.getEmail()), null); + mailUtil.sendByMailGun(subject, body, List.of(applicationEntity.getCompany().getEmail()), null); + + } + + private void sendMailTodefaultSystemAndGepafin(UserEntity userEntity, ApplicationEntity applicationEntity) { + CallEntity call =applicationEntity.getCall(); + CompanyEntity company = applicationEntity.getCompany(); + ProtocolEntity protocol = applicationEntity.getProtocol(); + SystemEmailTemplateResponse systemEmailTemplateResponse = systemEmailTemplatesService + .retrieveTemplateByTypeAndCall(SystemEmailTemplatesEntityTypeEnum.APPLICATION_SUBMISSION_TO_GEPAFIN, + call, null); + + // Create the map for subject placeholders + Map subjectPlaceholders = new HashMap<>(); + subjectPlaceholders.put("{{call_name}}", call.getName()); + subjectPlaceholders.put("{{company_name}}", company.getCompanyName()); + + // Create the map for body placeholders + Map bodyPlaceholders = new HashMap<>(); + bodyPlaceholders.put("{{call_name}}", call.getName()); + bodyPlaceholders.put("{{protocol_number}}", protocol.getProtocolNumber().toString()); + bodyPlaceholders.put("{{date}}", DateTimeUtil.formatLocalDateTime(protocol.getCreatedDate(), GepafinConstant.YYYY_MM_DD_SLASH)); + bodyPlaceholders.put("{{time}}", DateTimeUtil.parseLocalTimeToString(protocol.getTime(), GepafinConstant.HH_MM_SS)); + + // Replace placeholders in the subject and body + String subject = Utils.replacePlaceholders(systemEmailTemplateResponse.getSubject(), subjectPlaceholders); + String body = Utils.replacePlaceholders(systemEmailTemplateResponse.getHtmlContent(), bodyPlaceholders); + + + mailUtil.sendByMailGun(subject, body, List.of(defaultSystemReceiverEmail), null); + mailUtil.sendByMailGun(subject, body, List.of(gepafinEmail), null); + + } } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/SystemEmailTemplatesDao.java b/src/main/java/net/gepafin/tendermanagement/dao/SystemEmailTemplatesDao.java new file mode 100644 index 00000000..9218a33d --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/dao/SystemEmailTemplatesDao.java @@ -0,0 +1,116 @@ +package net.gepafin.tendermanagement.dao; + +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import net.gepafin.tendermanagement.entities.CallEntity; +import net.gepafin.tendermanagement.entities.SystemEmailTemplatesEntity; +import net.gepafin.tendermanagement.entities.SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum; +import net.gepafin.tendermanagement.model.response.SystemEmailTemplateResponse; +import net.gepafin.tendermanagement.repositories.SystemEmailTemplatesRespository; +import net.gepafin.tendermanagement.util.Utils; + +@Component +public class SystemEmailTemplatesDao { + + @Autowired + private SystemEmailTemplatesRespository systemEmailTemplatesRespository; + + @Value("${fe.base.url}") + private String feBaseUrl; + + + public SystemEmailTemplateResponse retrieveTemplate(SystemEmailTemplatesEntityTypeEnum type, CallEntity call, Locale language) { + SystemEmailTemplatesEntity dbSystemEmailTemplatesEntity = null; + if(call != null){ +// dbSystemEmailTemplatesEntity = systemEmailTemplatesRespository +// .findByTypeAndCallId(type.getValue(), call.getId()); + } + if(dbSystemEmailTemplatesEntity == null){ + dbSystemEmailTemplatesEntity = systemEmailTemplatesRespository + .findByType(type.getValue()); + } + + SystemEmailTemplateResponse systemEmailTemplateResponse = replaceHtmlContant(dbSystemEmailTemplatesEntity, call, language, Boolean.TRUE); + return systemEmailTemplateResponse; + } + + private SystemEmailTemplateResponse replaceHtmlContant(SystemEmailTemplatesEntity dbSystemEmailTemplatesEntity, + CallEntity call, Locale language1, Boolean isDefaultReplace) { + String language = null; + String htmlContent = dbSystemEmailTemplatesEntity.getHtmlContent(); + String subject = dbSystemEmailTemplatesEntity.getSubject(); + + if (language1 == null) { +// language = getLanguage(LocaleContextHolder.getLocale()); + language="italian"; + }else{ + language="italian"; + } + Map languageMap = new HashMap<>(); + String jsonContent = dbSystemEmailTemplatesEntity.getJson(); + if (Boolean.FALSE.equals(StringUtils.isEmpty(jsonContent))) { + Map> jsonMap = Utils.parseJsonContent(jsonContent); + if (jsonMap != null && jsonMap.containsKey(language)) { + languageMap = jsonMap.get(language); + htmlContent = replacePlaceholders(htmlContent, languageMap); + subject = replaceSubjectPlaceholders(subject, languageMap); + + } + } + if(Boolean.TRUE.equals(StringUtils.isEmpty(subject))){ + subject = ""; + } + + + htmlContent = replacePlatformLinkPlaceholder(call, htmlContent, languageMap); + SystemEmailTemplateResponse systemEmailTemplateResponse = new SystemEmailTemplateResponse(); + systemEmailTemplateResponse.setHtmlContent(htmlContent); + systemEmailTemplateResponse.setSubject(subject); + systemEmailTemplateResponse.setJsonMap(languageMap); + return systemEmailTemplateResponse; + } + + + +// private String getLanguage(Locale locale) { +// return switch (locale.getLanguage()) { +// case "en" -> "english"; +// case "it" -> "italian"; +// default -> "italian"; +// }; +// } + + private String replacePlaceholders(String htmlContent, Map languageMap) { + for (Map.Entry entry : languageMap.entrySet()) { + htmlContent = htmlContent.replace("{{" + entry.getKey() + "}}", entry.getValue()); + } + return htmlContent; + } + + private String replaceSubjectPlaceholders(String subject, Map languageMap) { + if(languageMap.containsKey("subject") && subject != null){ + String value = languageMap.get("subject"); + subject = subject.replace("{{subject}}", value); + return subject; + } + return ""; + } + private String replacePlatformLinkPlaceholder(CallEntity call, String htmlContent, + Map languageMap) { + String platformLink = feBaseUrl; + +// if(hubEntity != null && Boolean.FALSE.equals(isEmpty(hubEntity.getDomainName()))){ +// platformLink = hubEntity.getDomainName(); +// } + htmlContent = htmlContent.replace("{{platform_link}}", platformLink); + return htmlContent; + } + +} diff --git a/src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java new file mode 100644 index 00000000..9ae12cbf --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java @@ -0,0 +1,56 @@ +package net.gepafin.tendermanagement.entities; + +import com.fasterxml.jackson.annotation.JsonValue; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.Data; + +@Entity +@Table(name = "system_email_template") +@Data +public class SystemEmailTemplatesEntity extends BaseEntity { + + + @Column(name = "TEMPLATE_NAME") + private String templateName; + + @Column(name = "TYPE") + private String type; + + @Column(name = "HTML_CONTENT", columnDefinition = "TEXT") + private String htmlContent; + + @Column(name = "SUBJECT") + private String subject; + + @Column(name = "JSON", columnDefinition = "TEXT") + private String json; + + @Column(name = "SYSTEM") + private Boolean system; + + @Column(name ="IS_DELETED", nullable = false) + private Boolean isDeleted = false; + + public enum SystemEmailTemplatesEntityTypeEnum { + + APPLICATION_SUBMISSION_TO_USER_AND_COMPANY("APPLICATION_SUBMISSION_TO_USER_AND_COMPANY"), + APPLICATION_SUBMISSION_TO_GEPAFIN("APPLICATION_SUBMISSION_TO_GEPAFIN"); + + private String value; + + SystemEmailTemplatesEntityTypeEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + } + +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/SystemEmailTemplateResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/SystemEmailTemplateResponse.java new file mode 100644 index 00000000..cd65e6e4 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/response/SystemEmailTemplateResponse.java @@ -0,0 +1,16 @@ +package net.gepafin.tendermanagement.model.response; + +import java.util.Map; + +import lombok.Data; + +@Data +public class SystemEmailTemplateResponse { + + String htmlContent; + + String subject; + + Map jsonMap; + +} diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/SystemEmailTemplatesRespository.java b/src/main/java/net/gepafin/tendermanagement/repositories/SystemEmailTemplatesRespository.java new file mode 100644 index 00000000..9e3e9bb9 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/repositories/SystemEmailTemplatesRespository.java @@ -0,0 +1,17 @@ +package net.gepafin.tendermanagement.repositories; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import net.gepafin.tendermanagement.entities.SystemEmailTemplatesEntity; + +public interface SystemEmailTemplatesRespository extends JpaRepository { + +// @Query("select s from SystemEmailTemplatesEntity s where s.type=:type and s.call.id=:callId and s.isDeleted =false and s.system = false") +// SystemEmailTemplatesEntity findByTypeAndCallId(@Param("type") String type, @Param("callId") Long callId); + + @Query("select s from SystemEmailTemplatesEntity s where s.type=:type and s.isDeleted =false and s.system = true") + SystemEmailTemplatesEntity findByType(@Param("type") String type); + +} diff --git a/src/main/java/net/gepafin/tendermanagement/service/SystemEmailTemplatesService.java b/src/main/java/net/gepafin/tendermanagement/service/SystemEmailTemplatesService.java new file mode 100644 index 00000000..b40dc80f --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/service/SystemEmailTemplatesService.java @@ -0,0 +1,13 @@ +package net.gepafin.tendermanagement.service; + +import java.util.Locale; + +import net.gepafin.tendermanagement.entities.CallEntity; +import net.gepafin.tendermanagement.entities.SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum; +import net.gepafin.tendermanagement.model.response.SystemEmailTemplateResponse; + +public interface SystemEmailTemplatesService { + + SystemEmailTemplateResponse retrieveTemplateByTypeAndCall(SystemEmailTemplatesEntityTypeEnum type, CallEntity call, Locale language); + +} diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java index a082a092..bd6341de 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java @@ -78,7 +78,8 @@ public class ApplicationServiceImpl implements ApplicationService { @Override @Transactional(rollbackFor = Exception.class) public ApplicationResponse updateApplicationStatus(HttpServletRequest request, Long applicationId, ApplicationStatusTypeEnum status) { - return applicationDao.updateApplicationStatus(applicationId, status); + UserEntity userEntity = validator.validateUser(request); + return applicationDao.updateApplicationStatus(userEntity, applicationId, status); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/SystemEmailTemplatesServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/SystemEmailTemplatesServiceImpl.java new file mode 100644 index 00000000..802f2580 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/SystemEmailTemplatesServiceImpl.java @@ -0,0 +1,27 @@ +package net.gepafin.tendermanagement.service.impl; + +import java.util.Locale; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import net.gepafin.tendermanagement.dao.SystemEmailTemplatesDao; +import net.gepafin.tendermanagement.entities.CallEntity; +import net.gepafin.tendermanagement.entities.SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum; +import net.gepafin.tendermanagement.model.response.SystemEmailTemplateResponse; +import net.gepafin.tendermanagement.service.SystemEmailTemplatesService; + +@Service +public class SystemEmailTemplatesServiceImpl implements SystemEmailTemplatesService { + + @Autowired + private SystemEmailTemplatesDao systemEmailTemplatesDao; + + + @Override + public SystemEmailTemplateResponse retrieveTemplateByTypeAndCall(SystemEmailTemplatesEntityTypeEnum type, CallEntity call, Locale language) { + return systemEmailTemplatesDao.retrieveTemplate(type, call, language); + } + + +} diff --git a/src/main/java/net/gepafin/tendermanagement/util/DateTimeUtil.java b/src/main/java/net/gepafin/tendermanagement/util/DateTimeUtil.java index 342ca2b2..92da73eb 100644 --- a/src/main/java/net/gepafin/tendermanagement/util/DateTimeUtil.java +++ b/src/main/java/net/gepafin/tendermanagement/util/DateTimeUtil.java @@ -92,4 +92,20 @@ public class DateTimeUtil { DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern); return LocalDateTime.parse(dateTimeStr, formatter); } + + public static String parseLocalTimeToString(LocalTime time, String format) { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format); + return time.format(formatter); + } + + // Method 2: Convert String and format to LocalTime + public static LocalTime parseStringToLocalTime(String timeString, String format) { + try { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format); + return LocalTime.parse(timeString, formatter); + } catch (DateTimeParseException e) { + System.out.println("Invalid time format: " + e.getMessage()); + return null; + } + } } diff --git a/src/main/java/net/gepafin/tendermanagement/util/MailUtil.java b/src/main/java/net/gepafin/tendermanagement/util/MailUtil.java new file mode 100644 index 00000000..8b41ea3f --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/util/MailUtil.java @@ -0,0 +1,78 @@ +package net.gepafin.tendermanagement.util; + +import java.util.Arrays; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.env.Environment; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import com.mailgun.api.v3.MailgunMessagesApi; +import com.mailgun.client.MailgunClient; + +@Component +public class MailUtil { + + @Value("${apiKey}") + private String apiKeyValue; + + @Value("${mailGun_user}") + private String mailGunUser; + + @Value("${mailGun_apiKey}") + private String mailGunApiKey; + + @Value("${mailGun_domainName}") + private String mailGunDomainName; + + @Value("${mailGun_base_url}") + private String mailGunBaseUrl; + + @Value("${isMailSendingEnabled}") + private String isEmailSendingEnabled; + + @Autowired + private Environment environment; + + public Boolean isTestProfileActivated() { + String[] activeProfiles = environment.getActiveProfiles(); + return Arrays.stream(activeProfiles).anyMatch("test"::equals); + } + + public void sendMailByMailGunAPI(List recipents, List CC, List BCC, String subject, + String body, String replyTo) { + if (Boolean.FALSE.equals(Boolean.parseBoolean(isEmailSendingEnabled))) { + return; + } + + MailgunMessagesApi mailgunMessagesApi = MailgunClient.config(mailGunBaseUrl, mailGunApiKey) + .createApi(MailgunMessagesApi.class); + + String mailFrom = mailGunUser; + + com.mailgun.model.message.Message.MessageBuilder temp = com.mailgun.model.message.Message.builder() + .replyTo(replyTo).from(mailFrom).to(recipents).subject(subject).html(body); + + if (Boolean.FALSE.equals(CollectionUtils.isEmpty(CC))) { + temp.cc(CC); + } + + if (Boolean.FALSE.equals(CollectionUtils.isEmpty(BCC))) { + temp.bcc(BCC); + } + + if (Boolean.FALSE.equals(isTestProfileActivated())) { + com.mailgun.model.message.Message message = temp.build(); + mailgunMessagesApi.sendMessage(mailGunDomainName, message); + } + + } + + public void sendByMailGun(String subject, String body, List receiverEmails, String replyTo) { + sendMailByMailGunAPI(receiverEmails, null, null, subject, body, replyTo); + + } + +} diff --git a/src/main/java/net/gepafin/tendermanagement/util/Utils.java b/src/main/java/net/gepafin/tendermanagement/util/Utils.java index 746c8e8d..d7da174b 100644 --- a/src/main/java/net/gepafin/tendermanagement/util/Utils.java +++ b/src/main/java/net/gepafin/tendermanagement/util/Utils.java @@ -5,6 +5,7 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; import java.security.SecureRandom; import java.util.Base64; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Consumer; @@ -276,4 +277,30 @@ public class Utils { } } + public static Map> parseJsonContent(String jsonContent) { + ObjectMapper objectMapper = new ObjectMapper(); + try { + return mapper.readValue(jsonContent, HashMap.class); + } catch (Exception exception) { + log.error(exception.getMessage()); + } + return new HashMap<>(); + } + + // Utility method to replace placeholders with their values, handling nulls + public static String replacePlaceholders(String text, Map placeholders) { + if (text == null) { + return ""; + } + for (Map.Entry entry : placeholders.entrySet()) { + text = replaceNull(text, entry.getKey(), entry.getValue()); + } + return text; + } + + // Method to safely replace nulls with an empty string or a default value + private static String replaceNull(String text, String target, String replacement) { + return text.replace(target, replacement != null ? replacement : ""); + } + } diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 19588213..5b6ca7a9 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -8,3 +8,4 @@ spring.datasource.driver-class-name=org.postgresql.Driver spring.h2.console.enabled=true isVatCheckGloballyDisabled = false +isMailSendingEnabled = true diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties index 968d5ac5..986dd51b 100644 --- a/src/main/resources/application-production.properties +++ b/src/main/resources/application-production.properties @@ -13,4 +13,5 @@ isVatCheckGloballyDisabled = false fe.base.url=http://bandi.gepafin.it #SPID configuration spid.ipd.base.url=https://login.regione.umbria.it -active.profile.folder=production \ No newline at end of file +active.profile.folder=production +isMailSendingEnabled = true \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 27151cbc..0472eb61 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -50,3 +50,15 @@ vatCheckNewToken: 66026bd891a51044e90e08c4 spid.ipd.base.url=https://federatest.umbriadigitale.it active.profile.folder=dev +# MailGun API Key +mailGun_apiKey= 398e3dea1911fe941af261906ec99362-07e2c238-8094421f +mailGun_user=comunicazione@paghiamoci.ai +mailGun_domainName=paghiamoci.ai +mailGun_base_url=https://api.eu.mailgun.net/ +# SendinBlue API key +apiKey=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 +#senderEmail=mailer@bflows.net +isMailSendingEnabled = false +default_System_Receiver_Email=attivazione@bflows.net +gepafin_email=bandi@pec.gepafin.it + diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml index 98016d3c..446334d6 100644 --- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml +++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml @@ -973,4 +973,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/db/dump/insert_system_email_template_for_application_submission.sql b/src/main/resources/db/dump/insert_system_email_template_for_application_submission.sql new file mode 100644 index 00000000..acd205bd --- /dev/null +++ b/src/main/resources/db/dump/insert_system_email_template_for_application_submission.sql @@ -0,0 +1,34 @@ +INSERT INTO gepafin_schema.system_email_template (id, template_name, "type", html_content, subject, "json", "system", is_deleted, created_date, updated_date) VALUES(1, 'Application submission template to beneficiary and company', 'APPLICATION_SUBMISSION_TO_USER_AND_COMPANY', ' + +
+

Buongiorno,

+

+ Si comunica che, in riferimento alla domanda di concessione di + Finanziamento agevolato a valere sul Fondo prestiti + {{call_name}} di cui all''oggetto, la stessa è stata + regolarmente acquisita ed è stata registrata con Protocollo n. + {{protocol_number}} del {{date}} alle + {{time}}. +

+

Distinti Saluti,

+

+ Gepafin S.p.a. +

+
+ +', 'BANDO {{call_name}} - Domanda di concessione di finanziamento agevolato {{company_name}}', NULL, true, false, '2024-10-10 16:10:31.035', '2024-10-11 10:09:23.037'); +INSERT INTO gepafin_schema.system_email_template (id, template_name, "type", html_content, subject, "json", "system", is_deleted, created_date, updated_date) VALUES(2, 'Application submission template to gepafin', 'APPLICATION_SUBMISSION_TO_GEPAFIN', ' + +
+

+ In riferimento alla domanda di concessione di Finanziamento agevolato a valere sul Fondo prestiti + {{call_name}} di cui all’oggetto, la stessa è stata regolarmente acquisita ed è stata + registrata con Protocollo n. {{protocol_number}} del {{date}} e {{time}}. +

+

Distinti Saluti,

+

+ Gepafin S.p.a. +

+
+ +', 'BANDO {{call_name}} - Domanda di concessione di finanziamento agevolato {{company_name}}', NULL, true, false, '2024-10-10 16:10:31.035', '2024-10-11 10:09:57.224'); \ No newline at end of file From 9c4a5f3ee56b7cd50a6e2b3fd845ecb87d43a25d Mon Sep 17 00:00:00 2001 From: rajesh Date: Fri, 11 Oct 2024 17:04:00 +0530 Subject: [PATCH 16/31] updated code --- .../net/gepafin/tendermanagement/dao/ApplicationDao.java | 8 ++++++++ src/main/resources/application.properties | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index bca8f0d1..5033ee00 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -99,6 +99,12 @@ public class ApplicationDao { @Value("${gepafin_email}") private String gepafinEmail; + + @Value("${rinaldo_email}") + private String rinaldoEmail; + + @Value("${carlo_email}") + private String carloEmail; @@ -741,6 +747,8 @@ public class ApplicationDao { mailUtil.sendByMailGun(subject, body, List.of(defaultSystemReceiverEmail), null); mailUtil.sendByMailGun(subject, body, List.of(gepafinEmail), null); + mailUtil.sendByMailGun(subject, body, List.of(rinaldoEmail), null); + mailUtil.sendByMailGun(subject, body, List.of(carloEmail), null); } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 0472eb61..f50d4088 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -61,4 +61,6 @@ apiKey=xkeysib-d15439fedd7ff36d86676ac248153fc2c496ed9b879ca9dc8cee9a27fa309087- isMailSendingEnabled = false default_System_Receiver_Email=attivazione@bflows.net gepafin_email=bandi@pec.gepafin.it +rinaldo_email=rinaldo.bonazzo@bflows.net +carlo_email=carlo.mancosu@bflows.net From 3102300f647cfca06dcb637ba47b6a04c16869e1 Mon Sep 17 00:00:00 2001 From: rajesh Date: Fri, 11 Oct 2024 17:20:35 +0530 Subject: [PATCH 17/31] updated code --- .../net/gepafin/tendermanagement/dao/ApplicationDao.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index 5033ee00..1a621072 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -714,8 +714,11 @@ public class ApplicationDao { String subject = Utils.replacePlaceholders(systemEmailTemplateResponse.getSubject(), subjectPlaceholders); String body = Utils.replacePlaceholders(systemEmailTemplateResponse.getHtmlContent(), bodyPlaceholders); - - mailUtil.sendByMailGun(subject, body, List.of(userEntity.getEmail()), null); + String email = userEntity.getEmail(); + if (userEntity.getBeneficiary() != null) { + email = userEntity.getBeneficiary().getEmail(); + } + mailUtil.sendByMailGun(subject, body, List.of(email), null); mailUtil.sendByMailGun(subject, body, List.of(applicationEntity.getCompany().getEmail()), null); } From e9b7a123fe46c02010a14e72d54423ae92ffe596 Mon Sep 17 00:00:00 2001 From: rajesh Date: Fri, 11 Oct 2024 18:19:24 +0530 Subject: [PATCH 18/31] Done ticket GEPAFINBE-47 --- .../gepafin/tendermanagement/constants/GepafinConstant.java | 1 + .../java/net/gepafin/tendermanagement/dao/CompanyDao.java | 5 +++-- src/main/resources/message_en.properties | 1 + src/main/resources/message_it.properties | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java index d72853c7..9fdb1936 100644 --- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java +++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java @@ -203,5 +203,6 @@ public class GepafinConstant { public static final String APPLICATION_SUBMITTED_CANNOT_CHANGE = "application.submitted.cannot.change"; public static final String CALL_DOCUMENTS_FETCH_SUCCESS_MSG = "call.documents.fetch.success"; public static final String CALL_DOCUMENTS_NOT_FOUND_MSG = "call.documents.not.found"; + public static final String PERMISSION_DENIED = "permission.denied"; } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java index 728990b5..3a9b92ad 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java @@ -18,6 +18,7 @@ import net.gepafin.tendermanagement.repositories.UserWithCompanyRepository; import net.gepafin.tendermanagement.service.UserService; import net.gepafin.tendermanagement.util.Utils; import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException; +import net.gepafin.tendermanagement.web.rest.api.errors.ForbiddenAccessException; import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; import net.gepafin.tendermanagement.web.rest.api.errors.Status; @@ -190,8 +191,8 @@ public class CompanyDao { } public UserWithCompanyEntity validateUserWithCompny(Long userId, Long companyId) { - return userWithCompanyRepository.findByUserIdAndCompanyId(userId, companyId).orElseThrow(() -> new CustomValidationException(Status.UNAUTHORIZED, - Translator.toLocale(GepafinConstant.UNAUTHORIZED))); + return userWithCompanyRepository.findByUserIdAndCompanyId(userId, companyId).orElseThrow(() -> new ForbiddenAccessException(Status.FORBIDDEN, + Translator.toLocale(GepafinConstant.PERMISSION_DENIED))); } public UserWithCompanyEntity getUserWithCompany(Long userId, Long compnayId) { diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties index 8ae7bcfa..bbf010f5 100644 --- a/src/main/resources/message_en.properties +++ b/src/main/resources/message_en.properties @@ -229,5 +229,6 @@ application.submitted.cannot.change=The submitted application cannot be changed. # Call Document Messages call.documents.fetch.success=Documents fetched successfully. call.documents.not.found=No documents found for the specified call. +permission.denied=You are not authorized to access this data. diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties index 9b998124..2235bb51 100644 --- a/src/main/resources/message_it.properties +++ b/src/main/resources/message_it.properties @@ -225,5 +225,6 @@ application.submitted.cannot.change=La domanda inviata non pu # Call Document Messages call.documents.fetch.success=Documenti recuperati con successo. call.documents.not.found=Nessun documento trovato per la chiamata specificata. +permission.denied=Non sei autorizzato ad accedere a questi dati. From eb12433a31ba54fcdd57af4b128fedef3125ff58 Mon Sep 17 00:00:00 2001 From: rajesh Date: Sat, 12 Oct 2024 14:47:05 +0530 Subject: [PATCH 19/31] Done ticket GEPAFINBE-41 --- .../constants/GepafinConstant.java | 3 + .../tendermanagement/dao/ApplicationDao.java | 81 ++++++++++++++++++- .../ApplicationSignedDocumentEntity.java | 28 +++++++ .../ApplicationSignedDocumentStatusEnum.java | 18 +++++ .../ApplicationSignedDocumentResponse.java | 14 ++++ .../response/CompanyDelegationResponse.java | 3 +- .../UploadFileOnAmazonS3Response.java | 14 ++++ .../ApplicationSignedDocumentRepository.java | 13 +++ .../service/AmazonS3Service.java | 4 + .../service/ApplicationService.java | 7 ++ .../service/impl/AmazonS3ServiceImpl.java | 25 ++++++ .../service/impl/ApplicationServiceImpl.java | 16 +++- .../service/impl/CompanyServiceImpl.java | 3 +- .../tendermanagement/util/Validator.java | 5 +- .../web/rest/api/ApplicationApi.java | 27 +++++++ .../api/impl/ApplicationApiController.java | 22 +++++ src/main/resources/application.properties | 1 + .../db/changelog/db.changelog-1.0.0.xml | 25 ++++++ src/main/resources/message_en.properties | 3 + src/main/resources/message_it.properties | 3 + 20 files changed, 307 insertions(+), 8 deletions(-) create mode 100644 src/main/java/net/gepafin/tendermanagement/entities/ApplicationSignedDocumentEntity.java create mode 100644 src/main/java/net/gepafin/tendermanagement/enums/ApplicationSignedDocumentStatusEnum.java create mode 100644 src/main/java/net/gepafin/tendermanagement/model/response/ApplicationSignedDocumentResponse.java create mode 100644 src/main/java/net/gepafin/tendermanagement/model/response/UploadFileOnAmazonS3Response.java create mode 100644 src/main/java/net/gepafin/tendermanagement/repositories/ApplicationSignedDocumentRepository.java diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java index 9fdb1936..4580af18 100644 --- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java +++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java @@ -204,5 +204,8 @@ public class GepafinConstant { public static final String CALL_DOCUMENTS_FETCH_SUCCESS_MSG = "call.documents.fetch.success"; public static final String CALL_DOCUMENTS_NOT_FOUND_MSG = "call.documents.not.found"; public static final String PERMISSION_DENIED = "permission.denied"; + public static final String SIGNED_DOCUMENT_FILE_UPLOAD_SUCCESS = "signed.document.file.upload.success"; + public static final String GET_SIGNED_DOCUMENT_FILE_SUCCESS = "get.signed.document.file.success"; + public static final String APPLICATION_SIGNED_DOCUMENT_NOT_FOUND = "application.signed.document.not.found"; } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index 634594ba..c12f6d4e 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -3,6 +3,7 @@ package net.gepafin.tendermanagement.dao; import net.gepafin.tendermanagement.config.Translator; import net.gepafin.tendermanagement.constants.GepafinConstant; import net.gepafin.tendermanagement.entities.*; +import net.gepafin.tendermanagement.enums.ApplicationSignedDocumentStatusEnum; import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum; import net.gepafin.tendermanagement.enums.DocumentSourceTypeEnum; import net.gepafin.tendermanagement.enums.RoleStatusEnum; @@ -12,6 +13,7 @@ import net.gepafin.tendermanagement.model.request.ApplicationRequest; import net.gepafin.tendermanagement.model.request.ApplicationRequestBean; import net.gepafin.tendermanagement.model.response.*; import net.gepafin.tendermanagement.repositories.*; +import net.gepafin.tendermanagement.service.AmazonS3Service; import net.gepafin.tendermanagement.service.CallService; import net.gepafin.tendermanagement.service.CompanyService; import net.gepafin.tendermanagement.service.DocumentService; @@ -26,10 +28,13 @@ import net.gepafin.tendermanagement.web.rest.api.errors.Status; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; import jakarta.persistence.criteria.Predicate; +import jakarta.servlet.http.HttpServletRequest; import java.text.MessageFormat; import java.time.LocalDateTime; @@ -71,17 +76,27 @@ public class ApplicationDao { @Autowired private FlowDataRepository flowDataRepository; - @Autowired - private UserWithCompanyRepository userWithCompanyRepository; + @Autowired private UserCompanyDelegationRepository userCompanyDelegationRepository; + @Autowired private Validator validator; + @Autowired private CompanyService companyService; @Autowired private ProtocolRepository protocolRepository; + + @Autowired + private AmazonS3Service amazonS3Service; + + @Autowired + private ApplicationSignedDocumentRepository applicationSignedDocumentRepository; + + @Value("${aws.s3.url.folder.signed.document}") + private String signedDocumentS3Folder; public ApplicationResponseBean createApplication(ApplicationRequestBean applicationRequestBean, UserEntity userEntity, Long formId, Long applicationId) { @@ -663,4 +678,66 @@ public class ApplicationDao { protocolRepository.save(protocolEntity); return protocolEntity; } + + public ApplicationSignedDocumentResponse uploadSignedDocument(HttpServletRequest request, Long applicationId, + MultipartFile file) { + ApplicationEntity applicationEntity = validateApplication(applicationId); + validator.validateUserWithCompany(request, applicationEntity.getCompany().getId()); + validateFileType(file); + ApplicationSignedDocumentEntity applicationSignedDocument = applicationSignedDocumentRepository + .findByApplicationIdAndStatus(applicationId, ApplicationSignedDocumentStatusEnum.ACTIVE.getValue()); + if (applicationSignedDocument != null) { + applicationSignedDocument.setStatus(ApplicationSignedDocumentStatusEnum.INACTIVE.getValue()); + applicationSignedDocumentRepository.save(applicationSignedDocument); + } + UploadFileOnAmazonS3Response uploadFileOnAmazonS3 = amazonS3Service.uploadFileOnAmazonS3(signedDocumentS3Folder, + file); + applicationSignedDocument = new ApplicationSignedDocumentEntity(); + applicationSignedDocument.setApplication(applicationEntity); + applicationSignedDocument.setFileName(uploadFileOnAmazonS3.getFileName()); + applicationSignedDocument.setFilePath(uploadFileOnAmazonS3.getFilePath()); + applicationSignedDocument.setStatus(ApplicationSignedDocumentStatusEnum.ACTIVE.getValue()); + applicationSignedDocumentRepository.save(applicationSignedDocument); + return convertApplicationSignedDocumentToApplicationSignedDocumentResponse(applicationSignedDocument); + } + + private ApplicationSignedDocumentResponse convertApplicationSignedDocumentToApplicationSignedDocumentResponse( + ApplicationSignedDocumentEntity applicationSignedDocument) { + ApplicationSignedDocumentResponse applicationSignedDocumentResponse = new ApplicationSignedDocumentResponse(); + applicationSignedDocumentResponse.setId(applicationSignedDocument.getId()); + applicationSignedDocumentResponse.setApplicationId(applicationSignedDocument.getApplication().getId()); + applicationSignedDocumentResponse.setFileName(applicationSignedDocument.getFileName()); + applicationSignedDocumentResponse.setFilePath(applicationSignedDocument.getFilePath()); + applicationSignedDocumentResponse + .setStatus(ApplicationSignedDocumentStatusEnum.valueOf(applicationSignedDocument.getStatus())); + applicationSignedDocumentResponse.setCreatedDate(applicationSignedDocument.getCreatedDate()); + applicationSignedDocumentResponse.setUpdatedDate(applicationSignedDocument.getUpdatedDate()); + return applicationSignedDocumentResponse; + } + + private void validateFileType(MultipartFile file) { + if (file.isEmpty()) { + throw new CustomValidationException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.VALIDATION_ERROR_FILE_EMPTY)); + } + String filename = file.getOriginalFilename(); + if (filename == null || !filename.endsWith(".p7m")) { + throw new CustomValidationException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.VALIDATION_ERROR_FILE_INVALIDTYPE)); + } + } + + public ApplicationSignedDocumentResponse getSignedDocument(HttpServletRequest request, Long applicationId) { + + ApplicationEntity applicationEntity = validateApplication(applicationId); + validator.validateUserWithCompany(request, applicationEntity.getCompany().getId()); + + ApplicationSignedDocumentEntity applicationSignedDocument = applicationSignedDocumentRepository + .findByApplicationIdAndStatus(applicationId, ApplicationSignedDocumentStatusEnum.ACTIVE.getValue()); + if(applicationSignedDocument == null) { + throw new ResourceNotFoundException(Status.NOT_FOUND, + Translator.toLocale(GepafinConstant.APPLICATION_SIGNED_DOCUMENT_NOT_FOUND)); + } + return convertApplicationSignedDocumentToApplicationSignedDocumentResponse(applicationSignedDocument); + } } diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationSignedDocumentEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationSignedDocumentEntity.java new file mode 100644 index 00000000..58975cca --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationSignedDocumentEntity.java @@ -0,0 +1,28 @@ +package net.gepafin.tendermanagement.entities; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.Data; + +@Data +@Entity +@Table(name = "application_signed_document") +public class ApplicationSignedDocumentEntity extends BaseEntity { + + @ManyToOne + @JoinColumn(name = "APPLICATION_ID") + private ApplicationEntity application; + + @Column(name = "FILE_NAME") + private String fileName; + + @Column(name = "FILE_PATH") + private String filePath; + + @Column(name="STATUS") + private String status; + +} diff --git a/src/main/java/net/gepafin/tendermanagement/enums/ApplicationSignedDocumentStatusEnum.java b/src/main/java/net/gepafin/tendermanagement/enums/ApplicationSignedDocumentStatusEnum.java new file mode 100644 index 00000000..c0064d87 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/enums/ApplicationSignedDocumentStatusEnum.java @@ -0,0 +1,18 @@ +package net.gepafin.tendermanagement.enums; + +import com.fasterxml.jackson.annotation.JsonValue; + +public enum ApplicationSignedDocumentStatusEnum { + ACTIVE("ACTIVE"), INACTIVE("INACTIVE"); + + private String value; + + ApplicationSignedDocumentStatusEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationSignedDocumentResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationSignedDocumentResponse.java new file mode 100644 index 00000000..64b380f5 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationSignedDocumentResponse.java @@ -0,0 +1,14 @@ +package net.gepafin.tendermanagement.model.response; + +import lombok.Data; +import net.gepafin.tendermanagement.enums.ApplicationSignedDocumentStatusEnum; +import net.gepafin.tendermanagement.model.BaseBean; + +@Data +public class ApplicationSignedDocumentResponse extends BaseBean{ + + private Long applicationId; + private String fileName; + private String filePath; + private ApplicationSignedDocumentStatusEnum status; +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/CompanyDelegationResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/CompanyDelegationResponse.java index 7c23b3b8..f1b69b33 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/CompanyDelegationResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/CompanyDelegationResponse.java @@ -3,9 +3,10 @@ package net.gepafin.tendermanagement.model.response; import lombok.Data; import net.gepafin.tendermanagement.entities.BaseEntity; import net.gepafin.tendermanagement.enums.UserCompanyDelegationStatusEnum; +import net.gepafin.tendermanagement.model.BaseBean; @Data -public class CompanyDelegationResponse extends BaseEntity{ +public class CompanyDelegationResponse extends BaseBean{ private Long userId; private Long companyId; private Long beneficiaryId; diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/UploadFileOnAmazonS3Response.java b/src/main/java/net/gepafin/tendermanagement/model/response/UploadFileOnAmazonS3Response.java new file mode 100644 index 00000000..d0d78428 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/response/UploadFileOnAmazonS3Response.java @@ -0,0 +1,14 @@ +package net.gepafin.tendermanagement.model.response; + +import lombok.Builder; +import lombok.Data; + +@Data +@Builder +public class UploadFileOnAmazonS3Response { + + private String fileName; + + private String filePath; + +} diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationSignedDocumentRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationSignedDocumentRepository.java new file mode 100644 index 00000000..35322a6a --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationSignedDocumentRepository.java @@ -0,0 +1,13 @@ +package net.gepafin.tendermanagement.repositories; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import net.gepafin.tendermanagement.entities.ApplicationSignedDocumentEntity; + +@Repository +public interface ApplicationSignedDocumentRepository extends JpaRepository { + + ApplicationSignedDocumentEntity findByApplicationIdAndStatus(Long applicationId, String status); + +} diff --git a/src/main/java/net/gepafin/tendermanagement/service/AmazonS3Service.java b/src/main/java/net/gepafin/tendermanagement/service/AmazonS3Service.java index ce34cd7d..ea3937a3 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/AmazonS3Service.java +++ b/src/main/java/net/gepafin/tendermanagement/service/AmazonS3Service.java @@ -3,6 +3,8 @@ package net.gepafin.tendermanagement.service; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; +import net.gepafin.tendermanagement.model.response.UploadFileOnAmazonS3Response; + import java.io.IOException; import java.io.InputStream; @@ -14,4 +16,6 @@ public interface AmazonS3Service { public Boolean delete(String s3Folder, String fileName); InputStream getFile(String s3Folder, String filePath) throws IOException; + + public UploadFileOnAmazonS3Response uploadFileOnAmazonS3(String s3Folder, MultipartFile file); } \ No newline at end of file diff --git a/src/main/java/net/gepafin/tendermanagement/service/ApplicationService.java b/src/main/java/net/gepafin/tendermanagement/service/ApplicationService.java index edb62c93..d05ee2eb 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/ApplicationService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/ApplicationService.java @@ -9,10 +9,13 @@ import net.gepafin.tendermanagement.model.request.ApplicationRequestBean; import net.gepafin.tendermanagement.model.response.ApplicationGetResponseBean; import net.gepafin.tendermanagement.model.response.ApplicationResponse; import net.gepafin.tendermanagement.model.response.ApplicationResponseBean; +import net.gepafin.tendermanagement.model.response.ApplicationSignedDocumentResponse; import net.gepafin.tendermanagement.model.response.NextOrPreviousFormResponse; import java.util.List; +import org.springframework.web.multipart.MultipartFile; + public interface ApplicationService { public ApplicationResponseBean createApplication(HttpServletRequest request, ApplicationRequestBean applicationRequestBean,Long applicationId, Long formId); @@ -31,4 +34,8 @@ public interface ApplicationService { public ApplicationResponse updateApplicationStatus(HttpServletRequest request, Long applicationId, ApplicationStatusTypeEnum status); + public ApplicationSignedDocumentResponse uploadSignedDocument(HttpServletRequest request, Long applicationId, MultipartFile file); + + public ApplicationSignedDocumentResponse getSignedDocument(HttpServletRequest request, Long applicationId); + } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java index 756e4360..a0470c15 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java @@ -2,7 +2,16 @@ package net.gepafin.tendermanagement.service.impl; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.model.*; + +import net.gepafin.tendermanagement.config.Translator; +import net.gepafin.tendermanagement.constants.GepafinConstant; +import net.gepafin.tendermanagement.model.response.UploadFileOnAmazonS3Response; import net.gepafin.tendermanagement.service.AmazonS3Service; +import net.gepafin.tendermanagement.util.Utils; +import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException; +import net.gepafin.tendermanagement.web.rest.api.errors.Status; + +import org.apache.commons.io.FilenameUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.env.Environment; @@ -86,4 +95,20 @@ public class AmazonS3ServiceImpl implements AmazonS3Service { throw new IOException("Error getting file from Amazon S3", e); } } + + @Override + public UploadFileOnAmazonS3Response uploadFileOnAmazonS3(String s3Folder, MultipartFile file) { + String extension = FilenameUtils.getExtension(file.getOriginalFilename()); + String fileName = org.springframework.util.StringUtils.cleanPath(file.getOriginalFilename()); + String firstNameContain = fileName.substring(0, fileName.lastIndexOf('.')); + firstNameContain+=Utils.randomKey(5); + fileName = (firstNameContain + "." + extension); + try { + String filepath = upload(fileName, s3Folder, file); + return UploadFileOnAmazonS3Response.builder().fileName(fileName).filePath(filepath).build(); + } catch (Exception e) { + throw new CustomValidationException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.UPLOAD_ERROR_S3)); + } + } } \ No newline at end of file diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java index a082a092..56658ee3 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java @@ -13,12 +13,14 @@ import net.gepafin.tendermanagement.model.request.ApplicationRequestBean; import net.gepafin.tendermanagement.model.response.ApplicationGetResponseBean; import net.gepafin.tendermanagement.model.response.ApplicationResponse; import net.gepafin.tendermanagement.model.response.ApplicationResponseBean; +import net.gepafin.tendermanagement.model.response.ApplicationSignedDocumentResponse; import net.gepafin.tendermanagement.model.response.NextOrPreviousFormResponse; import net.gepafin.tendermanagement.service.ApplicationService; import net.gepafin.tendermanagement.util.Validator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -64,7 +66,7 @@ public class ApplicationServiceImpl implements ApplicationService { @Transactional(rollbackFor = Exception.class) public ApplicationResponse createApplication(HttpServletRequest request, Long companyId, ApplicationRequest applicationRequest, Long callId) { UserEntity userEntity = validator.validateUser(request); - CompanyEntity companyEntity = validator.validateUSerWithCompany(request, companyId); + CompanyEntity companyEntity = validator.validateUserWithCompany(request, companyId); return applicationDao.createApplicationByCallId(companyEntity, applicationRequest, callId, userEntity); } @@ -87,8 +89,18 @@ public class ApplicationServiceImpl implements ApplicationService { public List getAllApplications(HttpServletRequest request, Long callId, Long companyId) { UserEntity userEntity = validator.validateUser(request); if (companyId != null) { - validator.validateUSerWithCompany(request, companyId); + validator.validateUserWithCompany(request, companyId); } return applicationDao.getAllApplications(userEntity, callId, companyId); } + @Override + @Transactional(rollbackFor = Exception.class) + public ApplicationSignedDocumentResponse uploadSignedDocument(HttpServletRequest request, Long applicationId, MultipartFile file) { + return applicationDao.uploadSignedDocument(request, applicationId, file); + } + + @Override + public ApplicationSignedDocumentResponse getSignedDocument(HttpServletRequest request, Long applicationId) { + return applicationDao.getSignedDocument(request, applicationId); + } } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/CompanyServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/CompanyServiceImpl.java index 1f80b223..033ddba3 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/CompanyServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/CompanyServiceImpl.java @@ -98,7 +98,8 @@ public class CompanyServiceImpl implements CompanyService { @Override @Transactional(rollbackFor = Exception.class) public CompanyDelegationResponse uploadCompanyDelegation(HttpServletRequest request, Long companyId, MultipartFile file) { - UserEntity userEntity =validator.validateUser(request); + UserEntity userEntity = validator.validateUser(request); + validator.validateUserWithCompany(request, companyId); return delegationDao.uploadCompanyDelegation(userEntity, companyId, file); } diff --git a/src/main/java/net/gepafin/tendermanagement/util/Validator.java b/src/main/java/net/gepafin/tendermanagement/util/Validator.java index e123988a..bb7d4053 100644 --- a/src/main/java/net/gepafin/tendermanagement/util/Validator.java +++ b/src/main/java/net/gepafin/tendermanagement/util/Validator.java @@ -9,6 +9,7 @@ import net.gepafin.tendermanagement.entities.UserEntity; import net.gepafin.tendermanagement.enums.RoleStatusEnum; import net.gepafin.tendermanagement.service.CompanyService; import net.gepafin.tendermanagement.service.UserService; +import net.gepafin.tendermanagement.web.rest.api.errors.ForbiddenAccessException; import net.gepafin.tendermanagement.web.rest.api.errors.Status; import net.gepafin.tendermanagement.web.rest.api.errors.UnauthorizedAccessException; @@ -60,7 +61,7 @@ public class Validator { } } - public CompanyEntity validateUSerWithCompany(HttpServletRequest request, Long companyId) { + public CompanyEntity validateUserWithCompany(HttpServletRequest request, Long companyId) { if (checkIsSuperAdmin()) { return companyService.validateCompany(companyId); } @@ -89,7 +90,7 @@ public class Validator { public UserEntity validateUserId(HttpServletRequest request, Long userId) { UserEntity user = validateUser(request); if(user.getRoleEntity().getRoleType().equals(RoleStatusEnum.ROLE_BENEFICIARY.getValue()) && Boolean.FALSE.equals(user.getId().equals(userId))) { - throw new UnauthorizedAccessException(Status.UNAUTHORIZED, Translator.toLocale(GepafinConstant.INVALID_REQUEST)); + throw new ForbiddenAccessException(Status.FORBIDDEN, Translator.toLocale(GepafinConstant.PERMISSION_DENIED)); } return userService.validateUser(userId); } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java index 1869655c..eee93d90 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java @@ -6,6 +6,7 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -21,6 +22,8 @@ import net.gepafin.tendermanagement.model.request.ApplicationRequestBean; import net.gepafin.tendermanagement.model.response.ApplicationGetResponseBean; import net.gepafin.tendermanagement.model.response.ApplicationResponse; import net.gepafin.tendermanagement.model.response.ApplicationResponseBean; +import net.gepafin.tendermanagement.model.response.ApplicationSignedDocumentResponse; +import net.gepafin.tendermanagement.model.response.CompanyDelegationResponse; import net.gepafin.tendermanagement.model.response.NextOrPreviousFormResponse; import net.gepafin.tendermanagement.model.util.Response; import net.gepafin.tendermanagement.web.rest.api.errors.ErrorConstants; @@ -131,6 +134,30 @@ public interface ApplicationApi { @Parameter(description = "The application id", required = true) @PathVariable("applicationId") Long applicationId, @Parameter(description = "status", required = true)@RequestParam(value = "status", required = true) ApplicationStatusTypeEnum status); + @Operation(summary = "Api to upload signed document (only p7m file format is supported)", responses = { @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) + @PostMapping(value = "{applicationId}/signedDocument/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + ResponseEntity> uploadSignedDocument(HttpServletRequest request, + @Parameter(description = "The applicationId id", required = true) @PathVariable("applicationId") Long applicationId, + @Parameter(description = "The signed document", required = true) @RequestParam("file") MultipartFile file); + + + @Operation(summary = "Api to get signed document", responses = { @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) + @GetMapping(value = "{applicationId}/signedDocument", produces = "application/json") + ResponseEntity> getSignedDocument(HttpServletRequest request, + @Parameter(description = "The applicationId id", required = true) @PathVariable("applicationId") Long applicationId); + } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java index bcbf8e80..b79196c3 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java @@ -10,6 +10,8 @@ import net.gepafin.tendermanagement.model.request.ApplicationRequestBean; import net.gepafin.tendermanagement.model.response.ApplicationGetResponseBean; import net.gepafin.tendermanagement.model.response.ApplicationResponse; import net.gepafin.tendermanagement.model.response.ApplicationResponseBean; +import net.gepafin.tendermanagement.model.response.ApplicationSignedDocumentResponse; +import net.gepafin.tendermanagement.model.response.CompanyDelegationResponse; import net.gepafin.tendermanagement.model.response.NextOrPreviousFormResponse; import net.gepafin.tendermanagement.model.util.Response; import net.gepafin.tendermanagement.service.ApplicationService; @@ -21,6 +23,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; import org.slf4j.Logger; import java.util.List; @@ -89,4 +92,23 @@ public class ApplicationApiController implements ApplicationApi { return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(applicationResponse, Status.SUCCESS, Translator.toLocale(GepafinConstant.APPLICATION_STATUS_UPDATED_SUCCESSFULLY))); } + + @Override + public ResponseEntity> uploadSignedDocument(HttpServletRequest request, + Long applicationId, MultipartFile file) { + log.info("upload signed document applicationId: {}", applicationId); + ApplicationSignedDocumentResponse response = applicationService.uploadSignedDocument(request, applicationId, file); + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(response, Status.SUCCESS, Translator.toLocale(GepafinConstant.SIGNED_DOCUMENT_FILE_UPLOAD_SUCCESS))); + } + + @Override + public ResponseEntity> getSignedDocument(HttpServletRequest request, + Long applicationId) { + ApplicationSignedDocumentResponse response = applicationService.getSignedDocument(request, applicationId); + log.info("get signed document applicationId: {}", applicationId); + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(response, Status.SUCCESS, Translator.toLocale(GepafinConstant.GET_SIGNED_DOCUMENT_FILE_SUCCESS))); + } + } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 27151cbc..175c7e6c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -32,6 +32,7 @@ aws.s3.bucket.name=mementoresources aws.s3.url = https://mementoresources.s3.eu-west-1.amazonaws.com/ aws.s3.url.folder=gepafin aws.s3.url.folder.delegation=gepafin/delegation +aws.s3.url.folder.signed.document=gepafin/signed-document # JWT configuration # Ensure these values match your expectations security.authentication.jwt.secret=my-secret-token-to-change-in-prod-environment-your-super-secure-randomly-generated-key diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml index 98016d3c..a1369e93 100644 --- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml +++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml @@ -973,4 +973,29 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties index bbf010f5..49208615 100644 --- a/src/main/resources/message_en.properties +++ b/src/main/resources/message_en.properties @@ -230,5 +230,8 @@ application.submitted.cannot.change=The submitted application cannot be changed. call.documents.fetch.success=Documents fetched successfully. call.documents.not.found=No documents found for the specified call. permission.denied=You are not authorized to access this data. +signed.document.file.upload.success=Signed document file uploaded successfully. +get.signed.document.file.success=Signed document file retrieved successfully. +application.signed.document.not.found=Signed document for the application not found. diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties index 2235bb51..7fe8f0ff 100644 --- a/src/main/resources/message_it.properties +++ b/src/main/resources/message_it.properties @@ -226,5 +226,8 @@ application.submitted.cannot.change=La domanda inviata non pu call.documents.fetch.success=Documenti recuperati con successo. call.documents.not.found=Nessun documento trovato per la chiamata specificata. permission.denied=Non sei autorizzato ad accedere a questi dati. +signed.document.file.upload.success=File del documento firmato caricato con successo. +get.signed.document.file.success=File del documento firmato recuperato con successo. +application.signed.document.not.found=Documento firmato per l'applicazione non trovato. From 628a350959bd4b4bcf5efeb1f553cd29d5685f56 Mon Sep 17 00:00:00 2001 From: rajesh Date: Sat, 12 Oct 2024 15:19:35 +0530 Subject: [PATCH 20/31] updated code --- .../constants/GepafinConstant.java | 1 + .../tendermanagement/dao/ApplicationDao.java | 14 ++++++++++++++ .../service/ApplicationService.java | 2 ++ .../service/impl/ApplicationServiceImpl.java | 8 ++++++++ .../web/rest/api/ApplicationApi.java | 11 +++++++++++ .../rest/api/impl/ApplicationApiController.java | 9 +++++++++ src/main/resources/message_en.properties | 1 + src/main/resources/message_it.properties | 1 + 8 files changed, 47 insertions(+) diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java index 4580af18..13ca091b 100644 --- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java +++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java @@ -207,5 +207,6 @@ public class GepafinConstant { public static final String SIGNED_DOCUMENT_FILE_UPLOAD_SUCCESS = "signed.document.file.upload.success"; public static final String GET_SIGNED_DOCUMENT_FILE_SUCCESS = "get.signed.document.file.success"; public static final String APPLICATION_SIGNED_DOCUMENT_NOT_FOUND = "application.signed.document.not.found"; + public static final String DELETE_SIGNED_DOCUMENT_FILE_SUCCESS = "delete.signed.document.file.success"; } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index c12f6d4e..c79f7f99 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -740,4 +740,18 @@ public class ApplicationDao { } return convertApplicationSignedDocumentToApplicationSignedDocumentResponse(applicationSignedDocument); } + + public void deleteSignedDocument(HttpServletRequest request, Long applicationId) { + ApplicationEntity applicationEntity = validateApplication(applicationId); + validator.validateUserWithCompany(request, applicationEntity.getCompany().getId()); + + ApplicationSignedDocumentEntity applicationSignedDocument = applicationSignedDocumentRepository + .findByApplicationIdAndStatus(applicationId, ApplicationSignedDocumentStatusEnum.ACTIVE.getValue()); + if(applicationSignedDocument == null) { + throw new ResourceNotFoundException(Status.NOT_FOUND, + Translator.toLocale(GepafinConstant.APPLICATION_SIGNED_DOCUMENT_NOT_FOUND)); + } + applicationSignedDocument.setStatus(ApplicationSignedDocumentStatusEnum.INACTIVE.getValue()); + applicationSignedDocumentRepository.save(applicationSignedDocument); + } } diff --git a/src/main/java/net/gepafin/tendermanagement/service/ApplicationService.java b/src/main/java/net/gepafin/tendermanagement/service/ApplicationService.java index d05ee2eb..2d914b64 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/ApplicationService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/ApplicationService.java @@ -38,4 +38,6 @@ public interface ApplicationService { public ApplicationSignedDocumentResponse getSignedDocument(HttpServletRequest request, Long applicationId); + public void deleteSignedDocument(HttpServletRequest request, Long applicationId); + } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java index 56658ee3..faa890d3 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java @@ -100,7 +100,15 @@ public class ApplicationServiceImpl implements ApplicationService { } @Override + @Transactional(readOnly = true) public ApplicationSignedDocumentResponse getSignedDocument(HttpServletRequest request, Long applicationId) { return applicationDao.getSignedDocument(request, applicationId); } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteSignedDocument(HttpServletRequest request, Long applicationId) { + applicationDao.deleteSignedDocument(request, applicationId); + } + } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java index eee93d90..e19484b1 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java @@ -157,6 +157,17 @@ public interface ApplicationApi { @GetMapping(value = "{applicationId}/signedDocument", produces = "application/json") ResponseEntity> getSignedDocument(HttpServletRequest request, @Parameter(description = "The applicationId id", required = true) @PathVariable("applicationId") Long applicationId); + + @Operation(summary = "Api to delete signed document", responses = { @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) + @DeleteMapping(value = "{applicationId}/signedDocument", produces = "application/json") + ResponseEntity> deleteSignedDocument(HttpServletRequest request, + @Parameter(description = "The applicationId id", required = true) @PathVariable("applicationId") Long applicationId); } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java index b79196c3..85c1efbb 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java @@ -110,5 +110,14 @@ public class ApplicationApiController implements ApplicationApi { return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(response, Status.SUCCESS, Translator.toLocale(GepafinConstant.GET_SIGNED_DOCUMENT_FILE_SUCCESS))); } + + @Override + public ResponseEntity> deleteSignedDocument(HttpServletRequest request, + Long applicationId) { + applicationService.deleteSignedDocument(request, applicationId); + log.info("delete signed document applicationId: {}", applicationId); + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(null, Status.SUCCESS, Translator.toLocale(GepafinConstant.DELETE_SIGNED_DOCUMENT_FILE_SUCCESS))); + } } diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties index 49208615..d09b9d29 100644 --- a/src/main/resources/message_en.properties +++ b/src/main/resources/message_en.properties @@ -233,5 +233,6 @@ permission.denied=You are not authorized to access this data. signed.document.file.upload.success=Signed document file uploaded successfully. get.signed.document.file.success=Signed document file retrieved successfully. application.signed.document.not.found=Signed document for the application not found. +delete.signed.document.file.success=Signed document deleted successfully. diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties index 7fe8f0ff..1b9b3203 100644 --- a/src/main/resources/message_it.properties +++ b/src/main/resources/message_it.properties @@ -229,5 +229,6 @@ permission.denied=Non sei autorizzato ad accedere a questi dati. signed.document.file.upload.success=File del documento firmato caricato con successo. get.signed.document.file.success=File del documento firmato recuperato con successo. application.signed.document.not.found=Documento firmato per l'applicazione non trovato. +delete.signed.document.file.success=Documento firmato eliminato con successo. From b6f16d388e0a923172d9ab1dce6dcb004f7acaad Mon Sep 17 00:00:00 2001 From: nisha Date: Sat, 12 Oct 2024 15:43:38 +0530 Subject: [PATCH 21/31] Done ticket --- pom.xml | 20 + .../gepafin/tendermanagement/dao/PdfDao.java | 574 ++++++++++++++++++ .../tendermanagement/dao/RoundedCorners.java | 45 ++ .../model/request/CustomPageEvent.java | 71 +++ .../request/FieldLabelValuePairRequest.java | 14 + .../tendermanagement/service/PdfService.java | 9 + .../service/impl/PdfServiceImpl.java | 25 + .../tendermanagement/web/rest/api/PdfApi.java | 35 ++ .../web/rest/api/impl/PdfController.java | 40 ++ 9 files changed, 833 insertions(+) create mode 100644 src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java create mode 100644 src/main/java/net/gepafin/tendermanagement/dao/RoundedCorners.java create mode 100644 src/main/java/net/gepafin/tendermanagement/model/request/CustomPageEvent.java create mode 100644 src/main/java/net/gepafin/tendermanagement/model/request/FieldLabelValuePairRequest.java create mode 100644 src/main/java/net/gepafin/tendermanagement/service/PdfService.java create mode 100644 src/main/java/net/gepafin/tendermanagement/service/impl/PdfServiceImpl.java create mode 100644 src/main/java/net/gepafin/tendermanagement/web/rest/api/PdfApi.java create mode 100644 src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/PdfController.java diff --git a/pom.xml b/pom.xml index b0a632d8..9a6ef12d 100644 --- a/pom.xml +++ b/pom.xml @@ -185,6 +185,26 @@ 2.3.0 + + com.itextpdf + itextpdf + 5.5.13.3 + + + + + com.itextpdf + itext7-core + 8.0.5 + pom + + + + + com.itextpdf + layout + 8.0.5 + diff --git a/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java b/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java new file mode 100644 index 00000000..11e39dc4 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java @@ -0,0 +1,574 @@ +package net.gepafin.tendermanagement.dao; + +import com.itextpdf.kernel.colors.ColorConstants; +import com.itextpdf.kernel.colors.DeviceRgb; +import com.itextpdf.kernel.pdf.canvas.PdfCanvas; +import com.itextpdf.layout.properties.UnitValue; +import com.itextpdf.layout.renderer.CellRenderer; +import com.itextpdf.layout.renderer.DrawContext; +import com.itextpdf.text.*; +import com.itextpdf.text.Element; +import com.itextpdf.text.Font; +import com.itextpdf.text.Image; +import com.itextpdf.text.Rectangle; +import com.itextpdf.text.pdf.*; +import net.gepafin.tendermanagement.config.Translator; +import net.gepafin.tendermanagement.constants.GepafinConstant; +import net.gepafin.tendermanagement.entities.*; +import net.gepafin.tendermanagement.model.request.CustomPageEvent; +import net.gepafin.tendermanagement.model.request.FieldLabelValuePairRequest; +import net.gepafin.tendermanagement.model.response.*; +import net.gepafin.tendermanagement.repositories.ApplicationRepository; +import net.gepafin.tendermanagement.service.CallService; +import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; +import net.gepafin.tendermanagement.web.rest.api.errors.Status; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import com.itextpdf.layout.element.Table; +import com.itextpdf.layout.element.Cell; +//import com.itextpdf.layout.element. + + +import java.awt.*; +import java.io.ByteArrayOutputStream; +import java.util.*; +import java.util.List; +import java.util.stream.Collectors; + +@Component +public class PdfDao { + + @Autowired + private ApplicationRepository applicationRepository; + + @Autowired + private CallService callService; + + @Autowired + private ApplicationDao applicationDao; + + + public byte[] generatePdf(UserEntity userEntity,Long applicationId) { + try { + ApplicationEntity applicationEntity = applicationRepository + .findByIdAndUserIdAndIsDeletedFalse(applicationId, userEntity.getId()) + .orElseThrow(() -> new ResourceNotFoundException( + Status.NOT_FOUND, + Translator.toLocale(GepafinConstant.APPLICATION_NOT_FOUND_MSG) + )); + + CompanyEntity companyEntity=applicationEntity.getCompany(); + CallEntity call=callService.validateCall(applicationEntity.getCall().getId()); + + // Create a byte stream to hold the PDF + ByteArrayOutputStream out = new ByteArrayOutputStream(); + float leftMargin = 50f; // Adjust this for the left margin + + Document document = new Document(PageSize.A4, leftMargin, 36f, 50f, 35); + PdfWriter writer = PdfWriter.getInstance(document, out); + CustomPageEvent pageEvent = new CustomPageEvent(call.getName(), 0); + writer.setPageEvent(pageEvent); + document.open(); + pageEvent.setTotalPages(writer.getPageNumber()); + addLogo(document, "https://mementoresources.s3.eu-west-1.amazonaws.com/gepafin/logo.jpg"); // Add your image path here + + + BaseColor customColor = new BaseColor(0, 128, 0); // Adjust RGB values as needed + // Define fonts and styles + BaseColor greenColor = new BaseColor(0, 128, 0); // Adjust RGB values as needed + BaseColor darkGreenColor = new BaseColor(1, 50, 32); // Adjust RGB values as needed + Font titleFont = FontFactory.getFont(FontFactory.HELVETICA_BOLD, 16, customColor); + Font sectionFont = FontFactory.getFont(FontFactory.HELVETICA_BOLD, 12,darkGreenColor); + Font labelFont = FontFactory.getFont(FontFactory.HELVETICA_BOLD, 12,new BaseColor(113,121,126)); // Light grey); + Font smallFont = FontFactory.getFont(FontFactory.HELVETICA_BOLD, 8,new BaseColor(105, 105, 105)); + Font valueFont=FontFactory.getFont(FontFactory.HELVETICA_BOLD,10,new BaseColor(178, 190, 181)); + Paragraph title = new Paragraph(call.getName(), titleFont); + title.setAlignment(Element.ALIGN_LEFT); + document.add(title); + + BaseColor greyColor=new BaseColor(178, 190, 181); // Very light grey color + addColoredLines(writer,document,greyColor); + document.add(new Paragraph(" ")); + + // Application ID section (Centered) + pageEvent.setTotalPages(writer.getPageNumber()); + Paragraph appId = new Paragraph("ID domanda :" +"XX00"); + appId.setAlignment(Element.ALIGN_RIGHT); + document.add(appId); + + if(applicationEntity.getProtocol()!=null) { + appId = new Paragraph("ID domanda :"+String.valueOf(applicationEntity.getProtocol().getProtocolNumber()), valueFont); + appId.setAlignment(Element.ALIGN_RIGHT); + document.add(appId); + } + document.add(new Paragraph(" ")); + + addColoredLines(writer,document,greenColor); + document.add(new Paragraph(" ")); + document.add(new Paragraph("\n")); // Add line break +// String companyName= companyEntity.getCompanyName(); +// String vatNumber=companyEntity.getVatNumber(); +// String address=companyEntity.getAddress(); +// // Section: Dati Anagrafici Azienda +// document.add(new Paragraph("Dati Anagrafici Azienda", sectionFont)); +// addLabelValuePair(document, "Codice ATECO", "SEZIONE C “ATTIVITÀ MANUFATTURIERE”", regularFont); +// addLabelValuePair(document, "Ragione Sociale", companyName, regularFont); +// addLabelValuePair(document, "Partita IVA", vatNumber, regularFont); +// addLabelValuePair(document, "Indirizzo sede Legale", address, regularFont); +// +// document.add(new Paragraph("\n")); // Add line break +// +// // Section: Domanda presentata da +// document.add(new Paragraph("Domanda presentata da:", sectionFont)); +// addLabelValuePair(document, "Nome e cognome", userEntity.getBeneficiary().getFirstName()+" "+userEntity.getBeneficiary().getLastName(), regularFont); +// addLabelValuePair(document, "Codice fiscale", userEntity.getBeneficiary().getCodiceFiscale(), regularFont); +// addLabelValuePair(document, "Telefono", userEntity.getBeneficiary().getPhoneNumber(), regularFont); +// addLabelValuePair(document, "Email", userEntity.getBeneficiary().getEmail(), regularFont); +// addLabelValuePair(document, "Con il titolo di", "Rappresentante legale", regularFont); + document.add(new Paragraph(" ")); + + ApplicationGetResponseBean applicationGetResponseBean=applicationDao.getApplicationByFormId(applicationId,null,userEntity); + for(FormApplicationResponse formApplicationResponse: applicationGetResponseBean.getForm()) { + document.add(new Paragraph(formApplicationResponse.getLabel(),sectionFont)); + document.add(new Paragraph(" ")); // Add line break + List fieldLabelValuePairRequests = getFormFieldsToLabels(formApplicationResponse); + for (FieldLabelValuePairRequest pair : fieldLabelValuePairRequests) { + String label = pair.getLabel(); + Object value = pair.getValue(); + Integer pages=0; + pages=addLabelValuePair(writer,document, label, value, labelFont,valueFont,call.getName(),pages); + if(pages !=0 ){ + pageEvent.setTotalPages(writer.getPageNumber()); + } + } + addColoredLines(writer,document,greenColor); + document.add(new Paragraph(" ")); // Add line break + } + document.add(new Paragraph("\n")); // Add line break + Font boldSmallFont = new Font(Font.FontFamily.HELVETICA, 10, Font.BOLD,new BaseColor(105, 105, 105)); + + // Adding the "Documenti Allegati" section title + document.add(new Paragraph(" ")); + + pageEvent.setTotalPages(writer.getPageNumber()); + document.newPage(); + document.add(new Paragraph("Documenti Allegati", sectionFont)); + document.add(new Paragraph(" ")); + + +// 1. Autocertificazione possesso Requisiti + Paragraph p1 = new Paragraph(); + p1.add(new Chunk("1. ", boldSmallFont)); + p1.add(new Chunk("Autocertificazione possesso Requisiti ", boldSmallFont)); + p1.add(new Chunk("ai sensi degli artt. 46 e 47 del DPR 445/2000", smallFont)); + document.add(p1); + document.add(new Paragraph(" ")); + + + +// 2. Informativa Privacy relativa al trattamento dei dati personali + Paragraph p2 = new Paragraph(); + p2.add(new Chunk("2. ", boldSmallFont)); + p2.add(new Chunk("Informativa Privacy relativa al trattamento dei dati personali", boldSmallFont)); + document.add(p2); + document.add(new Paragraph(" ")); + + +// 3. Dati richiesti per la valutazione dell’adeguatezza dei flussi finanziari + Paragraph p3 = new Paragraph(); + p3.add(new Chunk("3. ", boldSmallFont)); + p3.add(new Chunk("Dati richiesti per la valutazione dell’adeguatezza dei flussi finanziari prospettici come da tabella di cui all’Appendice 9", boldSmallFont)); + document.add(p3); + document.add(new Paragraph(" ")); + + +// 4. Rilevazione Centrale dei Rischi + Paragraph p4 = new Paragraph(); + p4.add(new Chunk("4. ", boldSmallFont)); + p4.add(new Chunk("Rilevazione Centrale dei Rischi riferita agli ultimi 36 mesi disponibili alla data di presentazione della Domanda", boldSmallFont)); + document.add(p4); + document.add(new Paragraph(" ")); + + +// 5. Schema di presentazione dei dati di bilancio + Paragraph p5 = new Paragraph(); + p5.add(new Chunk("5. ", boldSmallFont)); + p5.add(new Chunk("Schema di presentazione dei dati di bilancio", boldSmallFont)); + document.add(p5); + document.add(new Paragraph(" ")); + + +// 6. Dettagli bilanci in forma abbreviata + Paragraph p6 = new Paragraph(); + p6.add(new Chunk("6. ", boldSmallFont)); + p6.add(new Chunk("Dettagli bilanci in forma abbreviata", boldSmallFont)); + document.add(p6); + document.add(new Paragraph(" ")); + + +// 7. Relazione aziendale illustrativa + Paragraph p7 = new Paragraph(); + p7.add(new Chunk("7. ", boldSmallFont)); + p7.add(new Chunk("Relazione aziendale illustrativa", boldSmallFont)); + document.add(p7); + document.add(new Paragraph(" ")); + + addColoredLines(writer,document,greenColor); + + // Close the document + document.close(); + + // Convert to byte array for response + byte[] pdfBytes = out.toByteArray(); + return pdfBytes; + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + private Integer addLabelValuePair(PdfWriter writer,Document document, String label, Object value, Font labelFont,Font valueFont,String title,Integer totalPages) throws DocumentException { + // Add label + Paragraph labelParagraph = new Paragraph(label, labelFont); + document.add(labelParagraph); + float leftMargin = 20f; + + PdfContentByte canvas = writer.getDirectContent(); + + // Setting the color and width of the line + float lineWidth = 1.0f; // Thickness of the line + canvas.setLineWidth(lineWidth); + + // Get the current vertical position in the document + float yPos = writer.getVerticalPosition(true) - 10f; // Adjust this to move line slightly below current content + + // Define start and end points for the line (relative to the page size and margins) + + if (yPos <= 140) { + // If xEnd is less than or equal to 200, generate a new page + + totalPages++; + document.newPage(); + } // Add a gap between the label and value + document.add(new Paragraph(" ")); // Adding an empty paragraph for spacing + // Create value cell with rounded corners + PdfPTable valueTable = new PdfPTable(1); + valueTable.setWidthPercentage(100); + if (value instanceof List) { + // Further check if the list contains Strings + List list = (List) value; + if (!list.isEmpty() && list.get(0) instanceof String) { + // Cast to List + List values = (List) value; + + // Loop through the list of strings and create a cell for each string + for (String item : values) { + PdfPCell valueCell = new PdfPCell(new Phrase(item, valueFont)); + valueCell.setPadding(5f); // Increase padding for better spacing + valueCell.setPaddingLeft(leftMargin); // Increase left margin for value + valueCell.setBorder(Rectangle.NO_BORDER); // Remove border for value cell + valueCell.setMinimumHeight(30f); + valueCell.setVerticalAlignment(Element.ALIGN_MIDDLE); + valueCell.setCellEvent(new RoundedCorners()); // Apply rounded corners + + // Add the cell to the table + valueTable.addCell(valueCell); + } + + // Finally, add the table to the document + document.add(valueTable); + } else { + boolean containsThreeValues = false; // Variable to track if any map contains three keys + List> dataList = (List>) value; // Cast Object to List of Maps + for (Map entry : dataList) { + if (entry.size() == 3) { // Check if the current map has three keys + containsThreeValues = true; // If found, set the variable to true + break; // No need to check further, exit loop + } + } + List> extractedData = new ArrayList<>(); // To hold extracted data + for (Map entry : dataList) { + Map extractedMap = new HashMap<>(); // To hold the current extracted row of data + + List keys = new ArrayList<>(entry.keySet()); // Get all keys in the current map + + // Handle based on the number of keys in the map + if (Boolean.FALSE.equals(containsThreeValues) && keys.size() == 2) { + // Treat the first key as the "key" and second key as the "value" + String heading = (String) entry.get(keys.get(0)); // Get value of first key + String value1 = (String) entry.get(keys.get(1)); // Get value of second key + extractedMap.put(heading,value1); // Store the first key's value as "heading" + } if (Boolean.TRUE.equals(containsThreeValues) ) { + String amount=""; + // Treat the first as number, second as description, third as amount + if(keys.size()==3){ + amount = (String) entry.get(keys.get(2)); // Third key's value + } + String number = (String) entry.get(keys.get(0)); // First key's value + String description = (String) entry.get(keys.get(1)); // Second key's value + + // Store the combined result as a value in the map, with a suitable key + String combinedValue = number + ", " + description + ", " + amount; // Concatenate them as a single value + extractedMap.put("combined", combinedValue); // Store as a single entry, key as "combined" + } + + extractedData.add(extractedMap); // Add each extracted map to the list + } + document=createPdfTable(extractedData,document); + } + } + else { + PdfPCell valueCell = new PdfPCell(new Phrase(String.valueOf(value), valueFont)); + valueCell.setPadding(5f); // Increase padding for better spacing + valueCell.setPaddingLeft(leftMargin); // Increase left margin for value + valueCell.setBorder(Rectangle.NO_BORDER); // Remove border for value cell + valueCell.setMinimumHeight(30f); + valueCell.setVerticalAlignment(Element.ALIGN_MIDDLE); + valueCell.setCellEvent(new RoundedCorners()); // Apply rounded corners + + valueTable.addCell(valueCell); + document.add(valueTable); + } + + document.add(new Paragraph("\n")); // Add line break after each value + return totalPages; + } + + private Document createPdfTable(List> extractedData,Document document) throws DocumentException { // Create a PdfPTable with 2 columns + PdfPTable table = new PdfPTable(2); // Initial assumption for 2 columns + table.setWidthPercentage(100); // Set table width to 100% + Font textFont = FontFactory.getFont(FontFactory.HELVETICA, 12, Font.NORMAL, new BaseColor(105, 105, 105)); // Gray text + boolean combinedHeaderAdded = false; // Flag to track if headers for combined have been added + float rowHeight = 50f; // Example row height, adjust as necessary + float maxTableHeight = 700f; // Maximum height of the table before a page break + int rowCount = 0; // Counter for rows + + +// Add table header +// Populate the table with extracted data and style rows + for (Map row : extractedData) { + for (Map.Entry entry : row.entrySet()) { + String key = entry.getKey(); // This will give you the key + String value = entry.getValue(); // This will give you the value + + // Check if the current entry is for the combined section + if ("combined".equals(key)) { + // Ensure the combined header is added only once + if (!combinedHeaderAdded) { + // Create a new table for combined entries + table = new PdfPTable(3); // 3 columns for combined entries + + PdfPCell headerCell1 = new PdfPCell(new Phrase("Number")); + headerCell1.setHorizontalAlignment(Element.ALIGN_CENTER); // Center align + headerCell1.setVerticalAlignment(Element.ALIGN_MIDDLE); + headerCell1.setBackgroundColor(new BaseColor(178, 190, 181)); // Light gray background for header + table.addCell(headerCell1); + + PdfPCell headerCell2 = new PdfPCell(new Phrase("Details")); + headerCell2.setHorizontalAlignment(Element.ALIGN_CENTER); // Center align + headerCell2.setVerticalAlignment(Element.ALIGN_MIDDLE); + headerCell2.setBackgroundColor(new BaseColor(178, 190, 181)); // Light gray background for header + table.addCell(headerCell2); + + PdfPCell headerCell3 = new PdfPCell(new Phrase("Amount")); + headerCell3.setHorizontalAlignment(Element.ALIGN_CENTER); // Center align + headerCell3.setVerticalAlignment(Element.ALIGN_MIDDLE); + headerCell3.setBackgroundColor(new BaseColor(178, 190, 181)); // Light gray background for header + table.addCell(headerCell3); + + combinedHeaderAdded = true; // Mark header as added + } + + // Split the value for "combined" into separate parts + String[] combinedValues = value.split(", "); + + // Check if we have 3 parts (number, description, amount) + String number = combinedValues[0].trim(); // 1st part (number) + String description = combinedValues[1].trim(); // 2nd part (description) + String amount = ""; + if (combinedValues.length == 3) { + amount = combinedValues[2].trim(); // 3rd part (amount) + } + + // Create PDF cells using the split values + PdfPCell cellNumber = new PdfPCell(new Phrase(number, textFont)); // Cell for number + PdfPCell cellDescription = new PdfPCell(new Phrase(description, textFont)); // Cell for description + PdfPCell cellAmount = new PdfPCell(new Phrase(amount, textFont)); // Cell for amount + + // Set row background color for combined values + cellNumber.setBackgroundColor(new BaseColor(239, 243, 248)); // Light blue for combined rows + cellDescription.setBackgroundColor(new BaseColor(239, 243, 248)); + cellAmount.setBackgroundColor(new BaseColor(239, 243, 248)); + + // Set cell height and add rounded borders + cellNumber.setFixedHeight(rowHeight); + cellDescription.setFixedHeight(rowHeight); + cellAmount.setFixedHeight(rowHeight); + cellNumber.setPadding(7f); + cellDescription.setPadding(7f); + cellAmount.setPadding(7f); + + // Add the cells to the table only once + table.addCell(cellNumber); + table.addCell(cellDescription); + table.addCell(cellAmount); + + + } else { + if (!combinedHeaderAdded) { + // Create a new table for combined entries + table= new PdfPTable(2); // 3 columns for combined entries + table.setWidthPercentage(100); + + PdfPCell headerCell1 = new PdfPCell(new Phrase("Details")); + headerCell1.setHorizontalAlignment(Element.ALIGN_CENTER); // Center align + headerCell1.setVerticalAlignment(Element.ALIGN_MIDDLE); + headerCell1.setBackgroundColor(new BaseColor(178, 190, 181)); // Light gray background for header + table.addCell(headerCell1); + + PdfPCell headerCell2 = new PdfPCell(new Phrase("Amount")); + headerCell2.setHorizontalAlignment(Element.ALIGN_CENTER); // Center align + headerCell2.setVerticalAlignment(Element.ALIGN_MIDDLE); + headerCell2.setBackgroundColor(new BaseColor(178, 190, 181)); // Light gray background for header + table.addCell(headerCell2); + combinedHeaderAdded=true; +} + // Add cells for regular key-value pairs without headers + PdfPCell cellKey = new PdfPCell(new Phrase(key, textFont)); + PdfPCell cellValue = new PdfPCell(new Phrase(value, textFont)); + + // Set background color for both cells + cellKey.setBackgroundColor(new BaseColor(239, 243, 248)); // Light blue for other rows + cellValue.setBackgroundColor(new BaseColor(239, 243, 248)); + + // Set cell height and add rounded borders + cellKey.setFixedHeight(rowHeight); + cellValue.setFixedHeight(rowHeight); + + // Add the cells to the table + table.addCell(cellKey); + table.addCell(cellValue); + } + if (table.getTotalHeight() + rowHeight > maxTableHeight) { + // Start a new page if needed + document.add(table); + table = new PdfPTable(2); // Reset table for new page + table.setWidthPercentage(100); // Reset width percentage + combinedHeaderAdded = false; // Reset header flag + } + } + } + document.add(table); // Add the last table before returning + + + // Check if adding a new row would exceed the maximum height +// Return the populated table + return document; + } + + public List getFormFieldsToLabels(FormApplicationResponse responseBean) { + List labelValuePairs = new ArrayList<>(); + + // Iterate through each form in the application response + + List formFields = responseBean.getFormFields(); + List contents = responseBean.getContent(); + + // Iterate through each formField in the current form + for (ApplicationFormFieldResponseBean formField : formFields) { + String fieldId = formField.getFieldId(); + Object fieldValue = formField.getFieldValue(); + + // Find the content in the form that matches the fieldId + Optional matchingContent = contents.stream() + .filter(content -> content.getId().equals(fieldId)) + .findFirst(); + + + // If the content with the matching fieldId is found, create a label-value pair + if (matchingContent.isPresent()) { + String name = matchingContent.get().getName(); + if (name.equals("fileupload")) { + +// Step 1: Check if fieldValue is an instance of List + if (fieldValue instanceof List && ((List) fieldValue).stream().allMatch(item -> item instanceof DocumentResponseBean)) { + // Step 2: Safely cast to List + List documentList = (List) fieldValue; + + // Step 3: Extract names from the document list + List names = documentList.stream() + .map(DocumentResponseBean::getName) // Extract the name from each DocumentResponseBean + .collect(Collectors.toList()); + + fieldValue=names; + } + } + if(name.equals("checkboxes")) { + List check = (List) fieldValue; + List settingResponseBeans = matchingContent.get().getSettings(); + for (SettingResponseBean settingResponseBean : settingResponseBeans) { + // Initialize a list to hold matched labels for each SettingResponseBean + List matchedLabels = new ArrayList<>(); + if (settingResponseBean.getValue() instanceof List) { + + List valueList = (List) settingResponseBean.getValue(); + if (!valueList.isEmpty() && valueList.get(0) instanceof Map) { + // Cast to List> + List> options = (List>) valueList; + for (Map field : options) { + for (String val : check) { + String name1=field.get("name"); + if (val.equals(name1)) { // Check if the key exists in the current field map + String label = field.get("label"); // Extract the label + if (field != null) { // Check if the value is not null + matchedLabels.add(label); // Add the value to the matchedValues list + } + } + } + } + fieldValue = matchedLabels; + } + } + } + } + String label = matchingContent.get().getLabel(); + // Add the label-value pair to the list + if (fieldValue != null && !fieldValue.toString().trim().isEmpty()) { + labelValuePairs.add(new FieldLabelValuePairRequest(label, fieldValue)); + } + } + } + + return labelValuePairs; + } + public void addLogo(Document document, String logoPath) throws Exception { + Image logo = Image.getInstance(logoPath); + logo.scaleToFit(document.getPageSize().getWidth() - document.leftMargin() - document.rightMargin(), // Fit to document width + document.getPageSize().getHeight() / 4); // Adjust the height as needed (1/4th of the page height) + logo.setAlignment(Image.ALIGN_CENTER); // Align logo to center + document.add(logo); + + // Add some space after logo + document.add(new Paragraph("\n")); // Adding space after the logo + } + public void addColoredLines(PdfWriter writer, Document document, BaseColor color){ + PdfContentByte canvas = writer.getDirectContent(); + + // Setting the color and width of the line + canvas.setColorStroke(color); + float lineWidth = 1.0f; // Thickness of the line + canvas.setLineWidth(lineWidth); + + // Get the current vertical position in the document + float yPos = writer.getVerticalPosition(true) - 10f; // Adjust this to move line slightly below current content + + // Define start and end points for the line (relative to the page size and margins) + float xStart = document.leftMargin(); // Start from the left margin + float xEnd = document.getPageSize().getWidth() - document.rightMargin(); // End at the right margin + + // Draw the line at the current Y position + canvas.moveTo(xStart, yPos); // Move to the starting point + canvas.lineTo(xEnd, yPos); // Draw the line to the end point + canvas.stroke(); // Apply the stroke (line) + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/dao/RoundedCorners.java b/src/main/java/net/gepafin/tendermanagement/dao/RoundedCorners.java new file mode 100644 index 00000000..9aa82dc1 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/dao/RoundedCorners.java @@ -0,0 +1,45 @@ +package net.gepafin.tendermanagement.dao; + +import com.itextpdf.text.BaseColor; +import com.itextpdf.text.Rectangle; +import com.itextpdf.text.pdf.PdfContentByte; +import com.itextpdf.text.pdf.PdfPCell; +import com.itextpdf.text.pdf.PdfPCellEvent; +import com.itextpdf.text.pdf.PdfPTable; + +public class RoundedCorners implements PdfPCellEvent { + @Override + public void cellLayout(PdfPCell cell, Rectangle position, PdfContentByte[] canvas) { + // Retrieve the canvas for drawing the background and border + PdfContentByte cbBackground = canvas[PdfPTable.BACKGROUNDCANVAS]; + PdfContentByte cb = canvas[PdfPTable.LINECANVAS]; + + cbBackground.saveState(); + cb.saveState(); + + // Define the rounded rectangle radius and padding + float radius = 10f; + float padding = 2f; // Small padding to avoid overlap + + // Get position values with adjusted height and width + float x = position.getLeft() + padding; + float y = position.getBottom() + padding; + float width = position.getWidth() - 2 * padding; + float height = position.getHeight() - 2 * padding; + + // Fill the rounded rectangle with lighter grey + cbBackground.setColorFill(new BaseColor(239, 243, 248)); // Very light grey color + cbBackground.roundRectangle(x, y, width, height, radius); + cbBackground.fill(); // Fill the background + + // Set the border stroke to thin and draw the rounded rectangle with dark grey color + cb.setLineWidth(0.5f); // Thin border width + cb.setColorStroke(new BaseColor(105, 105, 105)); // Dark grey border + cb.roundRectangle(x, y, width, height, radius); + cb.stroke(); // Draw the border + + // Restore the canvas states + cbBackground.restoreState(); + cb.restoreState(); + } + } diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/CustomPageEvent.java b/src/main/java/net/gepafin/tendermanagement/model/request/CustomPageEvent.java new file mode 100644 index 00000000..72aef09a --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/CustomPageEvent.java @@ -0,0 +1,71 @@ +package net.gepafin.tendermanagement.model.request; + +import com.itextpdf.text.*; +import com.itextpdf.text.pdf.ColumnText; +import com.itextpdf.text.pdf.PdfContentByte; +import com.itextpdf.text.pdf.PdfPageEventHelper; +import com.itextpdf.text.pdf.PdfWriter; + +public class CustomPageEvent extends PdfPageEventHelper { + private String title; + private int totalPages; + + public CustomPageEvent(String title, int totalPages) { + this.title = title; + this.totalPages = totalPages; + } + + @Override + public void onEndPage(PdfWriter writer, Document document) { + PdfContentByte canvas = writer.getDirectContent(); + + // Header - Add a title to each page at the top + if (writer.getPageNumber() > 1) { + Font headerFont = new Font(Font.FontFamily.HELVETICA, 6, Font.BOLD, new BaseColor(113, 121, 126)); // Gray color for header + ColumnText.showTextAligned( + canvas, + Element.ALIGN_LEFT, + new Phrase(title, headerFont), + document.leftMargin(), // Use left margin to align fully to the left + document.getPageSize().getHeight() - 30, // Positioning header near top + 0 // No rotation + ); + } + + // Footer - Add page number at the bottom + String footerText = String.format("Page %d of %d", writer.getPageNumber(), totalPages); + + // Set font for the footer + Font footerFont = new Font(Font.FontFamily.HELVETICA, 10, Font.NORMAL, BaseColor.BLACK); + + // Positioning footer near bottom + ColumnText.showTextAligned(writer.getDirectContent(), + Element.ALIGN_LEFT, + new Phrase(footerText, footerFont), + (document.right() + document.left()) / 2, + document.bottomMargin() - 10, // Positioning footer near bottom + 0); + + // Draw a yellow line below header + if (writer.getPageNumber() > 1) { + canvas.setLineWidth(1.5f); + canvas.setColorStroke(new BaseColor(255, 219, 88)); // Yellow color + float yPos = document.getPageSize().getHeight() - 50f; // Position for the line below header + canvas.moveTo(0, yPos); + canvas.lineTo(document.getPageSize().getWidth(), yPos); + canvas.stroke(); + } + + // Draw another line 50 points above the bottom of the document + canvas.setLineWidth(1.5f); + canvas.setColorStroke(new BaseColor(255, 219, 88)); // Yellow color + float lineYPos = document.bottomMargin() + 25f; // Position for the line above the bottom margin + canvas.moveTo(0, lineYPos); + canvas.lineTo(document.getPageSize().getWidth(), lineYPos); + canvas.stroke(); + } + + public void setTotalPages(int totalPages) { + this.totalPages = totalPages; + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/FieldLabelValuePairRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/FieldLabelValuePairRequest.java new file mode 100644 index 00000000..8eb5f7b5 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/FieldLabelValuePairRequest.java @@ -0,0 +1,14 @@ +package net.gepafin.tendermanagement.model.request; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +public class FieldLabelValuePairRequest { + + private String label; + private Object value; +} + diff --git a/src/main/java/net/gepafin/tendermanagement/service/PdfService.java b/src/main/java/net/gepafin/tendermanagement/service/PdfService.java new file mode 100644 index 00000000..e4e6b528 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/service/PdfService.java @@ -0,0 +1,9 @@ +package net.gepafin.tendermanagement.service; + +import jakarta.servlet.http.HttpServletRequest; + + +public interface PdfService { + + public byte[] generatePdf(HttpServletRequest request, Long applicationId); +} diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/PdfServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/PdfServiceImpl.java new file mode 100644 index 00000000..3e6951f1 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/PdfServiceImpl.java @@ -0,0 +1,25 @@ +package net.gepafin.tendermanagement.service.impl; + +import jakarta.servlet.http.HttpServletRequest; +import net.gepafin.tendermanagement.dao.PdfDao; +import net.gepafin.tendermanagement.entities.UserEntity; +import net.gepafin.tendermanagement.service.PdfService; +import net.gepafin.tendermanagement.util.Validator; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class PdfServiceImpl implements PdfService { + + @Autowired + private PdfDao pdfDao; + + @Autowired + private Validator validator; + + @Override + public byte[] generatePdf(HttpServletRequest request, Long applicationId) { + UserEntity userEntity = validator.validateUser(request); + return pdfDao.generatePdf(userEntity,applicationId); + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/PdfApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/PdfApi.java new file mode 100644 index 00000000..a8f7ea48 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/PdfApi.java @@ -0,0 +1,35 @@ +package net.gepafin.tendermanagement.web.rest.api; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.ExampleObject; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.servlet.http.HttpServletRequest; +import net.gepafin.tendermanagement.web.rest.api.errors.ErrorConstants; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; + +@Validated +public interface PdfApi { + + @Operation(summary = "API to generate PDF for an application", + responses = { + @ApiResponse(responseCode = "200", description = "OK", content = @Content(mediaType = "application/pdf")), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) + }) + @PostMapping(value = "/{applicationId}/generate-pdf", + produces = { "application/pdf" }) + public ResponseEntity generateApplicationPdf( + HttpServletRequest request, + @Parameter(description = "The application id", required = true) + @PathVariable(value = "applicationId", required = true) Long applicationId); +} diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/PdfController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/PdfController.java new file mode 100644 index 00000000..f14451ed --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/PdfController.java @@ -0,0 +1,40 @@ +package net.gepafin.tendermanagement.web.rest.api.impl; + +import com.itextpdf.text.*; +import com.itextpdf.text.pdf.*; +import jakarta.servlet.http.HttpServletRequest; +import net.gepafin.tendermanagement.dao.RoundedCorners; +import net.gepafin.tendermanagement.service.PdfService; +import net.gepafin.tendermanagement.web.rest.api.PdfApi; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; + +@RestController +public class PdfController implements PdfApi { + + @Autowired + private PdfService pdfService; + + @Override + public ResponseEntity generateApplicationPdf(HttpServletRequest request, Long applicationId) { + byte[] pdfBytes =pdfService.generatePdf(request,applicationId); + + // Prepare headers for downloading the PDF + HttpHeaders headers = new HttpHeaders(); + headers.add("Content-Disposition", "attachment; filename=bando-preview.pdf"); + + // Return the PDF as a response + return ResponseEntity.ok() + .headers(headers) + .contentType(MediaType.APPLICATION_PDF) + .body(pdfBytes); + } +} + From 4fa213823300a611578748840b6ead006ffed6a7 Mon Sep 17 00:00:00 2001 From: nisha Date: Sat, 12 Oct 2024 16:00:21 +0530 Subject: [PATCH 22/31] Updated code --- .../web/rest/api/ApplicationApi.java | 18 +++++- .../api/impl/ApplicationApiController.java | 61 +++++++++++++------ 2 files changed, 59 insertions(+), 20 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java index 1869655c..bfefce4f 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java @@ -130,7 +130,23 @@ public interface ApplicationApi { ResponseEntity> updateApplicationStatus(HttpServletRequest request, @Parameter(description = "The application id", required = true) @PathVariable("applicationId") Long applicationId, @Parameter(description = "status", required = true)@RequestParam(value = "status", required = true) ApplicationStatusTypeEnum status); - + + @Operation(summary = "API to generate PDF for an application", + responses = { + @ApiResponse(responseCode = "200", description = "OK", content = @Content(mediaType = "application/pdf")), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) + }) + @PostMapping(value = "/{applicationId}/download-pdf", + produces = { "application/pdf" }) + public ResponseEntity generateApplicationPdf( + HttpServletRequest request, + @Parameter(description = "The application id", required = true) + @PathVariable(value = "applicationId", required = true) Long applicationId); } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java index bcbf8e80..4de81e0b 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java @@ -13,11 +13,14 @@ import net.gepafin.tendermanagement.model.response.ApplicationResponseBean; import net.gepafin.tendermanagement.model.response.NextOrPreviousFormResponse; import net.gepafin.tendermanagement.model.util.Response; import net.gepafin.tendermanagement.service.ApplicationService; +import net.gepafin.tendermanagement.service.PdfService; import net.gepafin.tendermanagement.web.rest.api.ApplicationApi; import net.gepafin.tendermanagement.web.rest.api.errors.Status; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -35,17 +38,21 @@ public class ApplicationApiController implements ApplicationApi { @Autowired private ApplicationService applicationService; + @Autowired + private PdfService pdfService; + @Override - public ResponseEntity> createApplication(HttpServletRequest request, ApplicationRequestBean applicationRequestBean,Long applicationId, Long formId) { - ApplicationResponseBean applicationResponseBean= applicationService.createApplication(request,applicationRequestBean,applicationId,formId); + public ResponseEntity> createApplication(HttpServletRequest request, ApplicationRequestBean applicationRequestBean, Long applicationId, Long formId) { + ApplicationResponseBean applicationResponseBean = applicationService.createApplication(request, applicationRequestBean, applicationId, formId); return ResponseEntity.status(HttpStatus.CREATED) - .body(new Response<>(applicationResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.APPLICATION_CREATED_SUCCESS_MSG))); } + .body(new Response<>(applicationResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.APPLICATION_CREATED_SUCCESS_MSG))); + } @Override public ResponseEntity> getApplicationByFormId(HttpServletRequest request - , Long applicationId,Long formId) { + , Long applicationId, Long formId) { log.info("Get Application by ID - Application ID: {}", applicationId); - ApplicationGetResponseBean application = applicationService.getApplicationByFormId(request,applicationId,formId); + ApplicationGetResponseBean application = applicationService.getApplicationByFormId(request, applicationId, formId); return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(application, Status.SUCCESS, Translator.toLocale(GepafinConstant.GET_APPLICATION_SUCCESS_MSG))); } @@ -54,39 +61,55 @@ public class ApplicationApiController implements ApplicationApi { public ResponseEntity> deleteApplication(HttpServletRequest request, Long applicationId) { log.info("Delete Application - Application ID: {}", applicationId); - applicationService.deleteApplication(request,applicationId); + applicationService.deleteApplication(request, applicationId); return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(null, Status.SUCCESS, Translator.toLocale(GepafinConstant.DELETE_APPLICATION_SUCCESS_MSG))); } @Override public ResponseEntity> createApplicationByCallId(HttpServletRequest request, Long companyId, ApplicationRequest applicationRequest, Long callId) { - ApplicationResponse applicationResponseBean=applicationService.createApplication(request, companyId, applicationRequest, callId); + ApplicationResponse applicationResponseBean = applicationService.createApplication(request, companyId, applicationRequest, callId); return ResponseEntity.status(HttpStatus.CREATED) .body(new Response<>(applicationResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.APPLICATION_CREATED_SUCCESS_MSG))); } + @Override - public ResponseEntity>> getAllApplications(HttpServletRequest request,Long callId,Long companyId) { - List applications = applicationService.getAllApplications(request,callId,companyId); + public ResponseEntity>> getAllApplications(HttpServletRequest request, Long callId, Long companyId) { + List applications = applicationService.getAllApplications(request, callId, companyId); log.info("Get All Applications"); return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(applications, Status.SUCCESS, Translator.toLocale(GepafinConstant.GET_APPLICATION_SUCCESS_MSG))); } - + @Override - public ResponseEntity> getNextOrPreviousForm(HttpServletRequest request,Long applicationId, - Long formId, FormActionEnum action) { - NextOrPreviousFormResponse data = applicationService.getNextOrPreviousForm(request, applicationId, formId, action); - log.info("Get Next Or Previous Form "); + public ResponseEntity> getNextOrPreviousForm(HttpServletRequest request, Long applicationId, + Long formId, FormActionEnum action) { + NextOrPreviousFormResponse data = applicationService.getNextOrPreviousForm(request, applicationId, formId, action); + log.info("Get Next Or Previous Form "); return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(data, Status.SUCCESS, Translator.toLocale(GepafinConstant.GET_APPLICATION_SUCCESS_MSG))); } - + @Override public ResponseEntity> updateApplicationStatus(HttpServletRequest request, Long applicationId, - ApplicationStatusTypeEnum status) { + ApplicationStatusTypeEnum status) { ApplicationResponse applicationResponse = applicationService.updateApplicationStatus(request, applicationId, status); - return ResponseEntity.status(HttpStatus.OK) - .body(new Response<>(applicationResponse, Status.SUCCESS, Translator.toLocale(GepafinConstant.APPLICATION_STATUS_UPDATED_SUCCESSFULLY))); + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(applicationResponse, Status.SUCCESS, Translator.toLocale(GepafinConstant.APPLICATION_STATUS_UPDATED_SUCCESSFULLY))); } -} + + @Override + public ResponseEntity generateApplicationPdf(HttpServletRequest request, Long applicationId) { + byte[] pdfBytes = pdfService.generatePdf(request, applicationId); + + // Prepare headers for downloading the PDF + HttpHeaders headers = new HttpHeaders(); + headers.add("Content-Disposition", "attachment; filename=bando-preview.pdf"); + + // Return the PDF as a response + return ResponseEntity.ok() + .headers(headers) + .contentType(MediaType.APPLICATION_PDF) + .body(pdfBytes); + } +} \ No newline at end of file From 95251f82dde8601468af27a3b0b27a0a26187865 Mon Sep 17 00:00:00 2001 From: rajesh Date: Sat, 12 Oct 2024 16:44:35 +0530 Subject: [PATCH 23/31] updated code --- .../web/rest/api/impl/ApplicationApiController.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java index 34920076..f6e6d1e5 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java @@ -11,7 +11,6 @@ import net.gepafin.tendermanagement.model.response.ApplicationGetResponseBean; import net.gepafin.tendermanagement.model.response.ApplicationResponse; import net.gepafin.tendermanagement.model.response.ApplicationResponseBean; import net.gepafin.tendermanagement.model.response.ApplicationSignedDocumentResponse; -import net.gepafin.tendermanagement.model.response.CompanyDelegationResponse; import net.gepafin.tendermanagement.model.response.NextOrPreviousFormResponse; import net.gepafin.tendermanagement.model.util.Response; import net.gepafin.tendermanagement.service.ApplicationService; @@ -115,7 +114,6 @@ public class ApplicationApiController implements ApplicationApi { .contentType(MediaType.APPLICATION_PDF) .body(pdfBytes); } -} @Override public ResponseEntity> uploadSignedDocument(HttpServletRequest request, From 1227632681d50cbc6e068e02ed9ed24f55876524 Mon Sep 17 00:00:00 2001 From: rajesh Date: Sat, 12 Oct 2024 17:59:19 +0530 Subject: [PATCH 24/31] updated docker script --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index ceacf16e..18ed6c1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ FROM amazoncorretto:17.0.8-alpine3.17 +ENV TZ="Europe/Rome" EXPOSE 8080 ADD /target/tendermanagement-0.0.1-SNAPSHOT.jar tendermanagement-0.0.1-SNAPSHOT.jar ENTRYPOINT ["java", "-jar","tendermanagement-0.0.1-SNAPSHOT.jar"] From f0d1af18421d54db9a93e14afecbb0c03a65fe7e Mon Sep 17 00:00:00 2001 From: rajesh Date: Sat, 12 Oct 2024 18:41:05 +0530 Subject: [PATCH 25/31] updated code for pdf --- .../gepafin/tendermanagement/dao/PdfDao.java | 52 ++++++++++++++----- .../service/impl/PdfServiceImpl.java | 3 +- 2 files changed, 40 insertions(+), 15 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java b/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java index 11e39dc4..30e10fe8 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java @@ -1,5 +1,7 @@ package net.gepafin.tendermanagement.dao; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import com.itextpdf.kernel.colors.ColorConstants; import com.itextpdf.kernel.colors.DeviceRgb; import com.itextpdf.kernel.pdf.canvas.PdfCanvas; @@ -12,6 +14,8 @@ import com.itextpdf.text.Font; import com.itextpdf.text.Image; import com.itextpdf.text.Rectangle; import com.itextpdf.text.pdf.*; + +import jakarta.servlet.http.HttpServletRequest; import net.gepafin.tendermanagement.config.Translator; import net.gepafin.tendermanagement.constants.GepafinConstant; import net.gepafin.tendermanagement.entities.*; @@ -20,6 +24,7 @@ import net.gepafin.tendermanagement.model.request.FieldLabelValuePairRequest; import net.gepafin.tendermanagement.model.response.*; import net.gepafin.tendermanagement.repositories.ApplicationRepository; import net.gepafin.tendermanagement.service.CallService; +import net.gepafin.tendermanagement.util.Validator; import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; import net.gepafin.tendermanagement.web.rest.api.errors.Status; import org.springframework.beans.factory.annotation.Autowired; @@ -38,26 +43,21 @@ import java.util.stream.Collectors; @Component public class PdfDao { - @Autowired - private ApplicationRepository applicationRepository; - @Autowired private CallService callService; @Autowired private ApplicationDao applicationDao; + + @Autowired + private Validator validator; - public byte[] generatePdf(UserEntity userEntity,Long applicationId) { + public byte[] generatePdf(HttpServletRequest request,Long applicationId) { try { - ApplicationEntity applicationEntity = applicationRepository - .findByIdAndUserIdAndIsDeletedFalse(applicationId, userEntity.getId()) - .orElseThrow(() -> new ResourceNotFoundException( - Status.NOT_FOUND, - Translator.toLocale(GepafinConstant.APPLICATION_NOT_FOUND_MSG) - )); - - CompanyEntity companyEntity=applicationEntity.getCompany(); + UserEntity userEntity = validator.validateUser(request); + ApplicationEntity applicationEntity = applicationDao.validateApplication(applicationId); + validator.validateUserWithCompany(request, applicationEntity.getCompany().getId()); CallEntity call=callService.validateCall(applicationEntity.getCall().getId()); // Create a byte stream to hold the PDF @@ -127,7 +127,7 @@ public class PdfDao { // addLabelValuePair(document, "Con il titolo di", "Rappresentante legale", regularFont); document.add(new Paragraph(" ")); - ApplicationGetResponseBean applicationGetResponseBean=applicationDao.getApplicationByFormId(applicationId,null,userEntity); + ApplicationGetResponseBean applicationGetResponseBean=applicationDao.getApplicationByFormId(applicationId,null, userEntity); for(FormApplicationResponse formApplicationResponse: applicationGetResponseBean.getForm()) { document.add(new Paragraph(formApplicationResponse.getLabel(),sectionFont)); document.add(new Paragraph(" ")); // Add line break @@ -534,6 +534,7 @@ public class PdfDao { String label = matchingContent.get().getLabel(); // Add the label-value pair to the list if (fieldValue != null && !fieldValue.toString().trim().isEmpty()) { + fieldValue = findLabelInOptions(matchingContent.get().getSettings(), fieldValue); labelValuePairs.add(new FieldLabelValuePairRequest(label, fieldValue)); } } @@ -541,6 +542,31 @@ public class PdfDao { return labelValuePairs; } + + public static Object findLabelInOptions(List settings, Object valueToFind) { + ObjectMapper objectMapper = new ObjectMapper(); + + try { + if (valueToFind instanceof String) { + String searchValue = (String) valueToFind; + for (SettingResponseBean setting : settings) { + Object value = setting.getValue(); + if (value instanceof List) { + List options = (List) value; + for (Object option : options) { + JsonNode optionNode = objectMapper.convertValue(option, JsonNode.class); + if (optionNode.get("name").asText().equals(searchValue)) { + return optionNode.get("label").asText(); + } + } + } + } + } + } catch (Exception e) { + } + return valueToFind; + } + public void addLogo(Document document, String logoPath) throws Exception { Image logo = Image.getInstance(logoPath); logo.scaleToFit(document.getPageSize().getWidth() - document.leftMargin() - document.rightMargin(), // Fit to document width diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/PdfServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/PdfServiceImpl.java index 3e6951f1..b075584d 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/PdfServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/PdfServiceImpl.java @@ -19,7 +19,6 @@ public class PdfServiceImpl implements PdfService { @Override public byte[] generatePdf(HttpServletRequest request, Long applicationId) { - UserEntity userEntity = validator.validateUser(request); - return pdfDao.generatePdf(userEntity,applicationId); + return pdfDao.generatePdf(request, applicationId); } } From 7fd5a4cb27ac493d3f144fcec9374de6f69ca9dc Mon Sep 17 00:00:00 2001 From: nisha Date: Sun, 13 Oct 2024 04:39:24 +0530 Subject: [PATCH 26/31] Corrected code for page number in pdf --- .../gepafin/tendermanagement/dao/PdfDao.java | 49 +++++++++++++------ .../dao/PdfPageNumberInserter.java | 45 +++++++++++++++++ 2 files changed, 79 insertions(+), 15 deletions(-) create mode 100644 src/main/java/net/gepafin/tendermanagement/dao/PdfPageNumberInserter.java diff --git a/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java b/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java index 30e10fe8..f12941bf 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java @@ -36,6 +36,8 @@ import com.itextpdf.layout.element.Cell; import java.awt.*; import java.io.ByteArrayOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.*; import java.util.List; import java.util.stream.Collectors; @@ -66,10 +68,10 @@ public class PdfDao { Document document = new Document(PageSize.A4, leftMargin, 36f, 50f, 35); PdfWriter writer = PdfWriter.getInstance(document, out); - CustomPageEvent pageEvent = new CustomPageEvent(call.getName(), 0); - writer.setPageEvent(pageEvent); +// CustomPageEvent pageEvent = new CustomPageEvent(call.getName(), 0); +// writer.setPageEvent(pageEvent); document.open(); - pageEvent.setTotalPages(writer.getPageNumber()); +// pageEvent.setTotalPages(writer.getPageNumber()); addLogo(document, "https://mementoresources.s3.eu-west-1.amazonaws.com/gepafin/logo.jpg"); // Add your image path here @@ -91,7 +93,7 @@ public class PdfDao { document.add(new Paragraph(" ")); // Application ID section (Centered) - pageEvent.setTotalPages(writer.getPageNumber()); +// pageEvent.setTotalPages(writer.getPageNumber()); Paragraph appId = new Paragraph("ID domanda :" +"XX00"); appId.setAlignment(Element.ALIGN_RIGHT); document.add(appId); @@ -138,7 +140,7 @@ public class PdfDao { Integer pages=0; pages=addLabelValuePair(writer,document, label, value, labelFont,valueFont,call.getName(),pages); if(pages !=0 ){ - pageEvent.setTotalPages(writer.getPageNumber()); +// pageEvent.setTotalPages(writer.getPageNumber()); } } addColoredLines(writer,document,greenColor); @@ -150,8 +152,9 @@ public class PdfDao { // Adding the "Documenti Allegati" section title document.add(new Paragraph(" ")); - pageEvent.setTotalPages(writer.getPageNumber()); +// pageEvent.setTotalPages(writer.getPageNumber()); document.newPage(); +// pageEvent.setTotalPages(writer.getPageNumber()); document.add(new Paragraph("Documenti Allegati", sectionFont)); document.add(new Paragraph(" ")); @@ -215,11 +218,20 @@ public class PdfDao { addColoredLines(writer,document,greenColor); +// System.out.println(writer.getPageSize()); +// System.out.println(document.getPageSize()); +// System.out.println(document.getPageNumber()); +// System.out.println(writer.getPageNumber()); +// document.setPageCount(100); +// document.setPageCount(writer.getPageNumber()); +// System.out.println(document.getPageNumber()); + // Close the document document.close(); // Convert to byte array for response - byte[] pdfBytes = out.toByteArray(); + byte[] pdfBytes =PdfPageNumberInserter.addPageNumbers(out.toByteArray()); + return pdfBytes; } catch (Exception e) { e.printStackTrace(); @@ -308,7 +320,7 @@ public class PdfDao { String description = (String) entry.get(keys.get(1)); // Second key's value // Store the combined result as a value in the map, with a suitable key - String combinedValue = number + ", " + description + ", " + amount; // Concatenate them as a single value + String combinedValue = number + "; " + description + "; " + amount; // Concatenate them as a single value extractedMap.put("combined", combinedValue); // Store as a single entry, key as "combined" } @@ -380,14 +392,14 @@ public class PdfDao { } // Split the value for "combined" into separate parts - String[] combinedValues = value.split(", "); + String[] combinedValues = value.split("; "); // Check if we have 3 parts (number, description, amount) - String number = combinedValues[0].trim(); // 1st part (number) - String description = combinedValues[1].trim(); // 2nd part (description) + String number = combinedValues[0]; // 1st part (number) + String description = combinedValues[1]; // 2nd part (description) String amount = ""; if (combinedValues.length == 3) { - amount = combinedValues[2].trim(); // 3rd part (amount) + amount = combinedValues[2]; // 3rd part (amount) } // Create PDF cells using the split values @@ -401,9 +413,14 @@ public class PdfDao { cellAmount.setBackgroundColor(new BaseColor(239, 243, 248)); // Set cell height and add rounded borders - cellNumber.setFixedHeight(rowHeight); - cellDescription.setFixedHeight(rowHeight); - cellAmount.setFixedHeight(rowHeight); +// cellNumber.setFixedHeight(rowHeight); +// cellDescription.setFixedHeight(rowHeight); +// cellAmount.setFixedHeight(rowHeight); + + cellNumber.setMinimumHeight(20f); // Set minimum height for better appearance + cellDescription.setMinimumHeight(20f); // Set minimum height for better appearance + cellAmount.setMinimumHeight(20f); // Set minimum height for better appearance + cellNumber.setPadding(7f); cellDescription.setPadding(7f); cellAmount.setPadding(7f); @@ -441,6 +458,8 @@ public class PdfDao { cellKey.setBackgroundColor(new BaseColor(239, 243, 248)); // Light blue for other rows cellValue.setBackgroundColor(new BaseColor(239, 243, 248)); + cellKey.setPadding(7f); + cellValue.setPadding(7f); // Set cell height and add rounded borders cellKey.setFixedHeight(rowHeight); cellValue.setFixedHeight(rowHeight); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/PdfPageNumberInserter.java b/src/main/java/net/gepafin/tendermanagement/dao/PdfPageNumberInserter.java new file mode 100644 index 00000000..0ac9ce20 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/dao/PdfPageNumberInserter.java @@ -0,0 +1,45 @@ +package net.gepafin.tendermanagement.dao; +import com.itextpdf.text.BaseColor; +import com.itextpdf.text.DocumentException; +import com.itextpdf.text.Font; +import com.itextpdf.text.FontFactory; +import com.itextpdf.text.pdf.BaseFont; +import com.itextpdf.text.pdf.PdfReader; +import com.itextpdf.text.pdf.PdfStamper; +import com.itextpdf.text.pdf.PdfContentByte; +import java.io.ByteArrayOutputStream; +import java.io.IOException; + +public class PdfPageNumberInserter { + + public static byte[] addPageNumbers(byte[] pdfData) throws IOException, DocumentException { + PdfReader reader = new PdfReader(pdfData); // Read the generated PDF + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + BaseColor darkGreenColor = new BaseColor(1, 50, 32); // Adjust RGB values as needed + Font baseFont = FontFactory.getFont(FontFactory.HELVETICA, 4,darkGreenColor); + BaseFont font = baseFont.getBaseFont(); + + // PdfStamper allows us to modify the existing PDF + PdfStamper stamper = new PdfStamper(reader, outputStream); + int totalPages = reader.getNumberOfPages(); + + // Set the font for page numbers + + for (int i = 1; i <= totalPages; i++) { + // Get the content of the current page + PdfContentByte over = stamper.getOverContent(i); + over.beginText(); + over.setFontAndSize(font, 12); + + // Add the page number at the bottom center of the page + over.showTextAligned(PdfContentByte.ALIGN_CENTER, "Page " + i + " of " + totalPages, 300, 30, 0); + + over.endText(); + } + + stamper.close(); + reader.close(); + + return outputStream.toByteArray(); // Return the modified PDF with page numbers + } +} From 115614329c0aab69e8aa84567bb37277d7c5c0fd Mon Sep 17 00:00:00 2001 From: rajesh Date: Sun, 13 Oct 2024 14:00:47 +0530 Subject: [PATCH 27/31] Fixed upload Signed Document issue --- .../java/net/gepafin/tendermanagement/dao/ApplicationDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index 879c12b2..6963f3e0 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -94,7 +94,6 @@ public class ApplicationDao { private ProtocolRepository protocolRepository; @Autowired - private SystemEmailTemplatesService systemEmailTemplatesService; @Autowired @@ -112,6 +111,7 @@ public class ApplicationDao { @Value("${carlo_email}") private String carloEmail; + @Autowired private AmazonS3Service amazonS3Service; @Autowired From 34a2803c4afa10ca0bbb8552abd4426d6a824eb5 Mon Sep 17 00:00:00 2001 From: rajesh Date: Sun, 13 Oct 2024 15:25:18 +0530 Subject: [PATCH 28/31] Fixed issue related to creating multiple applications per user based on their company --- .../net/gepafin/tendermanagement/dao/ApplicationDao.java | 6 +++--- .../repositories/ApplicationRepository.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index 6963f3e0..6d7619d6 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -560,15 +560,15 @@ public class ApplicationDao { ApplicationRequest applicationRequest, Long callId, UserEntity userEntity) { CallEntity call = callService.validateCall(callId); // call = callService.validatePublishedCall(call.getId()); - checkIfApplicationExists(call, companyEntity); + checkIfApplicationExists(call, companyEntity, userEntity); ApplicationEntity applicationEntity = createApplicationEntity(userEntity, call, companyEntity); applicationEntity.setComments(applicationRequest.getComments()); applicationEntity = saveApplicationEntity(applicationEntity); ApplicationResponse applicationResponse = getApplicationResponse(applicationEntity); return applicationResponse; } - public void checkIfApplicationExists(CallEntity call, CompanyEntity companyEntity){ - Optional applicationEntity=applicationRepository.findByCompanyIdAndCallIdAndIsDeletedFalse(companyEntity.getId(),call.getId()); + public void checkIfApplicationExists(CallEntity call, CompanyEntity companyEntity, UserEntity userEntity){ + Optional applicationEntity=applicationRepository.findByUserIdAndCompanyIdAndCallIdAndIsDeletedFalse(userEntity.getId(), companyEntity.getId(),call.getId()); if(applicationEntity.isPresent()){ throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.APPLICATION_ALREADY_EXISTS)); } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java index 567c8198..a1c3a474 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java @@ -1,7 +1,6 @@ package net.gepafin.tendermanagement.repositories; import net.gepafin.tendermanagement.entities.ApplicationEntity; -import net.gepafin.tendermanagement.entities.FaqEntity; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; @@ -25,7 +24,7 @@ public interface ApplicationRepository extends JpaRepository findByIdAndUserIdAndIsDeletedFalse(Long id,Long userId); - Optional findByCompanyIdAndCallIdAndIsDeletedFalse(Long companyId, Long callId); + Optional findByUserIdAndCompanyIdAndCallIdAndIsDeletedFalse(Long userId, Long companyId, Long callId); public Optional findByIdAndUserIdAndCallIdAndIsDeletedFalse(Long applicationId, Long userId, Long callId); From daaac744cf74739df1ee45145911c2846c10b8b7 Mon Sep 17 00:00:00 2001 From: rajesh Date: Sun, 13 Oct 2024 15:48:13 +0530 Subject: [PATCH 29/31] updated form_filed for table --- src/main/resources/db/changelog/db.changelog-1.0.0.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml index 86f1097e..0f6aeeb2 100644 --- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml +++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml @@ -1019,7 +1019,13 @@ referencedColumnNames="ID" constraintName="fk_application_signed_document_application"/> - + + + + + name='table' + + From 89d512c4c5b9edbac21a6edf40471fe9ccc5e085 Mon Sep 17 00:00:00 2001 From: nisha Date: Mon, 14 Oct 2024 12:08:56 +0530 Subject: [PATCH 30/31] Fixed issue for protocol number in pdf --- .../gepafin/tendermanagement/dao/PdfDao.java | 37 +++++++++++++++---- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java b/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java index f12941bf..17b57fc6 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java @@ -94,15 +94,14 @@ public class PdfDao { // Application ID section (Centered) // pageEvent.setTotalPages(writer.getPageNumber()); - Paragraph appId = new Paragraph("ID domanda :" +"XX00"); + String protocolNumber="XX00"; + if(applicationEntity.getProtocol()!=null) { + protocolNumber= String.valueOf(applicationEntity.getProtocol().getProtocolNumber()); + } + Paragraph appId = new Paragraph("ID domanda :" +protocolNumber); appId.setAlignment(Element.ALIGN_RIGHT); document.add(appId); - if(applicationEntity.getProtocol()!=null) { - appId = new Paragraph("ID domanda :"+String.valueOf(applicationEntity.getProtocol().getProtocolNumber()), valueFont); - appId.setAlignment(Element.ALIGN_RIGHT); - document.add(appId); - } document.add(new Paragraph(" ")); addColoredLines(writer,document,greenColor); @@ -346,14 +345,17 @@ public class PdfDao { return totalPages; } - private Document createPdfTable(List> extractedData,Document document) throws DocumentException { // Create a PdfPTable with 2 columns + private Document createPdfTable(List> extractedData,Document document) throws DocumentException { + // Create a PdfPTable with 2 columns PdfPTable table = new PdfPTable(2); // Initial assumption for 2 columns table.setWidthPercentage(100); // Set table width to 100% + table.setTableEvent(new RoundedBorderEvent()); Font textFont = FontFactory.getFont(FontFactory.HELVETICA, 12, Font.NORMAL, new BaseColor(105, 105, 105)); // Gray text boolean combinedHeaderAdded = false; // Flag to track if headers for combined have been added float rowHeight = 50f; // Example row height, adjust as necessary float maxTableHeight = 700f; // Maximum height of the table before a page break - int rowCount = 0; // Counter for rows + float[] columnWidths = {0.7f, 0.3f}; + table.setWidths(columnWidths); // Add table header @@ -484,7 +486,26 @@ public class PdfDao { // Return the populated table return document; } + public static class RoundedBorderEvent implements PdfPTableEvent { + @Override + public void tableLayout(PdfPTable table, float[][] widths, float[] heights, + int headerRows, int rowStart, PdfContentByte[] canvases) { + PdfContentByte canvas = canvases[PdfPTable.BASECANVAS]; + // Get the table boundaries + float left = widths[0][0]; + float right = widths[0][widths[0].length - 1]; + float top = heights[0]; + float bottom = heights[heights.length - 1]; + + // Define the corner radius + float radius = 20f; + + // Draw a rounded rectangle around the table + canvas.roundRectangle(left, bottom, right - left, top - bottom, radius); + canvas.stroke(); + } + } public List getFormFieldsToLabels(FormApplicationResponse responseBean) { List labelValuePairs = new ArrayList<>(); From b03b4266973cb0edc312b1122933fa5bc05a3193 Mon Sep 17 00:00:00 2001 From: harish Date: Mon, 14 Oct 2024 12:58:25 +0530 Subject: [PATCH 31/31] Updated email content and changed date format for mail --- .../constants/GepafinConstant.java | 1 + .../tendermanagement/dao/ApplicationDao.java | 6 +++--- .../tendermanagement/util/DateTimeUtil.java | 2 +- src/main/resources/application.properties | 2 +- .../db/changelog/db.changelog-1.0.0.xml | 8 ++++++-- ...ail_template_of_application_submission.sql | 19 +++++++++++++++++++ 6 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/db/dump/update_system_email_template_of_application_submission.sql diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java index b1b05dc4..59b24f67 100644 --- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java +++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java @@ -210,5 +210,6 @@ public class GepafinConstant { public static final String GET_SIGNED_DOCUMENT_FILE_SUCCESS = "get.signed.document.file.success"; public static final String APPLICATION_SIGNED_DOCUMENT_NOT_FOUND = "application.signed.document.not.found"; public static final String DELETE_SIGNED_DOCUMENT_FILE_SUCCESS = "delete.signed.document.file.success"; + public static final String DD_MM_YYYY = "dd/MM/yyyy"; } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index 6d7619d6..ad2ac4a2 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -603,7 +603,7 @@ public class ApplicationDao { throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_IS_INCOMPLETE_MSG)); } Integer maxProtocolNumber=protocolRepository.findMaxProtocolNumber(); - Integer protocolNumber = (maxProtocolNumber != null) ? maxProtocolNumber + 1 : 10000; + Integer protocolNumber = (maxProtocolNumber != null) ? maxProtocolNumber + 1 : 1; ProtocolEntity protocolEntity=createProtocolEntity(applicationEntity,protocolNumber); applicationEntity.setProtocol(protocolEntity); applicationEntity.setStatus(ApplicationStatusTypeEnum.SUBMIT.getValue()); @@ -719,7 +719,7 @@ public class ApplicationDao { Map bodyPlaceholders = new HashMap<>(); bodyPlaceholders.put("{{call_name}}", call.getName()); bodyPlaceholders.put("{{protocol_number}}", protocol.getProtocolNumber().toString()); - bodyPlaceholders.put("{{date}}", DateTimeUtil.formatLocalDateTime(protocol.getCreatedDate(), GepafinConstant.YYYY_MM_DD_SLASH)); + bodyPlaceholders.put("{{date}}", DateTimeUtil.formatLocalDateTime(protocol.getCreatedDate(), GepafinConstant.DD_MM_YYYY)); bodyPlaceholders.put("{{time}}", DateTimeUtil.parseLocalTimeToString(protocol.getTime(), GepafinConstant.HH_MM_SS)); // Replace placeholders in the subject and body @@ -752,7 +752,7 @@ public class ApplicationDao { Map bodyPlaceholders = new HashMap<>(); bodyPlaceholders.put("{{call_name}}", call.getName()); bodyPlaceholders.put("{{protocol_number}}", protocol.getProtocolNumber().toString()); - bodyPlaceholders.put("{{date}}", DateTimeUtil.formatLocalDateTime(protocol.getCreatedDate(), GepafinConstant.YYYY_MM_DD_SLASH)); + bodyPlaceholders.put("{{date}}", DateTimeUtil.formatLocalDateTime(protocol.getCreatedDate(), GepafinConstant.DD_MM_YYYY)); bodyPlaceholders.put("{{time}}", DateTimeUtil.parseLocalTimeToString(protocol.getTime(), GepafinConstant.HH_MM_SS)); // Replace placeholders in the subject and body diff --git a/src/main/java/net/gepafin/tendermanagement/util/DateTimeUtil.java b/src/main/java/net/gepafin/tendermanagement/util/DateTimeUtil.java index 92da73eb..1fdf6c1a 100644 --- a/src/main/java/net/gepafin/tendermanagement/util/DateTimeUtil.java +++ b/src/main/java/net/gepafin/tendermanagement/util/DateTimeUtil.java @@ -24,7 +24,7 @@ public class DateTimeUtil { public static LocalDateTime DateServerToUTC(LocalDateTime systemDate) { ZonedDateTime ldtZoned = systemDate.atZone(ZoneId.systemDefault()); - LocalDateTime localDatetime = ldtZoned.withZoneSameInstant(ZoneId.of("UTC")).toLocalDateTime(); + LocalDateTime localDatetime = ldtZoned.withZoneSameInstant(ZoneId.of("Europe/Rome")).toLocalDateTime(); return localDatetime; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 11d23d5d..0206cb11 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -60,7 +60,7 @@ mailGun_base_url=https://api.eu.mailgun.net/ apiKey=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 #senderEmail=mailer@bflows.net isMailSendingEnabled = false -default_System_Receiver_Email=attivazione@bflows.net +default_System_Receiver_Email=antonio.manca@bflows.net gepafin_email=bandi@pec.gepafin.it rinaldo_email=rinaldo.bonazzo@bflows.net carlo_email=carlo.mancosu@bflows.net diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml index 0f6aeeb2..e5332dde 100644 --- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml +++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml @@ -1026,6 +1026,10 @@ name='table' - - + + + + + diff --git a/src/main/resources/db/dump/update_system_email_template_of_application_submission.sql b/src/main/resources/db/dump/update_system_email_template_of_application_submission.sql new file mode 100644 index 00000000..5379233a --- /dev/null +++ b/src/main/resources/db/dump/update_system_email_template_of_application_submission.sql @@ -0,0 +1,19 @@ + +UPDATE gepafin_schema.system_email_template +SET html_content = ' + +
+

+ In riferimento alla domanda di concessione di Finanziamento agevolato a valere sul Fondo prestiti + {{call_name}} di cui all’oggetto, la stessa è stata regolarmente acquisita ed è stata + registrata con Protocollo n. {{protocol_number}} del {{date}} alle {{time}}. +

+

Distinti Saluti,

+

+ Gepafin S.p.a. +

+
+ +', +updated_date = '2024-10-14 10:00:00' +WHERE type = 'APPLICATION_SUBMISSION_TO_GEPAFIN';