Changeset 53bad7e for backend/GlobeGuru-backend/src/main/java/DatabaseUtil.java

Timestamp:

01/10/25 00:33:50 (3 weeks ago)

Author:

Kristijan <kristijanzafirovski26@…>

Branches:

master

Children:

1c51912

Parents:

c164f8f

Message:

dodadeno informacii za broj na lugje

File:

• backend/GlobeGuru-backend/src/main/java/DatabaseUtil.java (modified) (14 diffs)

backend/GlobeGuru-backend/src/main/java/DatabaseUtil.java

@@ -31 +31 @@
                              "price REAL, " +
                              "dateRange TEXT, " +
+                             "numberOfPeople INTEGER, " +
                              "isPriceChanged BOOLEAN DEFAULT 0, " +
                              "newPrice REAL DEFAULT 0)"
@@ -55 +56 @@
             stmt.setString(1, username);
             stmt.setString(2, email);
-            stmt.setString(3, password); // Store hashed
+            stmt.setString(3, password);
             return stmt.executeUpdate() > 0;
         }
@@ -69 +70 @@
                     String storedPassword = rs.getString("password");
                     if (password == null) {
-                        // Assume this is a Google login
+                        // Google login
                         return storedPassword == null;
                     }
-                    return password.equals(storedPassword); // Check hashed password
+                    return password.equals(storedPassword);
                 }
             }
@@ -92 +93 @@
             try (ResultSet rs = selectStmt.executeQuery()) {
                 if (rs.next()) {
-                    // User exists, delete the user and their favourite options
                     deleteStmt.setInt(1, userId);
                     int rowsAffected = deleteStmt.executeUpdate();
@@ -101 +101 @@
                     return rowsAffected > 0;
                 } else {
-                    // User does not exist
                     return false;
                 }
@@ -135 +134 @@
     }
 
-    public static List<Option> queryOptions(String destination, String dateQuery, boolean dateFlag) throws SQLException {
+    public static List<Option> queryOptions(String destination, String dateQuery, int numPeople, boolean dateFlag) throws SQLException {
         List<Option> options = new ArrayList<>();
         String sql = "SELECT * FROM options WHERE (country LIKE ? OR hotelName LIKE ?)";
@@ -143 +142 @@
         } //append date
         if (dateFlag) {   //search only from dates
-            sql += "AND dateRange LIKE ?";
-        }
+            sql += " AND dateRange LIKE ?";
+        }
+        if(numPeople != 0) { //with number of people
+            sql += " AND numberOfPeople = ?";
+        }
+
         System.out.println("Searching for dest:" + destination + "\n" + sql);
         try (Connection conn = getConnection();
@@ -156 +159 @@
                 stmt.setString(3, dateQuery + "%");
             }
-            // Execute query
+            if(numPeople != 0) {
+                stmt.setInt(4, numPeople);
+            }
             try (ResultSet rs = stmt.executeQuery()) {
                 while (rs.next()) {
@@ -167 +172 @@
                     option.setPrice(rs.getFloat("price"));
                     option.setDateRange(rs.getString("dateRange"));
+                    option.setNumPeople(rs.getInt("numberOfPeople"));
                     options.add(option);
                 }
@@ -185 +191 @@
     }
 
-    //TODO add frontend
+
     public static boolean removeFavoriteOption(int userId, int optionId) throws SQLException {
         String sql = "DELETE FROM savedOptions WHERE userId = ? AND optionId = ?";
@@ -269 +275 @@
 
     public static void saveOptionToDatabase(Option option) {
-        String sql = "INSERT INTO options (link, imgSrc, hotelName, country, price, dateRange, isPriceChanged, newPrice) VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
+        String sql = "INSERT INTO options (link, imgSrc, hotelName, country, price, dateRange,numberOfPeople, isPriceChanged, newPrice) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)";
         try (Connection conn = DriverManager.getConnection("jdbc:sqlite:globe_guru.db");
              PreparedStatement stmt = conn.prepareStatement(sql)) {
@@ -278 +284 @@
             stmt.setFloat(5, option.getPrice());
             stmt.setString(6, option.getDateRange());
-            stmt.setBoolean(7, option.isPriceChanged());
-            stmt.setFloat(8, option.getNewPrice());
+            stmt.setInt(7,option.getNumPeople());
+            stmt.setBoolean(8, option.isPriceChanged());
+            stmt.setFloat(9, option.getNewPrice());
             stmt.executeUpdate();
         } catch (SQLException e) {
@@ -293 +300 @@
             PreparedStatement stmt = conn.prepareStatement(sql)){
             stmt.executeUpdate();
-            //Remake the options DB
             initializeDatabase();
 
@@ -334 +340 @@
                     existingOption.setPriceChanged(rs.getBoolean("isPriceChanged"));
                     existingOption.setNewPrice(rs.getInt("newPrice"));
+                    existingOption.setNumPeople(rs.getInt("numberOfPeople"));
                     return existingOption;
                 }