Merge pull request #2 from Caleumtatsu2010/develop

release v1.0
Caleumtatsu2010 · Sep 26, 2023 · 773ea28 · 773ea28
2 parents 90e1b7a + cefebe6
commit 773ea28
Show file tree

Hide file tree

Showing 84 changed files with 2,321 additions and 208 deletions.
diff --git a/.idea/artifacts/techmate_core.xml b/.idea/artifacts/techmate_core.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_12_22.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_12_22.xml
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_12_0.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_12_0.xml
diff --git a/.idea/libraries/Maven__org_json_json_200902112.xml b/.idea/libraries/Maven__org_json_json_200902112.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/runConfigurations/TechmateTomcat9_0_561.xml b/.idea/runConfigurations/TechmateTomcat9_0_561.xml
diff --git a/.idea/webContexts.xml b/.idea/webContexts.xml
diff --git a/cassandra/src/main/java/com/caleumtatsu2010/cassandra/connection/astra/AstraConnector.java b/cassandra/src/main/java/com/caleumtatsu2010/cassandra/connection/astra/AstraConnector.java
@@ -3,7 +3,7 @@
 import com.caleumtatsu2010.cassandra.models.database.astra.CASToken;
 import com.caleumtatsu2010.cassandra.models.database.CASPath;
 import com.caleumtatsu2010.cassandra.models.database.astra.CASTokenName;
-import com.caleumtatsu2010.cassandra.models.database.astra.AstraDatabases;
+import com.caleumtatsu2010.cassandra.models.database.astra.dbList.AstraDatabases;
 import com.caleumtatsu2010.cassandra.models.database.astra.KeySpace;
 import com.caleumtatsu2010.utility.file.properties.PropsUtil;
 import com.datastax.oss.driver.api.core.CqlSession;

diff --git a/cassandra/src/main/java/com/caleumtatsu2010/cassandra/dao/account/CASAccountDao.java b/cassandra/src/main/java/com/caleumtatsu2010/cassandra/dao/account/CASAccountDao.java
@@ -6,7 +6,7 @@
 import com.caleumtatsu2010.cassandra.dao.CASDao;
 import com.caleumtatsu2010.cassandra.models.account.CASAccount;
 import com.caleumtatsu2010.cassandra.models.database.CASPath;
-import com.caleumtatsu2010.cassandra.models.database.astra.AstraDatabases;
+import com.caleumtatsu2010.cassandra.models.database.astra.dbList.AstraDatabases;
 import com.caleumtatsu2010.cassandra.models.database.astra.KeySpace;
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.cql.BoundStatement;
@@ -94,26 +94,6 @@ public void insert(CASAccount account) {
 	}
 
 
-//	    @Override
-//    public void insert(Product product) {
-//
-//        Connection connection = null;
-//        PreparedStatement ps = null;
-//        ResultSet rs = null;
-//        try {
-//            connection = connectionUtil.getConn();
-//            ps = connection.prepareStatement(ProductQueries.insertProduct);
-//            String[] productAttr = new String[]{"id", "name", "price", "currency", "discountId",
-//             "quantity", "temp1", "temp2", "temp3", "temp4",
-//              "star", "ratings", "image", "subCategoryId"};
-//            StatementUtil.mapParams(ps, product, productAttr);
-//            ps.executeUpdate();
-//            System.out.println("Data Added Successfully");
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        } finally {
-//            ConnectionUtil.closeAll(connection, ps, rs);
-//        }
 
 	@Override
 	public void update(CASAccount casAccount, UUID id) {

diff --git a/cassandra/src/main/java/com/caleumtatsu2010/cassandra/dao/cart/CASCartDao.java b/cassandra/src/main/java/com/caleumtatsu2010/cassandra/dao/cart/CASCartDao.java
@@ -5,7 +5,7 @@
 import com.caleumtatsu2010.cassandra.dao.CASDao;
 import com.caleumtatsu2010.cassandra.models.cart.CASCart;
 import com.caleumtatsu2010.cassandra.models.database.CASPath;
-import com.caleumtatsu2010.cassandra.models.database.astra.AstraDatabases;
+import com.caleumtatsu2010.cassandra.models.database.astra.dbList.AstraDatabases;
 import com.caleumtatsu2010.cassandra.models.database.astra.KeySpace;
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.cql.BoundStatement;
@@ -76,27 +76,6 @@ public void insert(CASCart cart) {
 	}
 
 
-//	    @Override
-//    public void insert(Product product) {
-//
-//        Connection connection = null;
-//        PreparedStatement ps = null;
-//        ResultSet rs = null;
-//        try {
-//            connection = connectionUtil.getConn();
-//            ps = connection.prepareStatement(ProductQueries.insertProduct);
-//            String[] productAttr = new String[]{"id", "name", "price", "currency", "discountId",
-//             "quantity", "temp1", "temp2", "temp3", "temp4",
-//              "star", "ratings", "image", "subCategoryId"};
-//            StatementUtil.mapParams(ps, product, productAttr);
-//            ps.executeUpdate();
-//            System.out.println("Data Added Successfully");
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        } finally {
-//            ConnectionUtil.closeAll(connection, ps, rs);
-//        }
-
 
 	@Override
 	public void update(CASCart cart, UUID id) {

diff --git a/cassandra/src/main/java/com/caleumtatsu2010/cassandra/dao/cart/item/CASCartItemDao.java b/cassandra/src/main/java/com/caleumtatsu2010/cassandra/dao/cart/item/CASCartItemDao.java
@@ -5,7 +5,7 @@
 import com.caleumtatsu2010.cassandra.dao.CASDao;
 import com.caleumtatsu2010.cassandra.models.cart.item.CASCartItem;
 import com.caleumtatsu2010.cassandra.models.database.CASPath;
-import com.caleumtatsu2010.cassandra.models.database.astra.AstraDatabases;
+import com.caleumtatsu2010.cassandra.models.database.astra.dbList.AstraDatabases;
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.cql.BoundStatement;
 import com.datastax.oss.driver.api.core.cql.PreparedStatement;
@@ -42,6 +42,7 @@ public List<CASCartItem> getAll() {
 						, row.getUuid("cart_id")
 						, row.getString("product_id")
 						, row.getInt("num")
+						, row.getString("check")
 						));
 			}
 			return list;
@@ -71,28 +72,6 @@ public void insert(CASCartItem cartItem) {
 		}
 	}
 
