Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix to TransactionStatus entity #142

Merged
merged 16 commits into from
Jan 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import jakarta.persistence.Table;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Objects;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
Expand Down Expand Up @@ -42,6 +42,7 @@ public class TransactionStatus {
@Column(name = "TRANSACTION_OCCURRENCE_DATE")
private LocalDateTime transactionOccurrenceDate;

@Id
@Column(name = "PROCESS_NAME", length = 50)
private String processName;

Expand All @@ -65,9 +66,25 @@ public class TransactionStatus {
*/
@Getter
@Setter
@EqualsAndHashCode
public static class TransactionStatusId implements Serializable {
private String requestId;
private String processName;
private LocalDateTime transactionOccurrenceDate;

@Override
public boolean equals(Object o) {
if (o == null || getClass() != o.getClass()) {
return false;
}
TransactionStatusId that = (TransactionStatusId) o;
return Objects.equals(requestId, that.requestId) && Objects.equals(
processName, that.processName) && Objects.equals(transactionOccurrenceDate,
that.transactionOccurrenceDate);
}

@Override
public int hashCode() {
return Objects.hash(requestId, processName, transactionOccurrenceDate);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
import uk.gov.laa.ccms.data.entity.TransactionStatus;
import uk.gov.laa.ccms.data.entity.TransactionStatus.TransactionStatusId;

/**
* Repository interface for accessing {@link TransactionStatus} entities.
Expand All @@ -17,7 +18,8 @@
* @author Jamie Briggs
*/
@Repository
public interface TransactionStatusRepository extends ReadOnlyRepository<TransactionStatus, String> {
public interface TransactionStatusRepository
extends ReadOnlyRepository<TransactionStatus, TransactionStatusId> {

@Query("""
SELECT ts FROM TransactionStatus ts
Expand Down
Loading