feat: three tiered architecture

build.gradle.kts

@@ -97,7 +97,7 @@ tasks.named<Jar>("jar") { enabled = false }
 
 val copyScripts by tasks.registering(Copy::class) {
     from("scripts") {
-        include("start.sh", "start.bat")
+        include("start.sh", "start.bat", "download.bat", "upload.bat")
     }
     into(layout.buildDirectory.dir("libs"))
     doLast {

src/main/java/satyamconsignment/common/DatabaseHandler.java

@@ -26,6 +26,7 @@ private void initDatabase(Connection conn) {
         try {
             String initSQL = getInitSQL();
             try (Statement st = conn.createStatement()) {
+                conn.setAutoCommit(false);
 
                 for (String statement : initSQL.split(";")) {
                     String cleanedStatement = statement.trim();
@@ -42,7 +43,7 @@ private void initDatabase(Connection conn) {
                 conn.setAutoCommit(true);
             }
         } catch (Exception ex) {
-            System.out.println(ex.toString());
+            Logger.getLogger(DatabaseHandler.class.getName()).log(Level.SEVERE, ex.toString(), ex);
         }
     }
 

src/main/java/satyamconsignment/common/Utils.java

@@ -3,13 +3,17 @@
 import java.awt.*;
 import java.io.File;
 import java.io.IOException;
-import java.util.logging.Level;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.logging.Logger;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 
 public class Utils {
 
+    private static final Logger logger = Logger.getLogger(Utils.class.getName());
+
     public static void showAlert(String message) {
         Alert alert = new Alert(AlertType.ERROR);
         alert.setContentText(message);
@@ -37,25 +41,35 @@ public static void showAlert(String message, int choice) {
         alert.show();
     }
 
-    public static void launchPdf(String filename) {
+    public static void launchPdf(String filename) throws IOException {
         File pdfFile = new File(filename);
 
         if (!pdfFile.exists()) {
-            showAlert("File does not exist: " + pdfFile.getAbsolutePath());
-            return;
+            throw new IOException("File does not exist: " + pdfFile.getAbsolutePath());
         }
 
         if (!Desktop.isDesktopSupported()) {
-            showAlert("Desktop is not supported on this platform.");
-            return;
+            throw new IOException("Desktop is not supported on this platform.");
         }
 
+        Desktop.getDesktop().open(pdfFile);
+    }
+
+    public static String formatDate(String dateString) {
+        DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern(Constants.DATE_TIME_FORMAT);
         try {
-            Desktop.getDesktop().open(pdfFile);
-            showAlert("PDF opened successfully.", 1);
-        } catch (IOException e) {
-            String msg = ("Error opening PDF: " + e.getMessage());
-            Logger.getLogger(Utils.class.getName()).log(Level.SEVERE, msg, e);
+            LocalDate date = LocalDate.parse(dateString, inputFormatter);
+            return date.format(outputFormatter);
+        } catch (DateTimeParseException ex) {
+            try {
+                // already in desired format
+                LocalDate.parse(dateString, outputFormatter);
+                return dateString;
+            } catch (DateTimeParseException ex2) {
+                logger.warning(ex2.toString());
+                throw ex2;
+            }
         }
     }
 }

src/main/java/satyamconsignment/entity/BillEntity.java

@@ -0,0 +1,22 @@
+package satyamconsignment.entity;
+
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+@AllArgsConstructor
+@Getter
+@Setter
+@Builder
+public class BillEntity {
+    private String supplierName;
+    private String buyerName;
+    private String billNo;
+    private String billDate;
+    private String transport;
+    private String lrDate;
+    private String billAmount;
+    private List<LREntity> lrEntities;
+}

src/main/java/satyamconsignment/entity/CollectionEntity.java

@@ -0,0 +1,15 @@
+package satyamconsignment.entity;
+
+import java.util.List;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class CollectionEntity {
+    private String voucherNo;
+    private String voucherDate;
+    private String buyerName;
+    private String totalAmount;
+    private List<CollectionItemEntity> items;
+}

src/main/java/satyamconsignment/entity/CollectionItemEntity.java

@@ -0,0 +1,20 @@
+package satyamconsignment.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Builder
+@Getter
+public class CollectionItemEntity {
+    private String billNo;
+    private String billDate;
+    private String billAmount;
+    private String supplierName;
+    private String due;
+    private String amountCollected;
+    private String bank;
+    private String ddNo;
+    private String ddDate;
+}

src/main/java/satyamconsignment/entity/LREntity.java

@@ -0,0 +1,14 @@
+package satyamconsignment.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@AllArgsConstructor
+@Getter
+@Setter
+public class LREntity {
+    private String billNo;
+    private String lrNo;
+    private String pm;
+}

src/main/java/satyamconsignment/entity/PaymentEntity.java

@@ -0,0 +1,17 @@
+package satyamconsignment.entity;
+
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Builder
+@Getter
+public class PaymentEntity {
+    private String voucherNo;
+    private String voucherDate;
+    private String supplierName;
+    private String totalAmount;
+    private List<PaymentItemEntity> items;
+}

src/main/java/satyamconsignment/entity/PaymentItemEntity.java

@@ -0,0 +1,19 @@
+package satyamconsignment.entity;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class PaymentItemEntity {
+    private String voucherNo;
+    private String buyerName;
+    private String billNo;
+    private String billDate;
+    private String billAmount;
+    private String dueAmount;
+    private String amountPaid;
+    private String bank;
+    private String ddNo;
+    private String ddDate;
+}

src/main/java/satyamconsignment/repository/BillRepository.java

@@ -0,0 +1,126 @@
+package satyamconsignment.repository;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import satyamconsignment.common.DatabaseHandler;
+import satyamconsignment.entity.BillEntity;
+import satyamconsignment.entity.LREntity;
+
+public class BillRepository {
+
+    public void save(BillEntity billEntity) throws SQLException {
+        Connection connection = DatabaseHandler.getInstance().getConnection();
+        try {
+            // language=sql
+            String sql =
+                    "INSERT INTO `Bill_Entry_Table`(`Supplier Name`,`Buyer Name`,`Bill No.`,`Bill Date`,`Transport`,`LR Date`,`Bill Amount`,`Collection Due`,`Due`) "
+                            + "VALUES (?,?,?,?,?,?,?,?,?) ON CONFLICT(`Bill No.`) DO UPDATE SET "
+                            + "`Supplier Name`=excluded.`Supplier Name`, `Buyer Name`=excluded.`Buyer Name`, `Bill Date`=excluded.`Bill Date`, "
+                            + "`Transport`=excluded.`Transport`, `LR Date`=excluded.`LR Date`, `Bill Amount`=excluded.`Bill Amount`, "
+                            + "`Collection Due`=excluded.`Collection Due`, `Due`=excluded.`Due`;";
+
+            connection.setAutoCommit(false);
+
+            PreparedStatement preparedStatement = connection.prepareStatement(sql);
+            preparedStatement.setString(1, billEntity.getSupplierName());
+            preparedStatement.setString(2, billEntity.getBuyerName());
+            preparedStatement.setString(3, billEntity.getBillNo());
+            preparedStatement.setString(4, billEntity.getBillDate());
+            preparedStatement.setString(5, billEntity.getTransport());
+            preparedStatement.setString(6, billEntity.getLrDate());
+            preparedStatement.setString(7, billEntity.getBillAmount());
+            preparedStatement.setString(8, billEntity.getBillAmount());
+            preparedStatement.setString(9, billEntity.getBillAmount());
+            preparedStatement.execute();
+
+            if (null != billEntity.getLrEntities()) {
+                for (LREntity lr : billEntity.getLrEntities()) {
+                    sql = "INSERT INTO `LR_Table`(`Bill No.`,`LR No.`,`PM`) VALUES (?,?,?)";
+                    preparedStatement = connection.prepareStatement(sql);
+                    preparedStatement.setString(1, billEntity.getBillNo());
+                    preparedStatement.setString(2, lr.getLrNo());
+                    preparedStatement.setString(3, lr.getPm());
+                    preparedStatement.execute();
+                }
+            }
+            connection.commit();
+        } catch (SQLException ex) {
+            connection.rollback();
+            Logger.getLogger(BillRepository.class.getName()).log(Level.SEVERE, ex.toString(), ex);
+            throw ex;
+        }
+    }
+
+    public BillEntity getBill(String billNo) throws SQLException {
+        try {
+            Connection connection = DatabaseHandler.getInstance().getConnection();
+            String sql = "select * from `Bill_Entry_Table` where `Bill No.`=? collate nocase";
+            PreparedStatement preparedStatement = connection.prepareStatement(sql);
+            preparedStatement.setString(1, billNo);
+            ResultSet billResultSet = preparedStatement.executeQuery();
+
+            if (billResultSet.isClosed()) {
+                return null;
+            }
+
+            BillEntity billEntity = BillEntity.builder()
+                    .billNo(billResultSet.getString("Bill No."))
+                    .supplierName(billResultSet.getString("Supplier Name"))
+                    .buyerName(billResultSet.getString("Buyer Name"))
+                    .billDate(billResultSet.getString("Bill Date"))
+                    .transport(billResultSet.getString("Transport"))
+                    .lrDate(billResultSet.getString("LR Date"))
+                    .billAmount(billResultSet.getString("Bill Amount"))
+                    .build();
+
+            sql = "select * from `LR_Table` where `Bill No.`=? collate nocase";
+            preparedStatement = connection.prepareStatement(sql);
+            preparedStatement.setString(1, billNo);
+            ResultSet lrPmResultSet = preparedStatement.executeQuery();
+
+            List<LREntity> lrpmList = new ArrayList<>();
+            while (lrPmResultSet.next()) {
+                lrpmList.add(new LREntity(
+                        lrPmResultSet.getString("Bill No."),
+                        lrPmResultSet.getString("LR No."),
+                        lrPmResultSet.getString("PM")));
+            }
+
+            billEntity.setLrEntities(lrpmList);
+            return billEntity;
+        } catch (SQLException ex) {
+            Logger.getLogger(BillRepository.class.getName()).log(Level.SEVERE, ex.toString(), ex);
+            throw ex;
+        }
+    }
+
+    public void deleteBill(String billNo) throws SQLException {
+
+        Connection connection = DatabaseHandler.getInstance().getConnection();
+
+        try {
+            connection.setAutoCommit(false);
+            String sql = "DELETE FROM `Bill_Entry_Table` where `Bill No.`=? collate nocase";
+            PreparedStatement preparedStatement = connection.prepareStatement(sql);
+            preparedStatement.setString(1, billNo);
+            preparedStatement.execute();
+
+            String sql2 = "DELETE FROM `LR_Table` where `Bill No.`=? collate nocase";
+            preparedStatement = connection.prepareStatement(sql2);
+            preparedStatement.setString(1, billNo);
+            preparedStatement.execute();
+
+            connection.commit();
+        } catch (SQLException ex) {
+            connection.rollback();
+            Logger.getLogger(BillRepository.class.getName()).log(Level.SEVERE, ex.toString(), ex);
+            throw ex;
+        }
+    }
+}