Skip to content

Commit

Permalink
Merge pull request bullhorn#349 from hkkin2/master
Browse files Browse the repository at this point in the history
* Adding support for BillMasterTransactionDistributionBatch, UnbilledRevenueDistribution, UnbilledRevenueDistributionBatch, UnbilledRevenueGeneralLedgerExportStatusLookup

* update sdk version to 1.4.21

* update data file names
  • Loading branch information
hkkin2 authored Nov 26, 2020
1 parent fb396f7 commit 1276e0e
Show file tree
Hide file tree
Showing 26 changed files with 3,273 additions and 70 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.bullhorn</groupId>
<artifactId>sdk-rest</artifactId>
<version>1.4.20</version>
<version>1.4.21</version>

<packaging>jar</packaging>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ import com.bullhornsdk.data.model.entity.core.paybill.surcharge.Surcharge
import com.bullhornsdk.data.model.entity.core.paybill.tax.Tax
import com.bullhornsdk.data.model.entity.core.paybill.transaction.BillMasterTransaction
import com.bullhornsdk.data.model.entity.core.paybill.transaction.PayMasterTransaction
import com.bullhornsdk.data.model.entity.core.paybill.transaction.UnbilledRevenueGeneralLedgerExportStatusLookup
import com.bullhornsdk.data.model.entity.core.paybill.unit.CurrencyUnit
import com.bullhornsdk.data.model.entity.core.paybill.distribution.*
import com.bullhornsdk.data.model.entity.core.standard.*
import com.bullhornsdk.data.model.entity.core.type.BullhornEntity
import com.bullhornsdk.data.model.entity.core.type.SearchEntity
Expand Down Expand Up @@ -534,13 +536,16 @@ public class MockDataLoader {
entityFiles.put(Surcharge.class, "paybill/surcharge-data.txt");
entityFiles.put(Tax.class, "paybill/tax-data.txt");
entityFiles.put(CanvasReport.class, "paybill/canvasreport-data.txt");
entityFiles.put(BillMasterTransactionDistributionBatch.class, "paybill/billmastertransactiondistributionbatch-data.txt");
entityFiles.put(UnbilledRevenueDistribution.class, "paybill/unbilledrevenuedistribution-data.txt");
entityFiles.put(UnbilledRevenueDistributionBatch.class, "paybill/unbilledrevenuedistributionbatch-data.txt");
entityFiles.put(UnbilledRevenueGeneralLedgerExportStatusLookup.class, "paybill/unbilledrevenuegeneralledgerexportstatuslookup-data.txt");

entityFiles.put(CandidateCertificationRequirement.class, "candidatecertificationrequirement-data.txt");
entityFiles.put(CertificationRequirement.class, "certificationrequirement-data.txt");
entityFiles.put(JobSubmissionCertificationRequirement.class, "jobsubmissioncertificationrequirement-data.txt");
entityFiles.put(CertificationRequirementStatusLookup.class, "certificationrequirementstatuslookup-data.txt");


entityFiles.put(JobOrderCustomObjectInstance1.class, "customobjectinstances/jobordercustomobjectinstance1-data.txt");
entityFiles.put(JobOrderCustomObjectInstance2.class, "customobjectinstances/jobordercustomobjectinstance2-data.txt");
entityFiles.put(JobOrderCustomObjectInstance3.class, "customobjectinstances/jobordercustomobjectinstance3-data.txt");
Expand Down Expand Up @@ -755,6 +760,11 @@ public class MockDataLoader {
entityMetaFiles.put(InvoiceStatementSurchargeRate.class, "meta/paybill/rate/invoicestatementsurchargerate-meta-data.txt");
entityMetaFiles.put(SurchargeRate.class, "meta/paybill/rate/surchargerate-meta-data.txt");

entityMetaFiles.put(BillMasterTransactionDistributionBatch.class, "meta/paybill/billmastertransactiondistributionbatch-meta-data.txt");
entityMetaFiles.put(UnbilledRevenueDistribution.class, "meta/paybill/unbilledrevenuedistribution-meta-data.txt");
entityMetaFiles.put(UnbilledRevenueDistributionBatch.class, "meta/paybill/unbilledrevenuedistributionbatch-meta-data.txt");
entityMetaFiles.put(UnbilledRevenueGeneralLedgerExportStatusLookup.class, "meta/paybill/unbilledrevenuegeneralledgerexportstatuslookup-meta-data.txt");


// Certification Requirements
entityMetaFiles.put(CandidateCertificationRequirement.class, "meta/candidatecertificationrequirement-meta-data.txt");
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
package com.bullhornsdk.data.model.entity.core.paybill.distribution;

import com.bullhornsdk.data.model.entity.core.paybill.BillingProfile;
import com.bullhornsdk.data.model.entity.core.paybill.optionslookup.SimplifiedOptionsLookup;
import com.bullhornsdk.data.model.entity.core.paybill.transaction.BillMasterTransaction;
import com.bullhornsdk.data.model.entity.core.paybill.unit.CurrencyUnit;
import com.bullhornsdk.data.model.entity.core.paybill.charge.BillableCharge;
import com.bullhornsdk.data.model.entity.core.type.*;
import com.bullhornsdk.data.model.entity.embedded.Address;
import com.bullhornsdk.data.model.entity.embedded.OneToMany;
import com.bullhornsdk.data.model.entity.core.standard.CorporateUser;

import com.bullhornsdk.data.util.ReadOnly;
import com.fasterxml.jackson.annotation.*;
import org.joda.time.DateTime;

import java.math.BigDecimal;
import java.util.Date;
import java.util.Objects;

/**
* Created by Kin.To 25 Nov 2020
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonRootName(value = "data")
@JsonPropertyOrder({"id", "accountingDate", "batchStatus", "billMasterTransactions", "billableCharges",
"dateAdded", "dateLastModified", "owner"
})
public class BillMasterTransactionDistributionBatch extends AbstractEntity implements QueryEntity, UpdateEntity, CreateEntity, DateLastModifiedEntity {

private Integer id;
private Date accountingDate;
private SimplifiedOptionsLookup batchStatus;
private OneToMany<BillMasterTransaction> billMasterTransactions;
private OneToMany<BillableCharge> billableCharges;
private DateTime dateAdded;
private DateTime dateLastModified;
private CorporateUser owner;


public BillMasterTransactionDistributionBatch() {
}

public BillMasterTransactionDistributionBatch(Integer id) {
this.id = id;
}

@Override
@JsonProperty("id")
public Integer getId() {
return id;
}

@ReadOnly
@Override
@JsonProperty("id")
public void setId(Integer id) {
this.id = id;
}

@JsonProperty("accountingDate")
public Date getAccountingDate() {
return accountingDate;
}

@JsonProperty("accountingDate")
public void setAccountingDate(Date accountingDate) {
this.accountingDate = accountingDate;
}

@JsonProperty("batchStatus")
public SimplifiedOptionsLookup getBatchStatus() {
return batchStatus;
}

@JsonProperty("batchStatus")
public void setBatchStatus(SimplifiedOptionsLookup batchStatus) {
this.batchStatus = batchStatus;
}

@JsonProperty("billMasterTransactions")
public OneToMany<BillMasterTransaction> getBillMasterTransactions() {
return billMasterTransactions;
}

@JsonProperty("billMasterTransactions")
public void setBillMasterTransactions(OneToMany<BillMasterTransaction> billMasterTransactions) {
this.billMasterTransactions = billMasterTransactions;
}

@JsonProperty("billableCharges")
public OneToMany<BillableCharge> getBillableCharges() {
return billableCharges;
}

@JsonProperty("billableCharges")
public void setBillableCharges(OneToMany<BillableCharge> billableCharges) {
this.billableCharges = billableCharges;
}

@JsonProperty("dateAdded")
public DateTime getDateAdded() {
return dateAdded;
}

@JsonProperty("dateAdded")
public void setDateAdded(DateTime dateAdded) {
this.dateAdded = dateAdded;
}

@JsonProperty("dateLastModified")
public DateTime getDateLastModified() {
return dateLastModified;
}

@ReadOnly
@JsonProperty("dateLastModified")
public void setDateLastModified(DateTime dateLastModified) {
this.dateLastModified = dateLastModified;
}

@JsonProperty("owner")
public CorporateUser getOwner() {
return owner;
}

@JsonProperty("owner")
public void setOwner(CorporateUser owner) {
this.owner = owner;
}


@Override
public String toString() {
return "BillMasterTransactionDistributionBatch{" +
"id=" + id +
", accountingDate=" + accountingDate +
", batchStatus=" + batchStatus +
", billMasterTransactions=" + billMasterTransactions +
", billableCharges=" + billableCharges +
", dateAdded=" + dateAdded +
", dateLastModified=" + dateLastModified +
", owner=" + owner +
'}';
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
BillMasterTransactionDistributionBatch that = (BillMasterTransactionDistributionBatch) o;
return Objects.equals(id, that.id) &&
Objects.equals(accountingDate, that.accountingDate) &&
Objects.equals(batchStatus, that.batchStatus) &&
Objects.equals(billMasterTransactions, that.billMasterTransactions) &&
Objects.equals(billableCharges, that.billableCharges) &&
Objects.equals(dateAdded, that.dateAdded) &&
Objects.equals(dateLastModified, that.dateLastModified) &&
Objects.equals(owner, that.owner);

}

@Override
public int hashCode() {
return Objects.hash(id, accountingDate, batchStatus, billMasterTransactions, billableCharges, dateAdded, dateLastModified, owner);
}

}
Loading

0 comments on commit 1276e0e

Please sign in to comment.