Updated email content and changed date format for mail

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";
 }
 

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<String, String> 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<String, String> 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

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;
 	}
 

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

src/main/resources/db/changelog/db.changelog-1.0.0.xml

@@ -1026,6 +1026,10 @@
 			<where>name='table'</where>
 		</update>
 	</changeSet>
-    
+
-    
+    <changeSet id="14-10-2024_1" author="Harish Bagora">
+        <sqlFile dbms="postgresql"
+                 path="db/dump/update_system_email_template_of_application_submission.sql" />
+    </changeSet>
+
 </databaseChangeLog>

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 = '<html>
+<body style="font-family: Arial, sans-serif; color: #333; line-height: 1.6;">
+    <div style="padding: 20px; border: 1px solid #ddd; border-radius: 8px; max-width: 600px; margin: auto;">
+        <p>
+            In riferimento alla domanda di concessione di Finanziamento agevolato a valere sul Fondo prestiti
+            <strong>{{call_name}}</strong> di cui all’oggetto, la stessa è stata regolarmente acquisita ed è stata
+            registrata con Protocollo n. <strong>{{protocol_number}}</strong> del <strong>{{date}}</strong> alle <strong>{{time}}</strong>.
+        </p>
+        <p>Distinti Saluti,</p>
+        <p>
+            <strong>Gepafin S.p.a.</strong>
+        </p>
+    </div>
+</body>
+</html>',
+updated_date = '2024-10-14 10:00:00'
+WHERE type = 'APPLICATION_SUBMISSION_TO_GEPAFIN';