Merge pull request #76 from Kitzanos/pdf-logo-updated-prod
Cherry pick (Pdf logo changes)
This commit is contained in:
@@ -13,6 +13,7 @@ import jakarta.servlet.http.HttpServletRequest;
|
|||||||
import net.gepafin.tendermanagement.entities.*;
|
import net.gepafin.tendermanagement.entities.*;
|
||||||
import net.gepafin.tendermanagement.model.request.FieldLabelValuePairRequest;
|
import net.gepafin.tendermanagement.model.request.FieldLabelValuePairRequest;
|
||||||
import net.gepafin.tendermanagement.model.response.*;
|
import net.gepafin.tendermanagement.model.response.*;
|
||||||
|
import net.gepafin.tendermanagement.repositories.HubRepository;
|
||||||
import net.gepafin.tendermanagement.service.CallService;
|
import net.gepafin.tendermanagement.service.CallService;
|
||||||
import net.gepafin.tendermanagement.util.PdfUtils;
|
import net.gepafin.tendermanagement.util.PdfUtils;
|
||||||
import net.gepafin.tendermanagement.util.Utils;
|
import net.gepafin.tendermanagement.util.Utils;
|
||||||
@@ -21,6 +22,7 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
//import com.itextpdf.layout.element.
|
//import com.itextpdf.layout.element.
|
||||||
|
|
||||||
@@ -29,11 +31,13 @@ import java.io.ByteArrayOutputStream;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
public class PdfDao {
|
public class PdfDao {
|
||||||
|
|
||||||
|
@Value("${default.hub.pdf.banner}")
|
||||||
|
private String defaultLogoUrl;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private CallService callService;
|
private CallService callService;
|
||||||
|
|
||||||
@@ -43,6 +47,9 @@ public class PdfDao {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private Validator validator;
|
private Validator validator;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private HubRepository hubRepository;
|
||||||
|
|
||||||
public static final Logger log = LoggerFactory.getLogger(PdfDao.class);
|
public static final Logger log = LoggerFactory.getLogger(PdfDao.class);
|
||||||
|
|
||||||
public byte[] generatePdf(HttpServletRequest request,Long applicationId) {
|
public byte[] generatePdf(HttpServletRequest request,Long applicationId) {
|
||||||
@@ -61,9 +68,20 @@ public class PdfDao {
|
|||||||
// CustomPageEvent pageEvent = new CustomPageEvent(call.getName(), 0);
|
// CustomPageEvent pageEvent = new CustomPageEvent(call.getName(), 0);
|
||||||
// writer.setPageEvent(pageEvent);
|
// writer.setPageEvent(pageEvent);
|
||||||
document.open();
|
document.open();
|
||||||
|
String logoUrl=defaultLogoUrl;
|
||||||
|
|
||||||
|
Optional<HubEntity> hubEntity=hubRepository.findById(applicationEntity.getHubId());
|
||||||
|
if(hubEntity.isPresent()) {
|
||||||
|
if (hubEntity.get().getUniqueUuid().equals("p4lk3bcx1RStqTaIVVbXs")) {
|
||||||
|
defaultLogoUrl = hubEntity.get().getPdfBanner();
|
||||||
|
}
|
||||||
|
if (hubEntity.get().getUniqueUuid().equals("t7jh5wfg9QXylNaTZkPoE")) {
|
||||||
|
defaultLogoUrl = hubEntity.get().getPdfBanner();
|
||||||
|
}
|
||||||
|
}
|
||||||
// pageEvent.setTotalPages(writer.getPageNumber());
|
// pageEvent.setTotalPages(writer.getPageNumber());
|
||||||
// addLogo(document, "logo.jpg"); // Add your image path here the migration code after cherry-pick
|
// addLogo(document, "logo.jpg"); // Add your image path here the migration code after cherry-pick
|
||||||
addLogo(document, "https://mementoresources.s3.eu-west-1.amazonaws.com/gepafin/logo.jpg");
|
addLogo(document, logoUrl);
|
||||||
|
|
||||||
|
|
||||||
BaseColor customColor = new BaseColor(0, 128, 0); // Adjust RGB values as needed
|
BaseColor customColor = new BaseColor(0, 128, 0); // Adjust RGB values as needed
|
||||||
|
|||||||
@@ -45,5 +45,7 @@ public class HubEntity extends BaseEntity{
|
|||||||
|
|
||||||
@Column(name = "EMAIL_SIGNATURE")
|
@Column(name = "EMAIL_SIGNATURE")
|
||||||
private String emailSignature;
|
private String emailSignature;
|
||||||
|
|
||||||
|
@Column(name="PDF_BANNER")
|
||||||
|
private String pdfBanner;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,3 +62,5 @@ apiKey=xkeysib-d15439fedd7ff36d86676ac248153fc2c496ed9b879ca9dc8cee9a27fa309087-
|
|||||||
|
|
||||||
default.email.signature=Gepafin S.p.a
|
default.email.signature=Gepafin S.p.a
|
||||||
|
|
||||||
|
default.hub.pdf.banner=https://mementoresources.s3.amazonaws.com/gepafin/staging/template/gepafin-logo.jpg
|
||||||
|
|
||||||
|
|||||||
@@ -1504,5 +1504,20 @@
|
|||||||
<where>UNIQUE_UUID = 't7jh5wfg9QXylNaTZkPoE'</where>
|
<where>UNIQUE_UUID = 't7jh5wfg9QXylNaTZkPoE'</where>
|
||||||
</update>
|
</update>
|
||||||
</changeSet>
|
</changeSet>
|
||||||
|
|
||||||
|
<changeSet id="30-10-2024_1" author="Nisha Kashyap">
|
||||||
|
<addColumn tableName="hub">
|
||||||
|
<column name="pdf_banner" type="TEXT"></column>
|
||||||
|
</addColumn>
|
||||||
|
<update tableName="hub">
|
||||||
|
<column name="pdf_banner" value='https://mementoresources.s3.amazonaws.com/gepafin/staging/template/gepafin-logo.jpg'/>
|
||||||
|
<where>UNIQUE_UUID = 'p4lk3bcx1RStqTaIVVbXs'</where>
|
||||||
|
</update>
|
||||||
|
<update tableName="hub">
|
||||||
|
<column name="pdf_banner" value='https://mementoresources.s3.amazonaws.com/gepafin/staging/template/sviluppumbria_logo.jpg'/>
|
||||||
|
<where>UNIQUE_UUID = 't7jh5wfg9QXylNaTZkPoE'</where>
|
||||||
|
</update>
|
||||||
|
</changeSet>
|
||||||
|
|
||||||
|
|
||||||
</databaseChangeLog>
|
</databaseChangeLog>
|
||||||
|
|||||||
Reference in New Issue
Block a user