diff --git a/covid-19-common/src/main/java/com/ossez/covid19/common/models/Covid19Current.java b/covid-19-common/src/main/java/com/ossez/covid19/common/models/Covid19Current.java index 5acddb5..18ffea6 100644 --- a/covid-19-common/src/main/java/com/ossez/covid19/common/models/Covid19Current.java +++ b/covid-19-common/src/main/java/com/ossez/covid19/common/models/Covid19Current.java @@ -1,23 +1,14 @@ package com.ossez.covid19.common.models; import com.ossez.covid19.common.DataObject; -import com.ossez.covid19.common.Utility; -import com.ossez.covid19.common.mls.County; -import com.ossez.covid19.common.search.analyzers.LowercaseAnalyzer; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.hibernate.search.annotations.Analyzer; -import org.hibernate.search.annotations.Boost; -import org.hibernate.search.annotations.Field; -import org.hibernate.search.annotations.Store; import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; import javax.persistence.Table; -@Table(catalog= "covid19", name = "Covid19Current") + @Entity +@Table(catalog= "covid19", name = "Covid19Current") public class Covid19Current extends DataObject implements java.io.Serializable { private static final long serialVersionUID = -612061041423673622L; @@ -27,6 +18,31 @@ public class Covid19Current extends DataObject implements java.io.Serializable { private String positiveScore; private String negativeScore; private String negativeRegularScore; + private String commercialScore; + private String grade; + private String score; + private String negative; + private String pending; + private String hospitalizedCurrently; + private String hospitalizedCumulative; + private String inIcuCurrently; + private String inIcuCumulative; + private String onVentilatorCurrently; + private String onVentilatorCumulative; + private String recovered; + private String lastUpdateEt; + private String checkTimeEt; + private String death; + private String hospitalized; + private String total; + private String totalTestResults; + private String posNeg; + private String fips; + private String dateModified; + private String dateChecked; + private String hash; + + public Covid19Current() { } @@ -90,6 +106,190 @@ public class Covid19Current extends DataObject implements java.io.Serializable { this.negativeRegularScore = negativeRegularScore; } + public String getCommercialScore() { + return commercialScore; + } + + public void setCommercialScore(String commercialScore) { + this.commercialScore = commercialScore; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getScore() { + return score; + } + + public void setScore(String score) { + this.score = score; + } + + public String getNegative() { + return negative; + } + + public void setNegative(String negative) { + this.negative = negative; + } + + public String getPending() { + return pending; + } + + public void setPending(String pending) { + this.pending = pending; + } + + public String getHospitalizedCurrently() { + return hospitalizedCurrently; + } + + public void setHospitalizedCurrently(String hospitalizedCurrently) { + this.hospitalizedCurrently = hospitalizedCurrently; + } + + public String getHospitalizedCumulative() { + return hospitalizedCumulative; + } + + public void setHospitalizedCumulative(String hospitalizedCumulative) { + this.hospitalizedCumulative = hospitalizedCumulative; + } + + public String getInIcuCurrently() { + return inIcuCurrently; + } + + public void setInIcuCurrently(String inIcuCurrently) { + this.inIcuCurrently = inIcuCurrently; + } + + public String getInIcuCumulative() { + return inIcuCumulative; + } + + public void setInIcuCumulative(String inIcuCumulative) { + this.inIcuCumulative = inIcuCumulative; + } + + public String getOnVentilatorCurrently() { + return onVentilatorCurrently; + } + + public void setOnVentilatorCurrently(String onVentilatorCurrently) { + this.onVentilatorCurrently = onVentilatorCurrently; + } + + public String getOnVentilatorCumulative() { + return onVentilatorCumulative; + } + + public void setOnVentilatorCumulative(String onVentilatorCumulative) { + this.onVentilatorCumulative = onVentilatorCumulative; + } + + public String getRecovered() { + return recovered; + } + + public void setRecovered(String recovered) { + this.recovered = recovered; + } + + public String getLastUpdateEt() { + return lastUpdateEt; + } + + public void setLastUpdateEt(String lastUpdateEt) { + this.lastUpdateEt = lastUpdateEt; + } + + public String getCheckTimeEt() { + return checkTimeEt; + } + + public void setCheckTimeEt(String checkTimeEt) { + this.checkTimeEt = checkTimeEt; + } + + public String getDeath() { + return death; + } + + public void setDeath(String death) { + this.death = death; + } + + public String getHospitalized() { + return hospitalized; + } + + public void setHospitalized(String hospitalized) { + this.hospitalized = hospitalized; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public String getTotalTestResults() { + return totalTestResults; + } + + public void setTotalTestResults(String totalTestResults) { + this.totalTestResults = totalTestResults; + } + + public String getPosNeg() { + return posNeg; + } + + public void setPosNeg(String posNeg) { + this.posNeg = posNeg; + } + + public String getFips() { + return fips; + } + + public void setFips(String fips) { + this.fips = fips; + } + + public String getDateModified() { + return dateModified; + } + + public void setDateModified(String dateModified) { + this.dateModified = dateModified; + } + + public String getDateChecked() { + return dateChecked; + } + + public void setDateChecked(String dateChecked) { + this.dateChecked = dateChecked; + } + + public String getHash() { + return hash; + } + + public void setHash(String hash) { + this.hash = hash; + } + @Override public int hashCode() { return new HashCodeBuilder(17, 37)