-
-//	    @Override
-//    public void insert(Product product) {
-//
-//        Connection connection = null;
-//        PreparedStatement ps = null;
-//        ResultSet rs = null;
-//        try {
-//            connection = connectionUtil.getConn();
-//            ps = connection.prepareStatement(ProductQueries.insertProduct);
-//            String[] productAttr = new String[]{"id", "name", "price", "currency", "discountId",
-//             "quantity", "temp1", "temp2", "temp3", "temp4",
-//              "star", "ratings", "image", "subCategoryId"};
-//            StatementUtil.mapParams(ps, product, productAttr);
-//            ps.executeUpdate();
-//            System.out.println("Data Added Successfully");
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        } finally {
-//            ConnectionUtil.closeAll(connection, ps, rs);
-//        }
-
 
 	@Override
 	public void update(CASCartItem cartItem, UUID id) {

diff --git a/cassandra/src/main/java/com/caleumtatsu2010/cassandra/models/cart/item/CASCartItem.java b/cassandra/src/main/java/com/caleumtatsu2010/cassandra/models/cart/item/CASCartItem.java
@@ -17,4 +17,5 @@ public class CASCartItem {
 	private UUID cartId;
 	private String productId;
 	private int num;
+	private String check;
 }
diff --git a/...dra/src/main/java/com/caleumtatsu2010/cassandra/models/database/astra/AstraDatabases.java b/...dra/src/main/java/com/caleumtatsu2010/cassandra/models/database/astra/AstraDatabases.java
diff --git a/.../main/java/com/caleumtatsu2010/cassandra/models/database/astra/dbList/AstraDatabases.java b/.../main/java/com/caleumtatsu2010/cassandra/models/database/astra/dbList/AstraDatabases.java
@@ -0,0 +1,7 @@
+package com.caleumtatsu2010.cassandra.models.database.astra.dbList;
+
+public class AstraDatabases {
+	public static String techmate = "techmate";
+	public static String astraDb2 = "";
+	public static String astraDb3 = "";
+}
diff --git a/cassandra/target/classes/com/caleumtatsu2010/cassandra/connection/astra/AstraConnector.class b/cassandra/target/classes/com/caleumtatsu2010/cassandra/connection/astra/AstraConnector.class
diff --git a/cassandra/target/classes/com/caleumtatsu2010/cassandra/dao/account/CASAccountDao.class b/cassandra/target/classes/com/caleumtatsu2010/cassandra/dao/account/CASAccountDao.class
diff --git a/cassandra/target/classes/com/caleumtatsu2010/cassandra/dao/cart/CASCartDao.class b/cassandra/target/classes/com/caleumtatsu2010/cassandra/dao/cart/CASCartDao.class
diff --git a/cassandra/target/classes/com/caleumtatsu2010/cassandra/dao/cart/item/CASCartItemDao.class b/cassandra/target/classes/com/caleumtatsu2010/cassandra/dao/cart/item/CASCartItemDao.class
diff --git a/cassandra/target/classes/com/caleumtatsu2010/cassandra/models/cart/item/CASCartItem.class b/cassandra/target/classes/com/caleumtatsu2010/cassandra/models/cart/item/CASCartItem.class
diff --git a/...a/target/classes/com/caleumtatsu2010/cassandra/models/database/astra/AstraDatabases.class b/...a/target/classes/com/caleumtatsu2010/cassandra/models/database/astra/AstraDatabases.class