From f67890323c372b47975add9a827183cfe064b66b Mon Sep 17 00:00:00 2001 From: gimenab Date: Fri, 8 Jun 2018 21:12:12 -0300 Subject: [PATCH 1/6] shopping cart project loaded --- bootcamp/pom.xml | 12 ++++ bootcamp/src/main/java/com/globant/Main.java | 4 ++ .../main/java/com/globant/model/Client.java | 57 +++++++++++++++++++ .../src/main/java/com/globant/model/Item.java | 36 ++++++++++++ .../main/java/com/globant/model/Order.java | 27 +++++++++ .../main/java/com/globant/model/Payment.java | 36 ++++++++++++ 6 files changed, 172 insertions(+) create mode 100644 bootcamp/pom.xml create mode 100644 bootcamp/src/main/java/com/globant/Main.java create mode 100644 bootcamp/src/main/java/com/globant/model/Client.java create mode 100644 bootcamp/src/main/java/com/globant/model/Item.java create mode 100644 bootcamp/src/main/java/com/globant/model/Order.java create mode 100644 bootcamp/src/main/java/com/globant/model/Payment.java diff --git a/bootcamp/pom.xml b/bootcamp/pom.xml new file mode 100644 index 0000000..84b8ec7 --- /dev/null +++ b/bootcamp/pom.xml @@ -0,0 +1,12 @@ + + + 4.0.0 + + com.globant + shoppingcart + 1.0-SNAPSHOT + + + \ No newline at end of file diff --git a/bootcamp/src/main/java/com/globant/Main.java b/bootcamp/src/main/java/com/globant/Main.java new file mode 100644 index 0000000..73c2cee --- /dev/null +++ b/bootcamp/src/main/java/com/globant/Main.java @@ -0,0 +1,4 @@ +package com.model ; + +public class Main { +} diff --git a/bootcamp/src/main/java/com/globant/model/Client.java b/bootcamp/src/main/java/com/globant/model/Client.java new file mode 100644 index 0000000..d271f1a --- /dev/null +++ b/bootcamp/src/main/java/com/globant/model/Client.java @@ -0,0 +1,57 @@ +package com.globant.model; + +public class Client { private int id; + private String name; + private String surmane; + private String description; + private Payment payment; + + public Client(int id, String name, String surname, String descriprion, Payment pyment){ + this.id = id; + this.name = name; + this.surmane = surname; + this.description = description; + this.payment = payment; + + } + + public void setId( int id ) { + this.id = id; + } + + public int getId() { + return id; + } + + public void setName( String name ) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setSurmane( String surmane ) { + this.surmane = surmane; + } + + public String getSurmane() { + return surmane; + } + + public void setDescription( String description ) { + this.description = description; + } + + public String getDescription() { + return description; + } + + public void setPayment( Payment payment ) { + this.payment = payment; + } + + public Payment getPayment() { + return payment; + } +} diff --git a/bootcamp/src/main/java/com/globant/model/Item.java b/bootcamp/src/main/java/com/globant/model/Item.java new file mode 100644 index 0000000..ec1f718 --- /dev/null +++ b/bootcamp/src/main/java/com/globant/model/Item.java @@ -0,0 +1,36 @@ +package com.globant.model; + +public class Item {private int id; + private String name; + private float price; + + public Item( int id, String name, float price){ + this.id = id; + this.name = name; + this.price = price; + } + + public void setId( int id ) { + this.id = id; + } + + public int getId() { + return id; + } + + public void setName( String name ) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setPrice( float price ) { + this.price = price; + } + + public float getPrice() { + return price; + } +} diff --git a/bootcamp/src/main/java/com/globant/model/Order.java b/bootcamp/src/main/java/com/globant/model/Order.java new file mode 100644 index 0000000..5f3d763 --- /dev/null +++ b/bootcamp/src/main/java/com/globant/model/Order.java @@ -0,0 +1,27 @@ +package com.globant.model; + +public class Order {private int id; + private Item item; + + public Order(int id, Item item){ + this.id = id; + this.item = item; + + } + + public void setId( int id ) { + this.id = id; + } + + public int getId() { + return id; + } + + public void setItem( Item item ) { + this.item = item; + } + + public Item getItem() { + return item; + } +} diff --git a/bootcamp/src/main/java/com/globant/model/Payment.java b/bootcamp/src/main/java/com/globant/model/Payment.java new file mode 100644 index 0000000..00bd611 --- /dev/null +++ b/bootcamp/src/main/java/com/globant/model/Payment.java @@ -0,0 +1,36 @@ +package com.globant.model; + +public class Payment { private int id; + private Order order; + private float amount; + + public Payment(int id, Order order, float amount){ + this.id = id; + this.order = order; + this.amount = amount; + } + + public void setId( int id ) { + this.id = id; + } + + public int getId() { + return id; + } + + public void setOrder( Order order ) { + this.order = order; + } + + public Order getOrder() { + return order; + } + + public void setAmount( float amount ) { + this.amount = amount; + } + + public float getAmount() { + return amount; + } +} From 5eb0fe430f7ae327979aa5c907b872b70a82cf72 Mon Sep 17 00:00:00 2001 From: Gimena <> Date: Sat, 16 Jun 2018 04:29:25 -0300 Subject: [PATCH 2/6] add class dao, dto, dbconection --- bootcamp/pom.xml | 9 +++ bootcamp/src/main/java/com/globant/Main.java | 21 +++++- .../java/com/globant/Service/Service.java | 12 ++++ .../com/globant/Service/ServiceClient.java | 10 +++ .../java/com/globant/Service/ServiceItem.java | 7 ++ .../com/globant/Service/ServiceOrder.java | 8 +++ .../com/globant/Service/ServicePayment.java | 8 +++ .../main/java/com/globant/dao/ClientDAO.java | 30 ++++++++ .../main/java/com/globant/dao/ItemDAO.java | 28 ++++++++ .../main/java/com/globant/dao/OrderDAO.java | 28 ++++++++ .../main/java/com/globant/dao/PaymentDAO.java | 28 ++++++++ .../java/com/globant/db/DBConnection.java | 39 +++++++++++ .../main/java/com/globant/dto/ClientDTO.java | 68 +++++++++++++++++++ .../main/java/com/globant/model/Client.java | 33 +++++---- .../src/main/java/com/globant/model/Item.java | 8 +++ .../main/java/com/globant/model/Order.java | 18 +++-- .../main/java/com/globant/model/Payment.java | 26 ++++--- 17 files changed, 352 insertions(+), 29 deletions(-) create mode 100644 bootcamp/src/main/java/com/globant/Service/Service.java create mode 100644 bootcamp/src/main/java/com/globant/Service/ServiceClient.java create mode 100644 bootcamp/src/main/java/com/globant/Service/ServiceItem.java create mode 100644 bootcamp/src/main/java/com/globant/Service/ServiceOrder.java create mode 100644 bootcamp/src/main/java/com/globant/Service/ServicePayment.java create mode 100644 bootcamp/src/main/java/com/globant/dao/ClientDAO.java create mode 100644 bootcamp/src/main/java/com/globant/dao/ItemDAO.java create mode 100644 bootcamp/src/main/java/com/globant/dao/OrderDAO.java create mode 100644 bootcamp/src/main/java/com/globant/dao/PaymentDAO.java create mode 100644 bootcamp/src/main/java/com/globant/db/DBConnection.java create mode 100644 bootcamp/src/main/java/com/globant/dto/ClientDTO.java diff --git a/bootcamp/pom.xml b/bootcamp/pom.xml index 84b8ec7..7bf8d56 100644 --- a/bootcamp/pom.xml +++ b/bootcamp/pom.xml @@ -6,7 +6,16 @@ com.globant shoppingcart + 1.0-SNAPSHOT + + + mysql + mysql-connector-java + 8.0.11 + + + \ No newline at end of file diff --git a/bootcamp/src/main/java/com/globant/Main.java b/bootcamp/src/main/java/com/globant/Main.java index 73c2cee..86e3a04 100644 --- a/bootcamp/src/main/java/com/globant/Main.java +++ b/bootcamp/src/main/java/com/globant/Main.java @@ -1,4 +1,23 @@ -package com.model ; +package com.globant; + +import com.globant.db.DBConnection; + +import java.sql.Connection; +import java.sql.SQLException; public class Main { + + + + public static void main( String[] args){ + + try { + DBConnection shoppingc = DBConnection.getInstance(); + Connection connection = shoppingc.getConnection(); + System.out.println(connection.toString()); + } catch (SQLException e) { + e.printStackTrace(); + } + + } } diff --git a/bootcamp/src/main/java/com/globant/Service/Service.java b/bootcamp/src/main/java/com/globant/Service/Service.java new file mode 100644 index 0000000..818653a --- /dev/null +++ b/bootcamp/src/main/java/com/globant/Service/Service.java @@ -0,0 +1,12 @@ +package com.globant.Service; + +import java.util.List; + +public interface Service { + public T create (T object); + public T read (int id ); + public T update (T object); + public void delete(int id); + + public List readAll(); +} diff --git a/bootcamp/src/main/java/com/globant/Service/ServiceClient.java b/bootcamp/src/main/java/com/globant/Service/ServiceClient.java new file mode 100644 index 0000000..47fa112 --- /dev/null +++ b/bootcamp/src/main/java/com/globant/Service/ServiceClient.java @@ -0,0 +1,10 @@ +package com.globant.Service; + +import com.globant.dao.ClientDAO; +import com.globant.model.Client; + +import java.util.List; + +public interface ServiceClient extends Service { + +} diff --git a/bootcamp/src/main/java/com/globant/Service/ServiceItem.java b/bootcamp/src/main/java/com/globant/Service/ServiceItem.java new file mode 100644 index 0000000..9d21126 --- /dev/null +++ b/bootcamp/src/main/java/com/globant/Service/ServiceItem.java @@ -0,0 +1,7 @@ +package com.globant.Service; + +import com.globant.model.Item; + +public interface ServiceItem extends Service { + +} diff --git a/bootcamp/src/main/java/com/globant/Service/ServiceOrder.java b/bootcamp/src/main/java/com/globant/Service/ServiceOrder.java new file mode 100644 index 0000000..ddd76ce --- /dev/null +++ b/bootcamp/src/main/java/com/globant/Service/ServiceOrder.java @@ -0,0 +1,8 @@ +package com.globant.Service; + +import com.globant.model.Order; + +import java.util.List; + +public interface ServiceOrder extends Service{ +} diff --git a/bootcamp/src/main/java/com/globant/Service/ServicePayment.java b/bootcamp/src/main/java/com/globant/Service/ServicePayment.java new file mode 100644 index 0000000..b6e13fd --- /dev/null +++ b/bootcamp/src/main/java/com/globant/Service/ServicePayment.java @@ -0,0 +1,8 @@ +package com.globant.Service; + +import com.globant.model.Payment; + +import java.util.List; + +public interface ServicePayment extends Service{ +} diff --git a/bootcamp/src/main/java/com/globant/dao/ClientDAO.java b/bootcamp/src/main/java/com/globant/dao/ClientDAO.java new file mode 100644 index 0000000..a65b075 --- /dev/null +++ b/bootcamp/src/main/java/com/globant/dao/ClientDAO.java @@ -0,0 +1,30 @@ +package com.globant.dao; + +import com.globant.Service.ServiceClient; +import com.globant.model.Client; + +import java.util.List; + +public class ClientDAO implements ServiceClient{ + + + public Client create( Client object ) { + return null; + } + + public Client read( int id ) { + return null; + } + + public Client update( Client object ) { + return null; + } + + public void delete( int id ) { + + } + + public List readAll() { + return null; + } +} diff --git a/bootcamp/src/main/java/com/globant/dao/ItemDAO.java b/bootcamp/src/main/java/com/globant/dao/ItemDAO.java new file mode 100644 index 0000000..4477970 --- /dev/null +++ b/bootcamp/src/main/java/com/globant/dao/ItemDAO.java @@ -0,0 +1,28 @@ +package com.globant.dao; + +import com.globant.Service.ServiceItem; +import com.globant.model.Item; + +import java.util.List; + +public class ItemDAO implements ServiceItem { + public Item create( Item object ) { + return null; + } + + public Item read( int id ) { + return null; + } + + public Item update( Item object ) { + return null; + } + + public void delete( int id ) { + + } + + public List readAll() { + return null; + } +} diff --git a/bootcamp/src/main/java/com/globant/dao/OrderDAO.java b/bootcamp/src/main/java/com/globant/dao/OrderDAO.java new file mode 100644 index 0000000..b5dd754 --- /dev/null +++ b/bootcamp/src/main/java/com/globant/dao/OrderDAO.java @@ -0,0 +1,28 @@ +package com.globant.dao; + +import com.globant.Service.ServiceClient; +import com.globant.model.Client; + +import java.util.List; + +public class OrderDAO implements ServiceClient{ + public Client create( Client object ) { + return null; + } + + public Client read( int id ) { + return null; + } + + public Client update( Client object ) { + return null; + } + + public void delete( int id ) { + + } + + public List readAll() { + return null; + } +} diff --git a/bootcamp/src/main/java/com/globant/dao/PaymentDAO.java b/bootcamp/src/main/java/com/globant/dao/PaymentDAO.java new file mode 100644 index 0000000..519f924 --- /dev/null +++ b/bootcamp/src/main/java/com/globant/dao/PaymentDAO.java @@ -0,0 +1,28 @@ +package com.globant.dao; + +import com.globant.Service.ServicePayment; +import com.globant.model.Payment; + +import java.util.List; + +public class PaymentDAO implements ServicePayment { + public Payment create( Payment object ) { + return null; + } + + public Payment read( int id ) { + return null; + } + + public Payment update( Payment object ) { + return null; + } + + public void delete( int id ) { + + } + + public List readAll() { + return null; + } +} diff --git a/bootcamp/src/main/java/com/globant/db/DBConnection.java b/bootcamp/src/main/java/com/globant/db/DBConnection.java new file mode 100644 index 0000000..24596f7 --- /dev/null +++ b/bootcamp/src/main/java/com/globant/db/DBConnection.java @@ -0,0 +1,39 @@ +package com.globant.db; +import java.sql.*; + + +public class DBConnection { + + private static final String USER_NAME = "root"; + private static final String PASSWORD = "Batata+2018*"; + private static final String DB_CONNECTION_STRING = "jdbc:mysql://localhost:3306/shoppingcart"; + private static DBConnection instance; + + private static Connection connection; + + private DBConnection() throws SQLException { + try { + Class.forName("com.mysql.cj.jdbc.Driver"); + this.connection = DriverManager.getConnection(DB_CONNECTION_STRING, USER_NAME , PASSWORD); + } catch (Exception ex) { + System.out.println("Database Connection Creation Failed : " + ex.getMessage()); + } + } + + public Connection getConnection() throws SQLException { + System.out.println("Connected to database"); + return this.connection; + } + + public static DBConnection getInstance() throws SQLException { + if (instance == null) { + instance = new DBConnection(); + } else if (instance.getConnection().isClosed()) { + instance = new DBConnection(); + } + return instance; + } + } + + + diff --git a/bootcamp/src/main/java/com/globant/dto/ClientDTO.java b/bootcamp/src/main/java/com/globant/dto/ClientDTO.java new file mode 100644 index 0000000..0d25346 --- /dev/null +++ b/bootcamp/src/main/java/com/globant/dto/ClientDTO.java @@ -0,0 +1,68 @@ +package com.globant.dto; + +import com.globant.model.Payment; + +import java.util.ArrayList; + +public class ClientDTO { + private String id; + private String name; + private String surmane; + private String description; + private ArrayList PaymentArrayList; + + public ClientDTO() { + } + + public ClientDTO( String id ) { + this.id = id; + } + + public ClientDTO( String id, String name, String surmane, String description, ArrayList paymentArrayList ) { + this.id = id; + this.name = name; + this.surmane = surmane; + this.description = description; + PaymentArrayList = paymentArrayList; + } + + public String getId() { + return id; + } + + public String getName() { + return name; + } + + public String getSurmane() { + return surmane; + } + + public String getDescription() { + return description; + } + + public ArrayList getPaymentArrayList() { + return PaymentArrayList; + } + + public void setId( String id ) { + this.id = id; + } + + public void setName( String name ) { + this.name = name; + } + + public void setSurmane( String surmane ) { + this.surmane = surmane; + } + + public void setDescription( String description ) { + this.description = description; + } + + public void setPaymentArrayList( ArrayList paymentArrayList ) { + PaymentArrayList = paymentArrayList; + } +} diff --git a/bootcamp/src/main/java/com/globant/model/Client.java b/bootcamp/src/main/java/com/globant/model/Client.java index d271f1a..9103fa3 100644 --- a/bootcamp/src/main/java/com/globant/model/Client.java +++ b/bootcamp/src/main/java/com/globant/model/Client.java @@ -1,26 +1,29 @@ package com.globant.model; -public class Client { private int id; +import java.util.ArrayList; + +public class Client { private int id_client; private String name; private String surmane; private String description; - private Payment payment; - public Client(int id, String name, String surname, String descriprion, Payment pyment){ - this.id = id; + private ArrayList PaymentArrayList; + + public Client(int id_client, String name, String surname, String descriprion ){ + this.id_client = id_client; this.name = name; this.surmane = surname; this.description = description; - this.payment = payment; + } - public void setId( int id ) { - this.id = id; + public void setId( int id_cliente ) { + this.id_client = id_client; } public int getId() { - return id; + return this.id_client; } public void setName( String name ) { @@ -47,11 +50,15 @@ public String getDescription() { return description; } - public void setPayment( Payment payment ) { - this.payment = payment; - } - public Payment getPayment() { - return payment; + + @Override + public String toString() { + return "Client{" + + "id_client" + id_client + + ", name='" + name + '\'' + + ", surmane='" + surmane + '\'' + + ", description='" + description + '\'' + + '}'; } } diff --git a/bootcamp/src/main/java/com/globant/model/Item.java b/bootcamp/src/main/java/com/globant/model/Item.java index ec1f718..0fd4bb4 100644 --- a/bootcamp/src/main/java/com/globant/model/Item.java +++ b/bootcamp/src/main/java/com/globant/model/Item.java @@ -4,6 +4,7 @@ public class Item {private int id; private String name; private float price; + public Item( int id, String name, float price){ this.id = id; this.name = name; @@ -33,4 +34,11 @@ public void setPrice( float price ) { public float getPrice() { return price; } + + @Override + public String toString() { + return "Item{" + + "price=" + price + + '}'; + } } diff --git a/bootcamp/src/main/java/com/globant/model/Order.java b/bootcamp/src/main/java/com/globant/model/Order.java index 5f3d763..6f1ab13 100644 --- a/bootcamp/src/main/java/com/globant/model/Order.java +++ b/bootcamp/src/main/java/com/globant/model/Order.java @@ -1,11 +1,13 @@ package com.globant.model; +import java.util.ArrayList; + public class Order {private int id; - private Item item; + private ArrayList PaymentArrayList; public Order(int id, Item item){ this.id = id; - this.item = item; + } @@ -17,11 +19,13 @@ public int getId() { return id; } - public void setItem( Item item ) { - this.item = item; - } - public Item getItem() { - return item; + + @Override + public String toString() { + return "Order{" + + "id=" + id + + + '}'; } } diff --git a/bootcamp/src/main/java/com/globant/model/Payment.java b/bootcamp/src/main/java/com/globant/model/Payment.java index 00bd611..ef193f6 100644 --- a/bootcamp/src/main/java/com/globant/model/Payment.java +++ b/bootcamp/src/main/java/com/globant/model/Payment.java @@ -1,21 +1,22 @@ package com.globant.model; -public class Payment { private int id; +import java.util.ArrayList; + +public class Payment { private int id_payment; private Order order; private float amount; - - public Payment(int id, Order order, float amount){ - this.id = id; + public Payment(int id_payment, Order order, float amount){ + this. id_payment= id_payment; this.order = order; this.amount = amount; } - public void setId( int id ) { - this.id = id; + public void setId( int id_payment ) { + this.id_payment =id_payment ; } - public int getId() { - return id; + public int getid_payment() { + return id_payment; } public void setOrder( Order order ) { @@ -33,4 +34,13 @@ public void setAmount( float amount ) { public float getAmount() { return amount; } + + @Override + public String toString() { + return "Payment{" + + "id_payment=" + id_payment + + ", order=" + order + + ", amount=" + amount + + '}'; + } } From 6867f87c6ece09fa9e1c4ae7167ea36d8af1de5c Mon Sep 17 00:00:00 2001 From: gimenab Date: Wed, 20 Jun 2018 09:41:15 -0300 Subject: [PATCH 3/6] constructors are added in model, dto classes and package controller are created --- bootcamp/src/main/java/com/globant/Main.java | 1 + .../java/com/globant/Service/Service.java | 5 +- .../com/globant/Service/ServiceClient.java | 10 ---- .../java/com/globant/Service/ServiceItem.java | 7 --- .../com/globant/Service/ServiceOrder.java | 8 ---- .../com/globant/Service/ServicePayment.java | 8 ---- .../globant/controler/ClientController.java | 26 ++++++++++ .../com/globant/controler/Controller.java | 12 +++++ .../main/java/com/globant/dao/ClientDAO.java | 39 ++++++++------- .../com/globant/dao/DataAccessObject.java | 13 +++++ .../main/java/com/globant/dao/ItemDAO.java | 4 +- .../main/java/com/globant/dao/OrderDAO.java | 4 +- .../main/java/com/globant/dao/PaymentDAO.java | 4 +- .../main/java/com/globant/dto/ClientDTO.java | 8 ++-- .../main/java/com/globant/dto/ItemDTO.java | 44 +++++++++++++++++ .../main/java/com/globant/dto/OrderDTO.java | 39 +++++++++++++++ .../main/java/com/globant/dto/PaymentDTO.java | 47 +++++++++++++++++++ .../main/java/com/globant/model/Client.java | 45 +++++++++++------- .../src/main/java/com/globant/model/Item.java | 6 +++ .../main/java/com/globant/model/Order.java | 18 +++++-- .../main/java/com/globant/model/Payment.java | 12 ++++- .../com/globant/service/ClientService.java | 29 ++++++++++++ .../java/com/globant/service/ItemService.java | 28 +++++++++++ .../com/globant/service/OrderService.java | 27 +++++++++++ .../com/globant/service/PaymentService.java | 30 ++++++++++++ 25 files changed, 388 insertions(+), 86 deletions(-) delete mode 100644 bootcamp/src/main/java/com/globant/Service/ServiceClient.java delete mode 100644 bootcamp/src/main/java/com/globant/Service/ServiceItem.java delete mode 100644 bootcamp/src/main/java/com/globant/Service/ServiceOrder.java delete mode 100644 bootcamp/src/main/java/com/globant/Service/ServicePayment.java create mode 100644 bootcamp/src/main/java/com/globant/controler/ClientController.java create mode 100644 bootcamp/src/main/java/com/globant/controler/Controller.java create mode 100644 bootcamp/src/main/java/com/globant/dao/DataAccessObject.java create mode 100644 bootcamp/src/main/java/com/globant/dto/ItemDTO.java create mode 100644 bootcamp/src/main/java/com/globant/dto/OrderDTO.java create mode 100644 bootcamp/src/main/java/com/globant/dto/PaymentDTO.java create mode 100644 bootcamp/src/main/java/com/globant/service/ClientService.java create mode 100644 bootcamp/src/main/java/com/globant/service/ItemService.java create mode 100644 bootcamp/src/main/java/com/globant/service/OrderService.java create mode 100644 bootcamp/src/main/java/com/globant/service/PaymentService.java diff --git a/bootcamp/src/main/java/com/globant/Main.java b/bootcamp/src/main/java/com/globant/Main.java index 86e3a04..913a36f 100644 --- a/bootcamp/src/main/java/com/globant/Main.java +++ b/bootcamp/src/main/java/com/globant/Main.java @@ -2,6 +2,7 @@ import com.globant.db.DBConnection; + import java.sql.Connection; import java.sql.SQLException; diff --git a/bootcamp/src/main/java/com/globant/Service/Service.java b/bootcamp/src/main/java/com/globant/Service/Service.java index 818653a..0749923 100644 --- a/bootcamp/src/main/java/com/globant/Service/Service.java +++ b/bootcamp/src/main/java/com/globant/Service/Service.java @@ -1,9 +1,10 @@ -package com.globant.Service; +package com.globant.service; +import java.sql.SQLException; import java.util.List; public interface Service { - public T create (T object); + public T create (T object) ; public T read (int id ); public T update (T object); public void delete(int id); diff --git a/bootcamp/src/main/java/com/globant/Service/ServiceClient.java b/bootcamp/src/main/java/com/globant/Service/ServiceClient.java deleted file mode 100644 index 47fa112..0000000 --- a/bootcamp/src/main/java/com/globant/Service/ServiceClient.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.globant.Service; - -import com.globant.dao.ClientDAO; -import com.globant.model.Client; - -import java.util.List; - -public interface ServiceClient extends Service { - -} diff --git a/bootcamp/src/main/java/com/globant/Service/ServiceItem.java b/bootcamp/src/main/java/com/globant/Service/ServiceItem.java deleted file mode 100644 index 9d21126..0000000 --- a/bootcamp/src/main/java/com/globant/Service/ServiceItem.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.globant.Service; - -import com.globant.model.Item; - -public interface ServiceItem extends Service { - -} diff --git a/bootcamp/src/main/java/com/globant/Service/ServiceOrder.java b/bootcamp/src/main/java/com/globant/Service/ServiceOrder.java deleted file mode 100644 index ddd76ce..0000000 --- a/bootcamp/src/main/java/com/globant/Service/ServiceOrder.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.globant.Service; - -import com.globant.model.Order; - -import java.util.List; - -public interface ServiceOrder extends Service{ -} diff --git a/bootcamp/src/main/java/com/globant/Service/ServicePayment.java b/bootcamp/src/main/java/com/globant/Service/ServicePayment.java deleted file mode 100644 index b6e13fd..0000000 --- a/bootcamp/src/main/java/com/globant/Service/ServicePayment.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.globant.Service; - -import com.globant.model.Payment; - -import java.util.List; - -public interface ServicePayment extends Service{ -} diff --git a/bootcamp/src/main/java/com/globant/controler/ClientController.java b/bootcamp/src/main/java/com/globant/controler/ClientController.java new file mode 100644 index 0000000..f72c844 --- /dev/null +++ b/bootcamp/src/main/java/com/globant/controler/ClientController.java @@ -0,0 +1,26 @@ +package com.globant.controler; + +import java.util.List; + +public class ClientController implements Controller{ + + public Object create( Object object ) { + return null; + } + + public Object read( int id ) { + return null; + } + + public Object update( Object object ) { + return null; + } + + public void delete( int id ) { + + } + + public List readAll() { + return null; + } +} diff --git a/bootcamp/src/main/java/com/globant/controler/Controller.java b/bootcamp/src/main/java/com/globant/controler/Controller.java new file mode 100644 index 0000000..57023ce --- /dev/null +++ b/bootcamp/src/main/java/com/globant/controler/Controller.java @@ -0,0 +1,12 @@ +package com.globant.controler; + +import java.util.List; + +public interface Controller { + public T create (T object) ; + public T read (int id ); + public T update (T object); + public void delete(int id); + + public List readAll(); +} diff --git a/bootcamp/src/main/java/com/globant/dao/ClientDAO.java b/bootcamp/src/main/java/com/globant/dao/ClientDAO.java index a65b075..e2f93c3 100644 --- a/bootcamp/src/main/java/com/globant/dao/ClientDAO.java +++ b/bootcamp/src/main/java/com/globant/dao/ClientDAO.java @@ -1,30 +1,35 @@ -package com.globant.dao; -import com.globant.Service.ServiceClient; -import com.globant.model.Client; +package com.globant.dao; +import com.globant.model.Client; import java.util.List; -public class ClientDAO implements ServiceClient{ +public class ClientDAO implements DataAccessObject { + private static final String CREATE = "INSERT INTO client(name, surname, description) VALUES (?, ?, ?)"; + private static final String READ = "SELECT * FROM client WHERE Id=?"; + private static final String UPDATE = "UPDATE client SET name =?, surname=?, description= ? WHERE id=?"; + private static final String DELETE = "DELETE FROM client WHERE id=?"; + private static final String READ_ALL = "SELECT * FROM client"; - public Client create( Client object ) { + public Client create( Client client ) { return null; - } - public Client read( int id ) { - return null; - } + } + public Client read( int id) { + return null; + } + public Client update(Client client){ - public Client update( Client object ) { - return null; - } + return null; + } - public void delete( int id ) { + public void delete ( int id ){ - } + } + public List readAll(){ + return null; + } - public List readAll() { - return null; } -} + diff --git a/bootcamp/src/main/java/com/globant/dao/DataAccessObject.java b/bootcamp/src/main/java/com/globant/dao/DataAccessObject.java new file mode 100644 index 0000000..0a92914 --- /dev/null +++ b/bootcamp/src/main/java/com/globant/dao/DataAccessObject.java @@ -0,0 +1,13 @@ +package com.globant.dao; + +import java.util.List; + +public interface DataAccessObject{ + + public T create (T object); + public T read (int id ); + public T update (T object); + public void delete(int id); + + public List readAll(); +} diff --git a/bootcamp/src/main/java/com/globant/dao/ItemDAO.java b/bootcamp/src/main/java/com/globant/dao/ItemDAO.java index 4477970..84e9174 100644 --- a/bootcamp/src/main/java/com/globant/dao/ItemDAO.java +++ b/bootcamp/src/main/java/com/globant/dao/ItemDAO.java @@ -1,11 +1,11 @@ package com.globant.dao; -import com.globant.Service.ServiceItem; +import com.globant.service.Service; import com.globant.model.Item; import java.util.List; -public class ItemDAO implements ServiceItem { +public class ItemDAO implements Service { public Item create( Item object ) { return null; } diff --git a/bootcamp/src/main/java/com/globant/dao/OrderDAO.java b/bootcamp/src/main/java/com/globant/dao/OrderDAO.java index b5dd754..b35478f 100644 --- a/bootcamp/src/main/java/com/globant/dao/OrderDAO.java +++ b/bootcamp/src/main/java/com/globant/dao/OrderDAO.java @@ -1,11 +1,11 @@ package com.globant.dao; -import com.globant.Service.ServiceClient; +import com.globant.service.Service; import com.globant.model.Client; import java.util.List; -public class OrderDAO implements ServiceClient{ +public class OrderDAO implements Service { public Client create( Client object ) { return null; } diff --git a/bootcamp/src/main/java/com/globant/dao/PaymentDAO.java b/bootcamp/src/main/java/com/globant/dao/PaymentDAO.java index 519f924..c512843 100644 --- a/bootcamp/src/main/java/com/globant/dao/PaymentDAO.java +++ b/bootcamp/src/main/java/com/globant/dao/PaymentDAO.java @@ -1,11 +1,11 @@ package com.globant.dao; -import com.globant.Service.ServicePayment; +import com.globant.service.Service; import com.globant.model.Payment; import java.util.List; -public class PaymentDAO implements ServicePayment { +public class PaymentDAO implements Service { public Payment create( Payment object ) { return null; } diff --git a/bootcamp/src/main/java/com/globant/dto/ClientDTO.java b/bootcamp/src/main/java/com/globant/dto/ClientDTO.java index 0d25346..d9c2c87 100644 --- a/bootcamp/src/main/java/com/globant/dto/ClientDTO.java +++ b/bootcamp/src/main/java/com/globant/dto/ClientDTO.java @@ -7,7 +7,7 @@ public class ClientDTO { private String id; private String name; - private String surmane; + private String surname; private String description; private ArrayList PaymentArrayList; @@ -21,7 +21,7 @@ public ClientDTO( String id ) { public ClientDTO( String id, String name, String surmane, String description, ArrayList paymentArrayList ) { this.id = id; this.name = name; - this.surmane = surmane; + this.surname = surname; this.description = description; PaymentArrayList = paymentArrayList; } @@ -35,7 +35,7 @@ public String getName() { } public String getSurmane() { - return surmane; + return surname; } public String getDescription() { @@ -55,7 +55,7 @@ public void setName( String name ) { } public void setSurmane( String surmane ) { - this.surmane = surmane; + this.surname = surname; } public void setDescription( String description ) { diff --git a/bootcamp/src/main/java/com/globant/dto/ItemDTO.java b/bootcamp/src/main/java/com/globant/dto/ItemDTO.java new file mode 100644 index 0000000..0587314 --- /dev/null +++ b/bootcamp/src/main/java/com/globant/dto/ItemDTO.java @@ -0,0 +1,44 @@ +package com.globant.dto; + +public class ItemDTO { + private int id; + private String name; + private float price; + + public ItemDTO() { + } + + public ItemDTO( int id ) { + this.id = id; + } + + public ItemDTO( int id, String name, float price ) { + this.id = id; + this.name = name; + this.price = price; + } + + public int getId() { + return id; + } + + public String getName() { + return name; + } + + public float getPrice() { + return price; + } + + public void setId( int id ) { + this.id = id; + } + + public void setName( String name ) { + this.name = name; + } + + public void setPrice( float price ) { + this.price = price; + } +} diff --git a/bootcamp/src/main/java/com/globant/dto/OrderDTO.java b/bootcamp/src/main/java/com/globant/dto/OrderDTO.java new file mode 100644 index 0000000..d544fc7 --- /dev/null +++ b/bootcamp/src/main/java/com/globant/dto/OrderDTO.java @@ -0,0 +1,39 @@ +package com.globant.dto; + +import com.globant.model.Item; + +import java.util.ArrayList; + +public class OrderDTO { + private int id; + private ArrayList ItemList; + + public OrderDTO() { + } + + public OrderDTO( int id ) { + this.id = id; + } + + public OrderDTO( int id, ArrayList itemList ) { + this.id = id; + ItemList = itemList; + } + + public int getId() { + return id; + } + + public ArrayList getItemList() { + return ItemList; + } + + public void setId( int id ) { + this.id = id; + } + + public void setItemList( ArrayList itemList ) { + ItemList = itemList; + } +} + diff --git a/bootcamp/src/main/java/com/globant/dto/PaymentDTO.java b/bootcamp/src/main/java/com/globant/dto/PaymentDTO.java new file mode 100644 index 0000000..0d5865d --- /dev/null +++ b/bootcamp/src/main/java/com/globant/dto/PaymentDTO.java @@ -0,0 +1,47 @@ +package com.globant.dto; + + +import com.globant.model.Order; + +public class PaymentDTO { + private int id; + private Order order; + private float amount; + + public PaymentDTO() { + } + + public PaymentDTO( int id ) { + this.id = id; + } + + public PaymentDTO( int id, Order order, float amount ) { + this.id = id; + this.order = order; + this.amount = amount; + } + + public void setId( int id ) { + this.id = id; + } + + public void setOrder( Order order ) { + this.order = order; + } + + public void setAmount( float amount ) { + this.amount = amount; + } + + public int getId() { + return id; + } + + public Order getOrder() { + return order; + } + + public float getAmount() { + return amount; + } +} diff --git a/bootcamp/src/main/java/com/globant/model/Client.java b/bootcamp/src/main/java/com/globant/model/Client.java index 9103fa3..51f7773 100644 --- a/bootcamp/src/main/java/com/globant/model/Client.java +++ b/bootcamp/src/main/java/com/globant/model/Client.java @@ -2,28 +2,33 @@ import java.util.ArrayList; -public class Client { private int id_client; +public class Client { private int id; private String name; - private String surmane; + private String surname; private String description; - private ArrayList PaymentArrayList; - public Client(int id_client, String name, String surname, String descriprion ){ - this.id_client = id_client; - this.name = name; - this.surmane = surname; - this.description = description; + public Client() { + } + public Client( int id ) { + this.id = id; + } + public Client( int id, String name, String surname, String description, ArrayList paymentArrayList ) { + this.id = id; + this.name = name; + this.surname = surname; + this.description = description; + PaymentArrayList = paymentArrayList; } - public void setId( int id_cliente ) { - this.id_client = id_client; + public void setId( int id ) { + this.id = id; } public int getId() { - return this.id_client; + return this.id; } public void setName( String name ) { @@ -34,12 +39,12 @@ public String getName() { return name; } - public void setSurmane( String surmane ) { - this.surmane = surmane; + public void setSurname( String surname ) { + this.surname =surname ; } - public String getSurmane() { - return surmane; + public String getSurname() { + return surname; } public void setDescription( String description ) { @@ -50,14 +55,20 @@ public String getDescription() { return description; } + public ArrayList getPaymentArrayList() { + return PaymentArrayList; + } + public void setPaymentArrayList( ArrayList paymentArrayList ) { + PaymentArrayList = paymentArrayList; + } @Override public String toString() { return "Client{" + - "id_client" + id_client + + "id_client" + id + ", name='" + name + '\'' + - ", surmane='" + surmane + '\'' + + ", surmane='" + surname + '\'' + ", description='" + description + '\'' + '}'; } diff --git a/bootcamp/src/main/java/com/globant/model/Item.java b/bootcamp/src/main/java/com/globant/model/Item.java index 0fd4bb4..e42f118 100644 --- a/bootcamp/src/main/java/com/globant/model/Item.java +++ b/bootcamp/src/main/java/com/globant/model/Item.java @@ -4,6 +4,12 @@ public class Item {private int id; private String name; private float price; + public Item() { + } + + public Item( int id ) { + this.id = id; + } public Item( int id, String name, float price){ this.id = id; diff --git a/bootcamp/src/main/java/com/globant/model/Order.java b/bootcamp/src/main/java/com/globant/model/Order.java index 6f1ab13..963c35a 100644 --- a/bootcamp/src/main/java/com/globant/model/Order.java +++ b/bootcamp/src/main/java/com/globant/model/Order.java @@ -1,14 +1,24 @@ package com.globant.model; -import java.util.ArrayList; + import java.util.ArrayList; public class Order {private int id; - private ArrayList PaymentArrayList; - public Order(int id, Item item){ + + public Order() { + } + + public Order( int id ) { this.id = id; + } + public Order( int id, ArrayList paymentArrayList ) { + this.id = id; + PaymentArrayList = paymentArrayList; + } + public Order( int id, Item item){ + this.id = id; } public void setId( int id ) { @@ -20,12 +30,10 @@ public int getId() { } - @Override public String toString() { return "Order{" + "id=" + id + - '}'; } } diff --git a/bootcamp/src/main/java/com/globant/model/Payment.java b/bootcamp/src/main/java/com/globant/model/Payment.java index ef193f6..a128dad 100644 --- a/bootcamp/src/main/java/com/globant/model/Payment.java +++ b/bootcamp/src/main/java/com/globant/model/Payment.java @@ -1,11 +1,19 @@ package com.globant.model; -import java.util.ArrayList; + public class Payment { private int id_payment; private Order order; private float amount; - public Payment(int id_payment, Order order, float amount){ + + public Payment() { + } + + public Payment( int id_payment ) { + this.id_payment = id_payment; + } + + public Payment( int id_payment, Order order, float amount){ this. id_payment= id_payment; this.order = order; this.amount = amount; diff --git a/bootcamp/src/main/java/com/globant/service/ClientService.java b/bootcamp/src/main/java/com/globant/service/ClientService.java new file mode 100644 index 0000000..0c9a705 --- /dev/null +++ b/bootcamp/src/main/java/com/globant/service/ClientService.java @@ -0,0 +1,29 @@ +package com.globant.service; + +import com.globant.dto.ClientDTO; + + +import java.util.List; + +public class ClientService implements Service { + + public ClientDTO create( ClientDTO object ) { + return null; + } + + public ClientDTO read( int id ) { + return null; + } + + public ClientDTO update( ClientDTO object ) { + return null; + } + + public void delete( int id ) { + + } + + public List readAll() { + return null; + } +} diff --git a/bootcamp/src/main/java/com/globant/service/ItemService.java b/bootcamp/src/main/java/com/globant/service/ItemService.java new file mode 100644 index 0000000..0cb20e0 --- /dev/null +++ b/bootcamp/src/main/java/com/globant/service/ItemService.java @@ -0,0 +1,28 @@ +package com.globant.service; + +import com.globant.dao.ItemDAO; + +import java.util.List; + +public class ItemService implements Service{ + + public ItemDAO create( ItemDAO object ) { + return null; + } + + public ItemDAO read( int id ) { + return null; + } + + public ItemDAO update( ItemDAO object ) { + return null; + } + + public void delete( int id ) { + + } + + public List readAll() { + return null; + } +} diff --git a/bootcamp/src/main/java/com/globant/service/OrderService.java b/bootcamp/src/main/java/com/globant/service/OrderService.java new file mode 100644 index 0000000..cc75c04 --- /dev/null +++ b/bootcamp/src/main/java/com/globant/service/OrderService.java @@ -0,0 +1,27 @@ +package com.globant.service; + +import com.globant.dto.ClientDTO; + +import java.util.List; + +public class OrderService implements Service { + public ClientDTO create( ClientDTO object ) { + return null; + } + + public ClientDTO read( int id ) { + return null; + } + + public ClientDTO update( ClientDTO object ) { + return null; + } + + public void delete( int id ) { + + } + + public List readAll() { + return null; + } +} diff --git a/bootcamp/src/main/java/com/globant/service/PaymentService.java b/bootcamp/src/main/java/com/globant/service/PaymentService.java new file mode 100644 index 0000000..a519ec4 --- /dev/null +++ b/bootcamp/src/main/java/com/globant/service/PaymentService.java @@ -0,0 +1,30 @@ +package com.globant.service; + +import com.globant.dao.PaymentDAO; +import com.globant.dto.PaymentDTO; + +import java.util.List; + +public class PaymentService implements Service{ + + + public PaymentDTO create( PaymentDTO object ) { + return null; + } + + public PaymentDTO read( int id ) { + return null; + } + + public PaymentDTO update( PaymentDTO object ) { + return null; + } + + public void delete( int id ) { + + } + + public List readAll() { + return null; + } +} From 235098bcd83bfde53f048d223e3b3d171e768ad3 Mon Sep 17 00:00:00 2001 From: gimenab Date: Thu, 21 Jun 2018 17:12:19 -0300 Subject: [PATCH 4/6] crud methods are added on the clientDAo class --- bootcamp/src/main/java/com/globant/Main.java | 4 + .../main/java/com/globant/dao/ClientDAO.java | 130 ++++++++++++++++-- .../main/java/com/globant/dto/ClientDTO.java | 13 +- .../main/java/com/globant/dto/OrderDTO.java | 9 +- .../main/java/com/globant/model/Client.java | 31 +++-- .../main/java/com/globant/model/Order.java | 7 +- 6 files changed, 161 insertions(+), 33 deletions(-) diff --git a/bootcamp/src/main/java/com/globant/Main.java b/bootcamp/src/main/java/com/globant/Main.java index 913a36f..2d5ceb2 100644 --- a/bootcamp/src/main/java/com/globant/Main.java +++ b/bootcamp/src/main/java/com/globant/Main.java @@ -1,6 +1,7 @@ package com.globant; import com.globant.db.DBConnection; +import com.globant.model.Client; import java.sql.Connection; @@ -20,5 +21,8 @@ public static void main( String[] args){ e.printStackTrace(); } + + + } } diff --git a/bootcamp/src/main/java/com/globant/dao/ClientDAO.java b/bootcamp/src/main/java/com/globant/dao/ClientDAO.java index e2f93c3..9471daf 100644 --- a/bootcamp/src/main/java/com/globant/dao/ClientDAO.java +++ b/bootcamp/src/main/java/com/globant/dao/ClientDAO.java @@ -1,35 +1,141 @@ package com.globant.dao; + +import com.globant.db.DBConnection; import com.globant.model.Client; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; import java.util.List; public class ClientDAO implements DataAccessObject { - private static final String CREATE = "INSERT INTO client(name, surname, description) VALUES (?, ?, ?)"; - private static final String READ = "SELECT * FROM client WHERE Id=?"; - private static final String UPDATE = "UPDATE client SET name =?, surname=?, description= ? WHERE id=?"; - private static final String DELETE = "DELETE FROM client WHERE id=?"; + private static final String CREATE = "INSERT INTO client(firstName, lastName, description) VALUES (?, ?, ?)"; + private static final String READ = "SELECT * FROM client WHERE IdClient=?"; + private static final String UPDATE = "UPDATE client SET firstName =?, lastName=?, description= ? WHERE idClient=?"; + private static final String DELETE = "DELETE FROM client WHERE idClient=?"; private static final String READ_ALL = "SELECT * FROM client"; public Client create( Client client ) { - return null; + + try { + DBConnection dbConnection = DBConnection.getInstance ( ); + Connection connection = dbConnection.getConnection ( ); + PreparedStatement statement = connection.prepareStatement (CREATE); + statement.setString (1, client.getName ( )); + statement.setString (2, client.getSurname ( )); + statement.setString (3, client.getDescription ( )); + + ResultSet resultset = statement.executeQuery ( ); + String name = resultset.getString ("firsName"); + String lastname = resultset.getString ("lastName"); + String description = resultset.getString ("description"); + int clientid = resultset.getInt ("idClient"); + + + return new Client ( clientid,name, lastname, description); + + + + } catch (SQLException e) { + System.out.print ("error: client could not be created "+e.getMessage()); } - public Client read( int id) { - return null; + return null; + + } + public Client read( int id) { + + try { + DBConnection dbConnection = DBConnection.getInstance ( ); + Connection connection = dbConnection.getConnection ( ); + PreparedStatement statement = connection.prepareStatement (READ); + statement.setInt (1, id); + + ResultSet resultset = statement.executeQuery ( ); + String name = resultset.getString ("firsName"); + String lastname = resultset.getString ("lastName"); + String description = resultset.getString ("description"); + int clientid = resultset.getInt ("idClient"); + + return new Client (clientid, name, lastname, description); + + } catch (SQLException e) { + System.out.print ("error: client not found "+e.getMessage()); } - public Client update(Client client){ + return null; + } + public Client update( Client client){ + try { + DBConnection dbConnection = DBConnection.getInstance ( ); + Connection connection = dbConnection.getConnection ( ); + PreparedStatement statement = connection.prepareStatement (UPDATE); + statement.setString (1, client.getName ( )); + statement.setString (2, client.getSurname ( )); + statement.setString (3, client.getDescription ( )); + statement.setInt (4,client.getId()); + + statement.executeQuery ( ); + return client; + + } catch (SQLException e) { + System.out.print ("error: client has not been updated"+e.getMessage()); - return null; } + return null; - public void delete ( int id ){ + } + + + public void delete ( int id ){ + try { + DBConnection dbConnection = DBConnection.getInstance ( ); + Connection connection = dbConnection.getConnection ( ); + PreparedStatement statement = connection.prepareStatement (DELETE); + statement.setInt (1, id); + + statement.executeQuery ( ); + + } catch (SQLException e) { + System.out.print ("error: client not found "+e.getMessage()); } - public List readAll(){ - return null; + } + public List readAll(){ + + try { + DBConnection dbConnection = DBConnection.getInstance ( ); + Connection connection = dbConnection.getConnection ( ); + PreparedStatement statement = connection.prepareStatement (READ_ALL); + List clients = new ArrayList(); + + ResultSet resultset = statement.executeQuery ( ); + while (resultset.next ()){ + int idClient = resultset.getInt ("idClient"); + String name = resultset.getString ("firsName"); + String lastname = resultset.getString ("lastName"); + String descrption = resultset.getString ("description"); + + Client client= new Client (idClient, name,lastname, descrption); + + + + clients.add (client); + } + + + return clients; + + } catch (SQLException e) { + System.out.print ("error: customers were not found"+e.getMessage()); + } + return null; } + +} diff --git a/bootcamp/src/main/java/com/globant/dto/ClientDTO.java b/bootcamp/src/main/java/com/globant/dto/ClientDTO.java index d9c2c87..bdc6d8e 100644 --- a/bootcamp/src/main/java/com/globant/dto/ClientDTO.java +++ b/bootcamp/src/main/java/com/globant/dto/ClientDTO.java @@ -3,13 +3,14 @@ import com.globant.model.Payment; import java.util.ArrayList; +import java.util.List; public class ClientDTO { private String id; private String name; private String surname; private String description; - private ArrayList PaymentArrayList; + private List PaymentList = new ArrayList (); public ClientDTO() { } @@ -23,7 +24,7 @@ public ClientDTO( String id, String name, String surmane, String description, Ar this.name = name; this.surname = surname; this.description = description; - PaymentArrayList = paymentArrayList; + this.PaymentList = PaymentList; } public String getId() { @@ -42,8 +43,8 @@ public String getDescription() { return description; } - public ArrayList getPaymentArrayList() { - return PaymentArrayList; + public List getPaymentList() { + return PaymentList; } public void setId( String id ) { @@ -62,7 +63,7 @@ public void setDescription( String description ) { this.description = description; } - public void setPaymentArrayList( ArrayList paymentArrayList ) { - PaymentArrayList = paymentArrayList; + public void setPaymentList( ArrayList PaymentList ) { + PaymentList = PaymentList; } } diff --git a/bootcamp/src/main/java/com/globant/dto/OrderDTO.java b/bootcamp/src/main/java/com/globant/dto/OrderDTO.java index d544fc7..bb4dd96 100644 --- a/bootcamp/src/main/java/com/globant/dto/OrderDTO.java +++ b/bootcamp/src/main/java/com/globant/dto/OrderDTO.java @@ -3,10 +3,11 @@ import com.globant.model.Item; import java.util.ArrayList; +import java.util.List; public class OrderDTO { private int id; - private ArrayList ItemList; + private List ItemList = new ArrayList (); public OrderDTO() { } @@ -15,7 +16,7 @@ public OrderDTO( int id ) { this.id = id; } - public OrderDTO( int id, ArrayList itemList ) { + public OrderDTO( int id, List itemList ) { this.id = id; ItemList = itemList; } @@ -24,7 +25,7 @@ public int getId() { return id; } - public ArrayList getItemList() { + public List getItemList() { return ItemList; } @@ -32,7 +33,7 @@ public void setId( int id ) { this.id = id; } - public void setItemList( ArrayList itemList ) { + public void setItemList( List itemList ) { ItemList = itemList; } } diff --git a/bootcamp/src/main/java/com/globant/model/Client.java b/bootcamp/src/main/java/com/globant/model/Client.java index 51f7773..ebe1ac5 100644 --- a/bootcamp/src/main/java/com/globant/model/Client.java +++ b/bootcamp/src/main/java/com/globant/model/Client.java @@ -1,28 +1,43 @@ package com.globant.model; +import javax.management.Descriptor; import java.util.ArrayList; +import java.util.List; public class Client { private int id; private String name; private String surname; private String description; - private ArrayList PaymentArrayList; + private List PaymentList = new ArrayList (); + + public Client( String name, String surname, String description ) { + this.name = name; + this.surname = surname; + this.description=description; - public Client() { + } + + public Client( int id, String name, String surname, String description ) { + this.id= id; + this.name = name; + this.surname = surname; + this.description= description; } public Client( int id ) { this.id = id; } - public Client( int id, String name, String surname, String description, ArrayList paymentArrayList ) { + public Client( int id, String name, String surname, String description,List PaymentList) { this.id = id; this.name = name; this.surname = surname; this.description = description; - PaymentArrayList = paymentArrayList; + this.PaymentList = PaymentList; } + + public void setId( int id ) { this.id = id; } @@ -55,12 +70,12 @@ public String getDescription() { return description; } - public ArrayList getPaymentArrayList() { - return PaymentArrayList; + public List getPaymentList() { + return PaymentList; } - public void setPaymentArrayList( ArrayList paymentArrayList ) { - PaymentArrayList = paymentArrayList; + public void setPaymentList( ArrayList PaymentList ) { + PaymentList = PaymentList; } @Override diff --git a/bootcamp/src/main/java/com/globant/model/Order.java b/bootcamp/src/main/java/com/globant/model/Order.java index 963c35a..810919e 100644 --- a/bootcamp/src/main/java/com/globant/model/Order.java +++ b/bootcamp/src/main/java/com/globant/model/Order.java @@ -1,9 +1,10 @@ package com.globant.model; import java.util.ArrayList; + import java.util.List; public class Order {private int id; - private ArrayList PaymentArrayList; + private List ItemList = new ArrayList (); public Order() { } @@ -12,9 +13,9 @@ public Order( int id ) { this.id = id; } - public Order( int id, ArrayList paymentArrayList ) { + public Order( int id, List ItemList ) { this.id = id; - PaymentArrayList = paymentArrayList; + ItemList = ItemList; } public Order( int id, Item item){ From 5ddc7ee0b133fe72ab0ded72b89484be72100a56 Mon Sep 17 00:00:00 2001 From: gimenab Date: Mon, 25 Jun 2018 12:47:47 -0300 Subject: [PATCH 5/6] dependencies are added in pom --- bootcamp/pom.xml | 32 +++++++++++++++++++ bootcamp/src/main/java/com/globant/Main.java | 2 +- .../main/resources/WEB-INF/spring-servlet.xml | 0 bootcamp/src/main/resources/WEB-INF/web.xml | 0 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 bootcamp/src/main/resources/WEB-INF/spring-servlet.xml create mode 100644 bootcamp/src/main/resources/WEB-INF/web.xml diff --git a/bootcamp/pom.xml b/bootcamp/pom.xml index 7bf8d56..dd18cb7 100644 --- a/bootcamp/pom.xml +++ b/bootcamp/pom.xml @@ -14,6 +14,38 @@ mysql-connector-java 8.0.11 + + commons-logging + commons-logging + 1.2 + + + + org.springframework + spring-core + 5.0.7.RELEASE + + + org.springframework + spring-web + 5.0.7.RELEASE + + + com.fasterxml.jackson.core + jackson-databind + 2.9.6 + + + org.springframework + spring-webmvc + 5.0.7.RELEASE + + + + + + + diff --git a/bootcamp/src/main/java/com/globant/Main.java b/bootcamp/src/main/java/com/globant/Main.java index 2d5ceb2..e4a4310 100644 --- a/bootcamp/src/main/java/com/globant/Main.java +++ b/bootcamp/src/main/java/com/globant/Main.java @@ -1,7 +1,7 @@ package com.globant; import com.globant.db.DBConnection; -import com.globant.model.Client; + import java.sql.Connection; diff --git a/bootcamp/src/main/resources/WEB-INF/spring-servlet.xml b/bootcamp/src/main/resources/WEB-INF/spring-servlet.xml new file mode 100644 index 0000000..e69de29 diff --git a/bootcamp/src/main/resources/WEB-INF/web.xml b/bootcamp/src/main/resources/WEB-INF/web.xml new file mode 100644 index 0000000..e69de29 From aa14b746a373fe3d5079a55b5140b6283920c224 Mon Sep 17 00:00:00 2001 From: Pedro Aguiar Date: Wed, 27 Jun 2018 18:50:16 -0300 Subject: [PATCH 6/6] shit works --- bootcamp/src/main/java/com/globant/Main.java | 28 ---------- .../java/com/globant/Service/Service.java | 13 ----- .../globant/controler/ClientController.java | 26 --------- .../com/globant/controler/Controller.java | 12 ----- .../com/globant/dao/DataAccessObject.java | 13 ----- .../com/globant/service/ClientService.java | 29 ---------- .../main/resources/WEB-INF/spring-servlet.xml | 0 bootcamp/src/main/resources/WEB-INF/web.xml | 0 bootcamp/pom.xml => pom.xml | 37 +++++++++---- .../com/globant/config/AppConfiguration.java | 10 ++++ .../globant/controller/ClientController.java | 54 +++++++++++++++++++ .../globant/controller/ItemController.java | 7 +++ .../globant/controller/OrderController.java | 7 +++ .../globant/controller/PaymentController.java | 7 +++ .../main/java/com/globant/dao/ClientDAO.java | 5 +- .../com/globant/dao/DataAccessObject.java | 11 ++++ .../main/java/com/globant/dao/ItemDAO.java | 5 +- .../main/java/com/globant/dao/OrderDAO.java | 5 +- .../main/java/com/globant/dao/PaymentDAO.java | 7 +-- .../java/com/globant/db/DBConnection.java | 5 +- .../main/java/com/globant/dto/ClientDTO.java | 16 +++--- .../main/java/com/globant/dto/ItemDTO.java | 0 .../main/java/com/globant/dto/OrderDTO.java | 0 .../main/java/com/globant/dto/PaymentDTO.java | 0 .../main/java/com/globant/model/Client.java | 5 +- .../main/java/com/globant/model/Item.java | 0 .../main/java/com/globant/model/Order.java | 0 .../main/java/com/globant/model/Payment.java | 0 src/main/java/com/globant/service/CRUD.java | 11 ++++ .../com/globant/service/ClientService.java | 45 ++++++++++++++++ .../java/com/globant/service/ItemService.java | 2 +- .../com/globant/service/OrderService.java | 2 +- .../com/globant/service/PaymentService.java | 6 +-- src/main/java/com/globant/util/DTOUtils.java | 15 ++++++ .../java/com/globant/util/ModelUtils.java | 15 ++++++ src/main/resources/WEB-INF/web.xml | 15 ++++++ 36 files changed, 255 insertions(+), 158 deletions(-) delete mode 100644 bootcamp/src/main/java/com/globant/Main.java delete mode 100644 bootcamp/src/main/java/com/globant/Service/Service.java delete mode 100644 bootcamp/src/main/java/com/globant/controler/ClientController.java delete mode 100644 bootcamp/src/main/java/com/globant/controler/Controller.java delete mode 100644 bootcamp/src/main/java/com/globant/dao/DataAccessObject.java delete mode 100644 bootcamp/src/main/java/com/globant/service/ClientService.java delete mode 100644 bootcamp/src/main/resources/WEB-INF/spring-servlet.xml delete mode 100644 bootcamp/src/main/resources/WEB-INF/web.xml rename bootcamp/pom.xml => pom.xml (62%) create mode 100644 src/main/java/com/globant/config/AppConfiguration.java create mode 100644 src/main/java/com/globant/controller/ClientController.java create mode 100644 src/main/java/com/globant/controller/ItemController.java create mode 100644 src/main/java/com/globant/controller/OrderController.java create mode 100644 src/main/java/com/globant/controller/PaymentController.java rename {bootcamp/src => src}/main/java/com/globant/dao/ClientDAO.java (97%) create mode 100644 src/main/java/com/globant/dao/DataAccessObject.java rename {bootcamp/src => src}/main/java/com/globant/dao/ItemDAO.java (76%) rename {bootcamp/src => src}/main/java/com/globant/dao/OrderDAO.java (76%) rename {bootcamp/src => src}/main/java/com/globant/dao/PaymentDAO.java (76%) rename {bootcamp/src => src}/main/java/com/globant/db/DBConnection.java (99%) rename {bootcamp/src => src}/main/java/com/globant/dto/ClientDTO.java (71%) rename {bootcamp/src => src}/main/java/com/globant/dto/ItemDTO.java (100%) rename {bootcamp/src => src}/main/java/com/globant/dto/OrderDTO.java (100%) rename {bootcamp/src => src}/main/java/com/globant/dto/PaymentDTO.java (100%) rename {bootcamp/src => src}/main/java/com/globant/model/Client.java (95%) rename {bootcamp/src => src}/main/java/com/globant/model/Item.java (100%) rename {bootcamp/src => src}/main/java/com/globant/model/Order.java (100%) rename {bootcamp/src => src}/main/java/com/globant/model/Payment.java (100%) create mode 100644 src/main/java/com/globant/service/CRUD.java create mode 100644 src/main/java/com/globant/service/ClientService.java rename {bootcamp/src => src}/main/java/com/globant/service/ItemService.java (88%) rename {bootcamp/src => src}/main/java/com/globant/service/OrderService.java (87%) rename {bootcamp/src => src}/main/java/com/globant/service/PaymentService.java (71%) create mode 100644 src/main/java/com/globant/util/DTOUtils.java create mode 100644 src/main/java/com/globant/util/ModelUtils.java create mode 100644 src/main/resources/WEB-INF/web.xml diff --git a/bootcamp/src/main/java/com/globant/Main.java b/bootcamp/src/main/java/com/globant/Main.java deleted file mode 100644 index e4a4310..0000000 --- a/bootcamp/src/main/java/com/globant/Main.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.globant; - -import com.globant.db.DBConnection; - - - -import java.sql.Connection; -import java.sql.SQLException; - -public class Main { - - - - public static void main( String[] args){ - - try { - DBConnection shoppingc = DBConnection.getInstance(); - Connection connection = shoppingc.getConnection(); - System.out.println(connection.toString()); - } catch (SQLException e) { - e.printStackTrace(); - } - - - - - } -} diff --git a/bootcamp/src/main/java/com/globant/Service/Service.java b/bootcamp/src/main/java/com/globant/Service/Service.java deleted file mode 100644 index 0749923..0000000 --- a/bootcamp/src/main/java/com/globant/Service/Service.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.globant.service; - -import java.sql.SQLException; -import java.util.List; - -public interface Service { - public T create (T object) ; - public T read (int id ); - public T update (T object); - public void delete(int id); - - public List readAll(); -} diff --git a/bootcamp/src/main/java/com/globant/controler/ClientController.java b/bootcamp/src/main/java/com/globant/controler/ClientController.java deleted file mode 100644 index f72c844..0000000 --- a/bootcamp/src/main/java/com/globant/controler/ClientController.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.globant.controler; - -import java.util.List; - -public class ClientController implements Controller{ - - public Object create( Object object ) { - return null; - } - - public Object read( int id ) { - return null; - } - - public Object update( Object object ) { - return null; - } - - public void delete( int id ) { - - } - - public List readAll() { - return null; - } -} diff --git a/bootcamp/src/main/java/com/globant/controler/Controller.java b/bootcamp/src/main/java/com/globant/controler/Controller.java deleted file mode 100644 index 57023ce..0000000 --- a/bootcamp/src/main/java/com/globant/controler/Controller.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.globant.controler; - -import java.util.List; - -public interface Controller { - public T create (T object) ; - public T read (int id ); - public T update (T object); - public void delete(int id); - - public List readAll(); -} diff --git a/bootcamp/src/main/java/com/globant/dao/DataAccessObject.java b/bootcamp/src/main/java/com/globant/dao/DataAccessObject.java deleted file mode 100644 index 0a92914..0000000 --- a/bootcamp/src/main/java/com/globant/dao/DataAccessObject.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.globant.dao; - -import java.util.List; - -public interface DataAccessObject{ - - public T create (T object); - public T read (int id ); - public T update (T object); - public void delete(int id); - - public List readAll(); -} diff --git a/bootcamp/src/main/java/com/globant/service/ClientService.java b/bootcamp/src/main/java/com/globant/service/ClientService.java deleted file mode 100644 index 0c9a705..0000000 --- a/bootcamp/src/main/java/com/globant/service/ClientService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.globant.service; - -import com.globant.dto.ClientDTO; - - -import java.util.List; - -public class ClientService implements Service { - - public ClientDTO create( ClientDTO object ) { - return null; - } - - public ClientDTO read( int id ) { - return null; - } - - public ClientDTO update( ClientDTO object ) { - return null; - } - - public void delete( int id ) { - - } - - public List readAll() { - return null; - } -} diff --git a/bootcamp/src/main/resources/WEB-INF/spring-servlet.xml b/bootcamp/src/main/resources/WEB-INF/spring-servlet.xml deleted file mode 100644 index e69de29..0000000 diff --git a/bootcamp/src/main/resources/WEB-INF/web.xml b/bootcamp/src/main/resources/WEB-INF/web.xml deleted file mode 100644 index e69de29..0000000 diff --git a/bootcamp/pom.xml b/pom.xml similarity index 62% rename from bootcamp/pom.xml rename to pom.xml index dd18cb7..8c79c15 100644 --- a/bootcamp/pom.xml +++ b/pom.xml @@ -6,8 +6,15 @@ com.globant shoppingcart + 0.1 + war + + + 1.8 + 1.8 + + - 1.0-SNAPSHOT mysql @@ -19,7 +26,6 @@ commons-logging 1.2 - org.springframework spring-core @@ -40,14 +46,27 @@ spring-webmvc 5.0.7.RELEASE - - - - - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.5.1 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-war-plugin + + src/main/resources/WEB-INF/web.xml + + + + \ No newline at end of file diff --git a/src/main/java/com/globant/config/AppConfiguration.java b/src/main/java/com/globant/config/AppConfiguration.java new file mode 100644 index 0000000..7e54f5e --- /dev/null +++ b/src/main/java/com/globant/config/AppConfiguration.java @@ -0,0 +1,10 @@ +package com.globant.config; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ComponentScan("com.globant") +public class AppConfiguration { + +} diff --git a/src/main/java/com/globant/controller/ClientController.java b/src/main/java/com/globant/controller/ClientController.java new file mode 100644 index 0000000..e91b015 --- /dev/null +++ b/src/main/java/com/globant/controller/ClientController.java @@ -0,0 +1,54 @@ +package com.globant.controller; + +import com.globant.dto.ClientDTO; +import com.globant.service.ClientService; +import com.globant.service.CRUD; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +@RestController +public class ClientController { + + private final CRUD clientService; + + @Autowired + public ClientController(ClientService clientService) { + this.clientService = clientService; + } + + @RequestMapping(value = "/createClient", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + public ClientDTO create(ClientDTO clientDTO) { + validate(clientDTO); + return clientService.create(clientDTO); + } + + @RequestMapping(value = "/retrieveClient", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + public ClientDTO read(int clientId) { + return clientService.read(clientId); + } + + @RequestMapping(value = "/updateClient", method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_VALUE) + public ClientDTO update(ClientDTO clientDTO) { + validate(clientDTO); + return clientService.update(clientDTO); + } + + @RequestMapping(value = "/deleteClient", method = RequestMethod.DELETE, produces = MediaType.APPLICATION_JSON_VALUE) + public void delete(int clientId) { + clientService.delete(clientId); + } + + @RequestMapping(value = "/retrieveClient", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + public List readAll(List clientIds) { + return clientService.readAll(); + } + + private void validate(ClientDTO clientDTO) { + if (clientDTO == null) + throw new IllegalArgumentException("object cannot be null"); + } +} diff --git a/src/main/java/com/globant/controller/ItemController.java b/src/main/java/com/globant/controller/ItemController.java new file mode 100644 index 0000000..db591c2 --- /dev/null +++ b/src/main/java/com/globant/controller/ItemController.java @@ -0,0 +1,7 @@ +package com.globant.controller; + +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class ItemController { +} diff --git a/src/main/java/com/globant/controller/OrderController.java b/src/main/java/com/globant/controller/OrderController.java new file mode 100644 index 0000000..9bffbaa --- /dev/null +++ b/src/main/java/com/globant/controller/OrderController.java @@ -0,0 +1,7 @@ +package com.globant.controller; + +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class OrderController { +} diff --git a/src/main/java/com/globant/controller/PaymentController.java b/src/main/java/com/globant/controller/PaymentController.java new file mode 100644 index 0000000..4650ea8 --- /dev/null +++ b/src/main/java/com/globant/controller/PaymentController.java @@ -0,0 +1,7 @@ +package com.globant.controller; + +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class PaymentController { +} diff --git a/bootcamp/src/main/java/com/globant/dao/ClientDAO.java b/src/main/java/com/globant/dao/ClientDAO.java similarity index 97% rename from bootcamp/src/main/java/com/globant/dao/ClientDAO.java rename to src/main/java/com/globant/dao/ClientDAO.java index 9471daf..4755536 100644 --- a/bootcamp/src/main/java/com/globant/dao/ClientDAO.java +++ b/src/main/java/com/globant/dao/ClientDAO.java @@ -4,6 +4,8 @@ import com.globant.db.DBConnection; import com.globant.model.Client; +import org.springframework.stereotype.Repository; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -11,6 +13,7 @@ import java.util.ArrayList; import java.util.List; +@Repository public class ClientDAO implements DataAccessObject { private static final String CREATE = "INSERT INTO client(firstName, lastName, description) VALUES (?, ?, ?)"; @@ -19,7 +22,7 @@ public class ClientDAO implements DataAccessObject { private static final String DELETE = "DELETE FROM client WHERE idClient=?"; private static final String READ_ALL = "SELECT * FROM client"; - public Client create( Client client ) { + public Client create(Client client) { try { DBConnection dbConnection = DBConnection.getInstance ( ); diff --git a/src/main/java/com/globant/dao/DataAccessObject.java b/src/main/java/com/globant/dao/DataAccessObject.java new file mode 100644 index 0000000..a561b0b --- /dev/null +++ b/src/main/java/com/globant/dao/DataAccessObject.java @@ -0,0 +1,11 @@ +package com.globant.dao; + +import java.util.List; + +public interface DataAccessObject{ + T create(T object); + T read(int id ); + T update(T object); + void delete(int id); + List readAll(); +} diff --git a/bootcamp/src/main/java/com/globant/dao/ItemDAO.java b/src/main/java/com/globant/dao/ItemDAO.java similarity index 76% rename from bootcamp/src/main/java/com/globant/dao/ItemDAO.java rename to src/main/java/com/globant/dao/ItemDAO.java index 84e9174..5324c07 100644 --- a/bootcamp/src/main/java/com/globant/dao/ItemDAO.java +++ b/src/main/java/com/globant/dao/ItemDAO.java @@ -1,11 +1,12 @@ package com.globant.dao; -import com.globant.service.Service; import com.globant.model.Item; +import org.springframework.stereotype.Repository; import java.util.List; -public class ItemDAO implements Service { +@Repository +public class ItemDAO implements DataAccessObject { public Item create( Item object ) { return null; } diff --git a/bootcamp/src/main/java/com/globant/dao/OrderDAO.java b/src/main/java/com/globant/dao/OrderDAO.java similarity index 76% rename from bootcamp/src/main/java/com/globant/dao/OrderDAO.java rename to src/main/java/com/globant/dao/OrderDAO.java index b35478f..03d9d60 100644 --- a/bootcamp/src/main/java/com/globant/dao/OrderDAO.java +++ b/src/main/java/com/globant/dao/OrderDAO.java @@ -1,11 +1,12 @@ package com.globant.dao; -import com.globant.service.Service; import com.globant.model.Client; +import org.springframework.stereotype.Repository; import java.util.List; -public class OrderDAO implements Service { +@Repository +public class OrderDAO implements DataAccessObject { public Client create( Client object ) { return null; } diff --git a/bootcamp/src/main/java/com/globant/dao/PaymentDAO.java b/src/main/java/com/globant/dao/PaymentDAO.java similarity index 76% rename from bootcamp/src/main/java/com/globant/dao/PaymentDAO.java rename to src/main/java/com/globant/dao/PaymentDAO.java index c512843..55089a1 100644 --- a/bootcamp/src/main/java/com/globant/dao/PaymentDAO.java +++ b/src/main/java/com/globant/dao/PaymentDAO.java @@ -1,11 +1,12 @@ package com.globant.dao; -import com.globant.service.Service; import com.globant.model.Payment; - +import org.springframework.stereotype.Repository; import java.util.List; -public class PaymentDAO implements Service { +@Repository +public class PaymentDAO implements DataAccessObject { + public Payment create( Payment object ) { return null; } diff --git a/bootcamp/src/main/java/com/globant/db/DBConnection.java b/src/main/java/com/globant/db/DBConnection.java similarity index 99% rename from bootcamp/src/main/java/com/globant/db/DBConnection.java rename to src/main/java/com/globant/db/DBConnection.java index 24596f7..b673bbe 100644 --- a/bootcamp/src/main/java/com/globant/db/DBConnection.java +++ b/src/main/java/com/globant/db/DBConnection.java @@ -33,7 +33,4 @@ public static DBConnection getInstance() throws SQLException { } return instance; } - } - - - + } \ No newline at end of file diff --git a/bootcamp/src/main/java/com/globant/dto/ClientDTO.java b/src/main/java/com/globant/dto/ClientDTO.java similarity index 71% rename from bootcamp/src/main/java/com/globant/dto/ClientDTO.java rename to src/main/java/com/globant/dto/ClientDTO.java index bdc6d8e..e65380a 100644 --- a/bootcamp/src/main/java/com/globant/dto/ClientDTO.java +++ b/src/main/java/com/globant/dto/ClientDTO.java @@ -6,20 +6,20 @@ import java.util.List; public class ClientDTO { - private String id; + private Integer id; private String name; private String surname; private String description; - private List PaymentList = new ArrayList (); + private List PaymentList = new ArrayList (); public ClientDTO() { } - public ClientDTO( String id ) { + public ClientDTO(Integer id ) { this.id = id; } - public ClientDTO( String id, String name, String surmane, String description, ArrayList paymentArrayList ) { + public ClientDTO(Integer id, String name, String surmane, String description, List paymentArrayList) { this.id = id; this.name = name; this.surname = surname; @@ -27,7 +27,7 @@ public ClientDTO( String id, String name, String surmane, String description, Ar this.PaymentList = PaymentList; } - public String getId() { + public Integer getId() { return id; } @@ -47,7 +47,7 @@ public List getPaymentList() { return PaymentList; } - public void setId( String id ) { + public void setId(Integer id ) { this.id = id; } @@ -63,7 +63,7 @@ public void setDescription( String description ) { this.description = description; } - public void setPaymentList( ArrayList PaymentList ) { - PaymentList = PaymentList; + public void setPaymentList(List PaymentList) { + this.PaymentList = PaymentList; } } diff --git a/bootcamp/src/main/java/com/globant/dto/ItemDTO.java b/src/main/java/com/globant/dto/ItemDTO.java similarity index 100% rename from bootcamp/src/main/java/com/globant/dto/ItemDTO.java rename to src/main/java/com/globant/dto/ItemDTO.java diff --git a/bootcamp/src/main/java/com/globant/dto/OrderDTO.java b/src/main/java/com/globant/dto/OrderDTO.java similarity index 100% rename from bootcamp/src/main/java/com/globant/dto/OrderDTO.java rename to src/main/java/com/globant/dto/OrderDTO.java diff --git a/bootcamp/src/main/java/com/globant/dto/PaymentDTO.java b/src/main/java/com/globant/dto/PaymentDTO.java similarity index 100% rename from bootcamp/src/main/java/com/globant/dto/PaymentDTO.java rename to src/main/java/com/globant/dto/PaymentDTO.java diff --git a/bootcamp/src/main/java/com/globant/model/Client.java b/src/main/java/com/globant/model/Client.java similarity index 95% rename from bootcamp/src/main/java/com/globant/model/Client.java rename to src/main/java/com/globant/model/Client.java index ebe1ac5..54ea4b0 100644 --- a/bootcamp/src/main/java/com/globant/model/Client.java +++ b/src/main/java/com/globant/model/Client.java @@ -24,11 +24,12 @@ public Client( int id, String name, String surname, String description ) { this.description= description; } + public Client( int id ) { this.id = id; } - public Client( int id, String name, String surname, String description,List PaymentList) { + public Client( int id, String name, String surname, String description, List PaymentList) { this.id = id; this.name = name; this.surname = surname; @@ -70,7 +71,7 @@ public String getDescription() { return description; } - public List getPaymentList() { + public List getPaymentList() { return PaymentList; } diff --git a/bootcamp/src/main/java/com/globant/model/Item.java b/src/main/java/com/globant/model/Item.java similarity index 100% rename from bootcamp/src/main/java/com/globant/model/Item.java rename to src/main/java/com/globant/model/Item.java diff --git a/bootcamp/src/main/java/com/globant/model/Order.java b/src/main/java/com/globant/model/Order.java similarity index 100% rename from bootcamp/src/main/java/com/globant/model/Order.java rename to src/main/java/com/globant/model/Order.java diff --git a/bootcamp/src/main/java/com/globant/model/Payment.java b/src/main/java/com/globant/model/Payment.java similarity index 100% rename from bootcamp/src/main/java/com/globant/model/Payment.java rename to src/main/java/com/globant/model/Payment.java diff --git a/src/main/java/com/globant/service/CRUD.java b/src/main/java/com/globant/service/CRUD.java new file mode 100644 index 0000000..0a41902 --- /dev/null +++ b/src/main/java/com/globant/service/CRUD.java @@ -0,0 +1,11 @@ +package com.globant.service; + +import java.util.List; + +public interface CRUD { + T create (T object) ; + T read (int id ); + T update (T object); + void delete(int id); + List readAll(); +} diff --git a/src/main/java/com/globant/service/ClientService.java b/src/main/java/com/globant/service/ClientService.java new file mode 100644 index 0000000..8eb09fb --- /dev/null +++ b/src/main/java/com/globant/service/ClientService.java @@ -0,0 +1,45 @@ +package com.globant.service; + +import com.globant.dao.ClientDAO; +import com.globant.dao.DataAccessObject; +import com.globant.dto.ClientDTO; +import com.globant.model.Client; +import com.globant.util.DTOUtils; +import com.globant.util.ModelUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + + +import java.util.List; + +@Service +public class ClientService implements CRUD { + + private final DataAccessObject clientDAO; + + @Autowired + public ClientService(ClientDAO clientDAO) { + this.clientDAO = clientDAO; + } + + public ClientDTO create(ClientDTO clientDTO) { + Client client = clientDAO.create(ModelUtils.toClient(clientDTO)); + return DTOUtils.clientDTO(client); + } + + public ClientDTO read( int id ) { + return null; + } + + public ClientDTO update( ClientDTO object ) { + return null; + } + + public void delete( int id ) { + + } + + public List readAll() { + return null; + } +} diff --git a/bootcamp/src/main/java/com/globant/service/ItemService.java b/src/main/java/com/globant/service/ItemService.java similarity index 88% rename from bootcamp/src/main/java/com/globant/service/ItemService.java rename to src/main/java/com/globant/service/ItemService.java index 0cb20e0..5b1087a 100644 --- a/bootcamp/src/main/java/com/globant/service/ItemService.java +++ b/src/main/java/com/globant/service/ItemService.java @@ -4,7 +4,7 @@ import java.util.List; -public class ItemService implements Service{ +public class ItemService implements CRUD { public ItemDAO create( ItemDAO object ) { return null; diff --git a/bootcamp/src/main/java/com/globant/service/OrderService.java b/src/main/java/com/globant/service/OrderService.java similarity index 87% rename from bootcamp/src/main/java/com/globant/service/OrderService.java rename to src/main/java/com/globant/service/OrderService.java index cc75c04..efc239e 100644 --- a/bootcamp/src/main/java/com/globant/service/OrderService.java +++ b/src/main/java/com/globant/service/OrderService.java @@ -4,7 +4,7 @@ import java.util.List; -public class OrderService implements Service { +public class OrderService implements CRUD { public ClientDTO create( ClientDTO object ) { return null; } diff --git a/bootcamp/src/main/java/com/globant/service/PaymentService.java b/src/main/java/com/globant/service/PaymentService.java similarity index 71% rename from bootcamp/src/main/java/com/globant/service/PaymentService.java rename to src/main/java/com/globant/service/PaymentService.java index a519ec4..2f4eaf7 100644 --- a/bootcamp/src/main/java/com/globant/service/PaymentService.java +++ b/src/main/java/com/globant/service/PaymentService.java @@ -1,14 +1,12 @@ package com.globant.service; -import com.globant.dao.PaymentDAO; import com.globant.dto.PaymentDTO; import java.util.List; -public class PaymentService implements Service{ +public class PaymentService implements CRUD { - - public PaymentDTO create( PaymentDTO object ) { + public PaymentDTO create(PaymentDTO object ) { return null; } diff --git a/src/main/java/com/globant/util/DTOUtils.java b/src/main/java/com/globant/util/DTOUtils.java new file mode 100644 index 0000000..bab49cb --- /dev/null +++ b/src/main/java/com/globant/util/DTOUtils.java @@ -0,0 +1,15 @@ +package com.globant.util; + +import com.globant.dto.ClientDTO; +import com.globant.model.Client; + +public final class DTOUtils { + + public static ClientDTO clientDTO(Client client) { + return new ClientDTO(client.getId(), + client.getName(), + client.getSurname(), + client.getDescription(), + client.getPaymentList()); + } +} diff --git a/src/main/java/com/globant/util/ModelUtils.java b/src/main/java/com/globant/util/ModelUtils.java new file mode 100644 index 0000000..6a14f70 --- /dev/null +++ b/src/main/java/com/globant/util/ModelUtils.java @@ -0,0 +1,15 @@ +package com.globant.util; + +import com.globant.dto.ClientDTO; +import com.globant.model.Client; + +public final class ModelUtils { + + public static Client toClient(ClientDTO clientDTO) { + return new Client(clientDTO.getId(), + clientDTO.getName(), + clientDTO.getName(), + clientDTO.getDescription(), + clientDTO.getPaymentList()); + } +} diff --git a/src/main/resources/WEB-INF/web.xml b/src/main/resources/WEB-INF/web.xml new file mode 100644 index 0000000..ec74ea8 --- /dev/null +++ b/src/main/resources/WEB-INF/web.xml @@ -0,0 +1,15 @@ + + + + spring + org.springframework.web.servlet.DispatcherServlet + 1 + + + spring + / + + \ No newline at end of file