Resolved conflicts

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

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

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

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;

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