[WIP] Include Controllers in pending in OHApiAbstractController's hierarchy

pom.xml

@@ -29,26 +29,25 @@
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-starter-tomcat</artifactId>
 				</exclusion>
-		        <!-- exclusion>
+		        <exclusion>
 		            <groupId>org.springframework.boot</groupId>
 		            <artifactId>spring-boot-starter-logging</artifactId>
-		        </exclusion-->
+		        </exclusion>
 			</exclusions>
 		</dependency>
-		<!-- dependency>
+		<!-- <dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 			<version>1.7.25</version>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.7.25</version>
 		</dependency>
-		<dependency>
+		<!-- <dependency>
 		    <groupId>org.springframework.boot</groupId>
 		    <artifactId>spring-boot-starter-log4j2</artifactId>
-		</dependency-->
+		</dependency> -->
 		<dependency>
 		    <groupId>org.springframework.boot</groupId>
 		    <artifactId>spring-boot-starter-jetty</artifactId>
@@ -81,7 +80,11 @@
 					<groupId>org.hibernate.javax.persistence</groupId>
 					<artifactId>hibernate-jpa-2.0-api</artifactId>
 				</exclusion>
-            </exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
         <dependency>
             <groupId>org.modelmapper</groupId>

src/main/java/org/isf/accounting/dto/BillDTO.java

@@ -0,0 +1,170 @@
+package org.isf.accounting.dto;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotNull;
+
+import org.isf.patient.dto.PatientDTO;
+import org.isf.priceslist.dto.PriceListDTO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel(description = "Class representing a bill")
+public class BillDTO {
+
+	private Integer id;
+
+	private PatientDTO patient; 
+
+	private Integer listId;
+
+	@NotNull
+	@ApiModelProperty(notes = "Date of bill creation", example="2020-03-19T14:58:00.000Z", position = 1)
+	private Date date;
+
+	@NotNull
+	@ApiModelProperty(notes = "Date of bill updated", example="2020-03-19T14:58:00.000Z", position = 2)
+	private Date update;
+
+	@NotNull
+	@ApiModelProperty(notes = "boolean wich tells if a price list is applied", example="true", position = 3)
+	private boolean isList;
+
+	@NotNull
+	@ApiModelProperty(notes = "Price list name", example="Basic", position = 4)
+	private String listName;
+
+	@NotNull
+	@ApiModelProperty(notes = "Is bill belongs to a patient?", example="true", position = 5)
+	private boolean isPatient;
+
+	@NotNull
+	@ApiModelProperty(notes = "patient name", example="Mario Rossi", position = 6)
+	private String patName;
+
+	@NotNull
+	@ApiModelProperty(notes = "Bill status", example="O", position = 7)
+	private String status;
+
+	@NotNull
+	@ApiModelProperty(notes = "Bill Amount", example="1000", position = 8)
+	private Double amount;
+
+	@NotNull
+	@ApiModelProperty(notes = "Bill balance", example="1500", position = 9)
+	private Double balance;
+
+	@NotNull
+	@ApiModelProperty(notes = "user name who create the bill", example="admin", position = 10)
+	private String user;
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public Date getDate() {
+		return date;
+	}
+
+	public void setDate(Date date) {
+		this.date = date;
+	}
+
+	public Date getUpdate() {
+		return update;
+	}
+
+	public void setUpdate(Date update) {
+		this.update = update;
+	}
+
+	public boolean isList() {
+		return isList;
+	}
+
+	public void setList(boolean isList) {
+		this.isList = isList;
+	}
+
+	public String getListName() {
+		return listName;
+	}
+
+	public void setListName(String listName) {
+		this.listName = listName;
+	}
+
+	public boolean isPatient() {
+		return isPatient;
+	}
+
+	public void setPatient(boolean isPatient) {
+		this.isPatient = isPatient;
+	}
+
+	public String getPatName() {
+		return patName;
+	}
+
+	public void setPatName(String patName) {
+		this.patName = patName;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public Double getAmount() {
+		return amount;
+	}
+
+	public void setAmount(Double amount) {
+		this.amount = amount;
+	}
+
+	public Double getBalance() {
+		return balance;
+	}
+
+	public void setBalance(Double balance) {
+		this.balance = balance;
+	}
+
+	public String getUser() {
+		return user;
+	}
+
+	public void setUser(String user) {
+		this.user = user;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Integer getListId() {
+		return listId;
+	}
+
+	public void setListId(Integer listId) {
+		this.listId = listId;
+	}
+
+	public PatientDTO getPatient() {
+		return patient;
+	}
+
+	public void setPatient(PatientDTO patient) {
+		this.patient = patient;
+	}
+
+}

src/main/java/org/isf/accounting/dto/BillItemsDTO.java

@@ -0,0 +1,134 @@
+package org.isf.accounting.dto;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel(description = "Class representing a billItem")
+public class BillItemsDTO {
+
+	private Integer id;
+
+	@ApiModelProperty(notes = "Bill id", example="", position = 1)
+	private Integer billId;
+
+	public String getPriceId() {
+		return priceId;
+	}
+
+	public void setPriceId(String priceId) {
+		this.priceId = priceId;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public void setBillId(Integer billId) {
+		this.billId = billId;
+	}
+
+	@ApiModelProperty(notes = "check if it is a price", example="true", position = 2)
+	private boolean isPrice;
+
+	@NotNull
+	@ApiModelProperty(notes = "The price Id", example="104", position = 3)
+	private String priceId;
+
+	@NotNull
+	@ApiModelProperty(notes = "item description", example="Acetone 99 % 1ltr", position = 4)
+	private String itemDescription;
+
+	@NotNull
+	@ApiModelProperty(notes = "item amount", example="1000", position = 5)
+	private double itemAmount;
+
+	@NotNull
+	@ApiModelProperty(notes = "item quantity", example="1", position = 6)
+	private int itemQuantity;
+
+	@NotNull
+	@ApiModelProperty(notes = "item display code", example="Acetone", position = 7)
+	private String itemDisplayCode;
+
+	@NotNull
+	@ApiModelProperty(notes = "item id", example="3", position = 8)
+	private String itemId;
+
+	private volatile int hashCode = 0;
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+
+	public boolean isPrice() {
+		return isPrice;
+	}
+
+	public void setPrice(boolean isPrice) {
+		this.isPrice = isPrice;
+	}
+
+	public String getItemDescription() {
+		return itemDescription;
+	}
+
+	public void setItemDescription(String itemDescription) {
+		this.itemDescription = itemDescription;
+	}
+
+	public double getItemAmount() {
+		return itemAmount;
+	}
+
+	public void setItemAmount(double itemAmount) {
+		this.itemAmount = itemAmount;
+	}
+
+	public int getItemQuantity() {
+		return itemQuantity;
+	}
+
+	public void setItemQuantity(int itemQuantity) {
+		this.itemQuantity = itemQuantity;
+	}
+
+	public int getHashCode() {
+		return hashCode;
+	}
+
+	public void setHashCode(int hashCode) {
+		this.hashCode = hashCode;
+	}
+
+	public String getItemDisplayCode() {
+		return itemDisplayCode;
+	}
+
+	public void setItemDisplayCode(String itemDisplayCode) {
+		this.itemDisplayCode = itemDisplayCode;
+	}
+
+	public String getItemId() {
+		return itemId;
+	}
+
+	public void setItemId(String itemId) {
+		this.itemId = itemId;
+	}	
+
+	public int getBillId() {
+		return billId;
+	}
+
+	public void setBillId(int billId) {
+		this.billId = billId;
+	}
+
+}