From a0d21342a2401b573056b009041a9ccc46492740 Mon Sep 17 00:00:00 2001
From: Aleksei <a.gryczewski999@gmail.com>
Date: Mon, 17 Feb 2020 15:01:37 -0500
Subject: [PATCH] Added conditions for excluding deleted outfits

---
 .../fsbot/database/controllers/OutfitController.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java b/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java
index a318c73..73614c4 100644
--- a/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java
+++ b/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java
@@ -35,7 +35,7 @@ public class OutfitController {
 
     public static OutfitModel findRandom() throws SQLException {
         OutfitModel outfit = new OutfitModel();
-        try (ResultSet rs = FSDB.get().select("SELECT * FROM outfits ORDERBY random() LIMIT 1")) {
+        try (ResultSet rs = FSDB.get().select("SELECT * FROM outfits WHERE deleted = 0 ORDERBY random() LIMIT 1")) {
             if (rs.next()) {
                 outfit = mapObject(rs);
             }
@@ -48,7 +48,7 @@ public class OutfitController {
 
     public static OutfitModel findRandomByTag(String tag) {
         OutfitModel outfit = new OutfitModel();
-        try (ResultSet rs = FSDB.get().select("SELECT * FROM outfits WHERE tag = ? ORDERBY random() LIMIT 1", tag)) {
+        try (ResultSet rs = FSDB.get().select("SELECT * FROM outfits WHERE tag = ? AND deleted = 0 ORDERBY random() LIMIT 1", tag)) {
             if (rs.next()) {
                 outfit = mapObject(rs);
             }
@@ -61,7 +61,7 @@ public class OutfitController {
 
     public static OutfitModel findRandomBySubmitter(String submitterId) {
         OutfitModel outfit = new OutfitModel();
-        try (ResultSet rs = FSDB.get().select("SELECT * FROM outfits WHERE submitter = ? ORDERBY random() LIMIT 1", submitterId)) {
+        try (ResultSet rs = FSDB.get().select("SELECT * FROM outfits WHERE submitter = ? AND deleted = 0 ORDERBY random() LIMIT 1", submitterId)) {
             if (rs.next()) {
                 outfit = mapObject(rs);
             }
@@ -74,7 +74,7 @@ public class OutfitController {
 
     public static int countOutfits() {
         int count = 0;
-        try (ResultSet rs = FSDB.get().select("SELECT COUNT(*) AS count FROM outfits")) {
+        try (ResultSet rs = FSDB.get().select("SELECT COUNT(*) AS count FROM outfits WHERE deleted = 0")) {
             if (rs.next()) {
                 count = rs.getInt("count");
             }
@@ -87,7 +87,7 @@ public class OutfitController {
 
     public static int countOutfitsBySubmitter(String submitterId) {
         int count = 0;
-        try (ResultSet rs = FSDB.get().select("SELECT COUNT(*) AS count FROM outfits WHERE submitter = ?", submitterId)) {
+        try (ResultSet rs = FSDB.get().select("SELECT COUNT(*) AS count FROM outfits WHERE submitter = ? AND deleted = 0", submitterId)) {
             if (rs.next()) {
                 count = rs.getInt("count");
             }