From d77b70f7df6920004e9556984cb89b7c0f10c0d7 Mon Sep 17 00:00:00 2001 From: ryans Date: Mon, 5 May 2025 09:20:06 -0400 Subject: [PATCH 1/4] Highlight changed auth rows Fixes #63 --- container/oracle/initdb.d/02_ddl.sql | 8 ++++-- .../ReducedBeamAuthorizationBuilder.java | 2 ++ .../ReducedRFAuthorizationBuilder.java | 2 ++ .../entity/BeamDestinationAuthorization.java | 27 ++++++++++--------- .../entity/RFSegmentAuthorization.java | 13 +++++++++ .../WEB-INF/tags/beam-operations-panel.tag | 2 +- .../WEB-INF/tags/rf-operations-panel.tag | 2 +- .../destinations-history.jsp | 6 +++++ .../segments-history.jsp | 6 +++++ 9 files changed, 52 insertions(+), 16 deletions(-) diff --git a/container/oracle/initdb.d/02_ddl.sql b/container/oracle/initdb.d/02_ddl.sql index f07c5a60..0429dde7 100644 --- a/container/oracle/initdb.d/02_ddl.sql +++ b/container/oracle/initdb.d/02_ddl.sql @@ -189,10 +189,12 @@ CREATE TABLE JAM_OWNER.BEAM_DESTINATION_AUTHORIZATION CW_LIMIT NUMBER(24,12) NULL, COMMENTS VARCHAR2(256 CHAR) NULL, EXPIRATION_DATE DATE NULL, + CHANGED_YN VARCHAR2(1 CHAR) DEFAULT 'N' NOT NULL, CONSTRAINT BEAM_DESTINATION_AUTHORIZATION_PK PRIMARY KEY (BEAM_DESTINATION_ID,BEAM_AUTHORIZATION_ID), CONSTRAINT BEAM_DESTINATION_AUTHORIZATION_FK1 FOREIGN KEY (BEAM_DESTINATION_ID, FACILITY_ID) REFERENCES JAM_OWNER.BEAM_DESTINATION (BEAM_DESTINATION_ID, FACILITY_ID), CONSTRAINT BEAM_DESTINATION_AUTHORIZATION_FK2 FOREIGN KEY (BEAM_AUTHORIZATION_ID, FACILITY_ID) REFERENCES JAM_OWNER.BEAM_AUTHORIZATION (BEAM_AUTHORIZATION_ID, FACILITY_ID), - CONSTRAINT BEAM_DESTINATION_AUTHORIZATION_CK1 CHECK (BEAM_MODE IN ('None', 'Tune', 'CW', 'Ceramic Viewer', 'Viewer Limited', 'High Duty Cycle', 'BLM Checkout', 'RF Only')) + CONSTRAINT BEAM_DESTINATION_AUTHORIZATION_CK1 CHECK (BEAM_MODE IN ('None', 'Tune', 'CW', 'Ceramic Viewer', 'Viewer Limited', 'High Duty Cycle', 'BLM Checkout', 'RF Only')), + CONSTRAINT BEAM_DESTINATION_AUTHORIZATION_CK2 CHECK (CHANGED_YN IN ('Y', 'N')) ); CREATE TABLE JAM_OWNER.RF_SEGMENT_AUTHORIZATION @@ -203,10 +205,12 @@ CREATE TABLE JAM_OWNER.RF_SEGMENT_AUTHORIZATION HIGH_POWER_RF_YN VARCHAR2(1 CHAR) DEFAULT 'N' NOT NULL, COMMENTS VARCHAR2(256 CHAR) NULL, EXPIRATION_DATE DATE NULL, + CHANGED_YN VARCHAR2(1 CHAR) DEFAULT 'N' NOT NULL, CONSTRAINT RF_SEGMENT_AUTHORIZATION_PK PRIMARY KEY (RF_SEGMENT_ID,RF_AUTHORIZATION_ID), CONSTRAINT RF_SEGMENT_AUTHORIZATION_FK1 FOREIGN KEY (RF_SEGMENT_ID, FACILITY_ID) REFERENCES JAM_OWNER.RF_SEGMENT (RF_SEGMENT_ID, FACILITY_ID), CONSTRAINT RF_SEGMENT_AUTHORIZATION_FK2 FOREIGN KEY (RF_AUTHORIZATION_ID, FACILITY_ID) REFERENCES JAM_OWNER.RF_AUTHORIZATION (RF_AUTHORIZATION_ID, FACILITY_ID), - CONSTRAINT RF_SEGMENT_AUTHORIZATION_CK1 CHECK (HIGH_POWER_RF_YN IN ('Y', 'N')) + CONSTRAINT RF_SEGMENT_AUTHORIZATION_CK1 CHECK (HIGH_POWER_RF_YN IN ('Y', 'N')), + CONSTRAINT RF_SEGMENT_AUTHORIZATION_CK2 CHECK (CHANGED_YN IN ('Y', 'N')) ); CREATE TABLE JAM_OWNER.CREDITED_CONTROL diff --git a/src/main/java/org/jlab/jam/business/session/ReducedBeamAuthorizationBuilder.java b/src/main/java/org/jlab/jam/business/session/ReducedBeamAuthorizationBuilder.java index 19feb5ff..8ddfc589 100644 --- a/src/main/java/org/jlab/jam/business/session/ReducedBeamAuthorizationBuilder.java +++ b/src/main/java/org/jlab/jam/business/session/ReducedBeamAuthorizationBuilder.java @@ -52,6 +52,7 @@ private boolean populateReducedPermissionsDueToVerification( operationAuth.setBeamMode("None"); operationAuth.setCwLimit(null); operationAuth.setExpirationDate(null); + operationAuth.setChanged(true); operationAuth.setComments( "Permission automatically revoked due to credited control " + verification.getCreditedControl().getName() @@ -107,6 +108,7 @@ private boolean populateReducedPermissionDueToAuthorizationExpiration( operationAuth.setBeamMode("None"); operationAuth.setCwLimit(null); operationAuth.setExpirationDate(null); + operationAuth.setChanged(true); operationAuth.setComments( "Permission automatically revoked due to director's authorization expiration"); atLeastOne = true; diff --git a/src/main/java/org/jlab/jam/business/session/ReducedRFAuthorizationBuilder.java b/src/main/java/org/jlab/jam/business/session/ReducedRFAuthorizationBuilder.java index 6e07f8ac..55bb635f 100644 --- a/src/main/java/org/jlab/jam/business/session/ReducedRFAuthorizationBuilder.java +++ b/src/main/java/org/jlab/jam/business/session/ReducedRFAuthorizationBuilder.java @@ -52,6 +52,7 @@ private boolean populateReducedPermissionsDueToVerification( if (segmentId.equals(verification.getRFSegment().getRFSegmentId())) { operationAuth.setHighPowerRf(false); operationAuth.setExpirationDate(null); + operationAuth.setChanged(true); operationAuth.setComments( "Permission automatically revoked due to credited control " + verification.getCreditedControl().getName() @@ -104,6 +105,7 @@ private boolean populateReducedPermissionDueToAuthorizationExpiration( if (containsName(segmentList, operationAuth)) { operationAuth.setHighPowerRf(false); operationAuth.setExpirationDate(null); + operationAuth.setChanged(true); operationAuth.setComments( "Permission automatically revoked due to director's authorization expiration"); atLeastOne = true; diff --git a/src/main/java/org/jlab/jam/persistence/entity/BeamDestinationAuthorization.java b/src/main/java/org/jlab/jam/persistence/entity/BeamDestinationAuthorization.java index a70a8d49..14873950 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/BeamDestinationAuthorization.java +++ b/src/main/java/org/jlab/jam/persistence/entity/BeamDestinationAuthorization.java @@ -4,20 +4,10 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import javax.persistence.*; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; +import org.jlab.smoothness.persistence.util.YnStringToBoolean; /** * @author ryans @@ -75,6 +65,11 @@ public class BeamDestinationAuthorization implements Serializable { @ManyToOne(optional = false, fetch = FetchType.LAZY) private BeamAuthorization beamAuthorization; + @Basic + @Column(name = "CHANGED_YN", nullable = false, length = 1) + @Convert(converter = YnStringToBoolean.class) + private boolean changed; + public BeamDestinationAuthorization() {} public BeamDestinationAuthorization(DestinationAuthorizationPK destinationAuthorizationPK) { @@ -152,6 +147,14 @@ public void setAuthorization(BeamAuthorization beamAuthorization) { this.beamAuthorization = beamAuthorization; } + public boolean isChanged() { + return changed; + } + + public void setChanged(boolean changed) { + this.changed = changed; + } + @Override public int hashCode() { int hash = 0; diff --git a/src/main/java/org/jlab/jam/persistence/entity/RFSegmentAuthorization.java b/src/main/java/org/jlab/jam/persistence/entity/RFSegmentAuthorization.java index ea661a70..d9264b95 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/RFSegmentAuthorization.java +++ b/src/main/java/org/jlab/jam/persistence/entity/RFSegmentAuthorization.java @@ -60,6 +60,11 @@ public class RFSegmentAuthorization implements Serializable { @ManyToOne(optional = false, fetch = FetchType.LAZY) private RFAuthorization rfAuthorization; + @Basic + @Column(name = "CHANGED_YN", nullable = false, length = 1) + @Convert(converter = YnStringToBoolean.class) + private boolean changed; + public RFSegmentAuthorization() {} public RFSegmentAuthorization(SegmentAuthorizationPK segmentAuthorizationPK) { @@ -122,6 +127,14 @@ public void setRFAuthorization(RFAuthorization rfAuthorization) { this.rfAuthorization = rfAuthorization; } + public boolean isChanged() { + return changed; + } + + public void setChanged(boolean changed) { + this.changed = changed; + } + @Override public int hashCode() { int hash = 0; diff --git a/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag b/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag index 542c7711..ff4f4b14 100644 --- a/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag +++ b/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag @@ -30,7 +30,7 @@ - + diff --git a/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag b/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag index 0a211233..5e5b96a2 100644 --- a/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag +++ b/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag @@ -28,7 +28,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/authorization-history/destinations-history.jsp b/src/main/webapp/WEB-INF/views/authorization-history/destinations-history.jsp index 5a0ffc22..6b11c21c 100644 --- a/src/main/webapp/WEB-INF/views/authorization-history/destinations-history.jsp +++ b/src/main/webapp/WEB-INF/views/authorization-history/destinations-history.jsp @@ -15,6 +15,12 @@ box-shadow: 8px 8px 8px #979797; border-radius: 0 0 8px 8px; } + .changed { + background-color: #fafab4; + } + .message-box { + text-align: center; + } diff --git a/src/main/webapp/WEB-INF/views/authorization-history/segments-history.jsp b/src/main/webapp/WEB-INF/views/authorization-history/segments-history.jsp index f79efd6f..221eaf4e 100644 --- a/src/main/webapp/WEB-INF/views/authorization-history/segments-history.jsp +++ b/src/main/webapp/WEB-INF/views/authorization-history/segments-history.jsp @@ -15,6 +15,12 @@ box-shadow: 8px 8px 8px #979797; border-radius: 0 0 8px 8px; } + .changed { + background-color: #fafab4; + } + .message-box { + text-align: center; + } From a9139c77f21eb81ef2492a65a005830aa9d66f33 Mon Sep 17 00:00:00 2001 From: ryans Date: Mon, 5 May 2025 11:10:30 -0400 Subject: [PATCH 2/4] Emphasis on reduction in auth --- .../ReducedBeamAuthorizationBuilder.java | 14 ++----- .../ReducedRFAuthorizationBuilder.java | 14 ++----- .../persistence/entity/BeamAuthorization.java | 4 ++ .../persistence/entity/RFAuthorization.java | 4 ++ .../WEB-INF/tags/beam-operations-panel.tag | 11 ++++-- .../WEB-INF/tags/rf-operations-panel.tag | 15 ++++++-- .../authorization-history/beam-history.jsp | 37 +++++++++++++++++-- .../destinations-history.jsp | 4 +- .../authorization-history/rf-history.jsp | 37 +++++++++++++++++-- .../segments-history.jsp | 4 +- .../webapp/resources/css/authorizations.css | 8 ++++ 11 files changed, 113 insertions(+), 39 deletions(-) diff --git a/src/main/java/org/jlab/jam/business/session/ReducedBeamAuthorizationBuilder.java b/src/main/java/org/jlab/jam/business/session/ReducedBeamAuthorizationBuilder.java index 8ddfc589..d9bd42eb 100644 --- a/src/main/java/org/jlab/jam/business/session/ReducedBeamAuthorizationBuilder.java +++ b/src/main/java/org/jlab/jam/business/session/ReducedBeamAuthorizationBuilder.java @@ -67,12 +67,9 @@ private boolean populateReducedPermissionsDueToVerification( } if (atLeastOne) { - String comments = clone.getComments(); - if (comments == null) { - comments = ""; - } + String comments = ""; // We replace Change Notes completely with changes String csv = IOUtil.toCsv(revokedDestinationList.toArray()); - comments = comments + "\nCHANGE: Destination control verification revoked: " + csv; + comments = comments + "\nDestination control verification revoked: " + csv; clone.setComments(comments); } @@ -118,12 +115,9 @@ private boolean populateReducedPermissionDueToAuthorizationExpiration( } if (atLeastOne) { - String comments = clone.getComments(); - if (comments == null) { - comments = ""; - } + String comments = ""; // We replace Change Notes completely with changes String csv = IOUtil.toCsv(revokedDestinationList.toArray()); - comments = comments + "\nCHANGE: Destination authorization revoked: " + csv; + comments = comments + "\nDestination authorization revoked: " + csv; clone.setComments(comments); } diff --git a/src/main/java/org/jlab/jam/business/session/ReducedRFAuthorizationBuilder.java b/src/main/java/org/jlab/jam/business/session/ReducedRFAuthorizationBuilder.java index 55bb635f..6c97676b 100644 --- a/src/main/java/org/jlab/jam/business/session/ReducedRFAuthorizationBuilder.java +++ b/src/main/java/org/jlab/jam/business/session/ReducedRFAuthorizationBuilder.java @@ -67,12 +67,9 @@ private boolean populateReducedPermissionsDueToVerification( } if (atLeastOne) { - String comments = clone.getComments(); - if (comments == null) { - comments = ""; - } + String comments = ""; // We replace Change Notes completely with changes String csv = IOUtil.toCsv(revokedSegmentList.toArray()); - comments = comments + "\nCHANGE: Segment control verification revoked: " + csv; + comments = comments + "\nSegment control verification revoked: " + csv; clone.setComments(comments); } @@ -115,12 +112,9 @@ private boolean populateReducedPermissionDueToAuthorizationExpiration( } if (atLeastOne) { - String comments = clone.getComments(); - if (comments == null) { - comments = ""; - } + String comments = ""; // We replace Change Notes completely with changes String csv = IOUtil.toCsv(revokedSegmentList.toArray()); - comments = comments + "\nCHANGE: Segment authorization revoked: " + csv; + comments = comments + "\nSegment authorization revoked: " + csv; clone.setComments(comments); } diff --git a/src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java b/src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java index 44847e87..9874bf1c 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java +++ b/src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java @@ -67,6 +67,10 @@ public class BeamAuthorization implements Serializable { @OneToMany(cascade = CascadeType.ALL, mappedBy = "beamAuthorization", fetch = FetchType.EAGER) private List beamDestinationAuthorizationList; + public boolean isAutomatedReduction() { + return !modifiedBy.equals(authorizedBy); + } + public BeamAuthorization() {} public BigInteger getBeamAuthorizationId() { diff --git a/src/main/java/org/jlab/jam/persistence/entity/RFAuthorization.java b/src/main/java/org/jlab/jam/persistence/entity/RFAuthorization.java index 5c4d4bed..f8d8c16b 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/RFAuthorization.java +++ b/src/main/java/org/jlab/jam/persistence/entity/RFAuthorization.java @@ -64,6 +64,10 @@ public class RFAuthorization implements Serializable { @Column(name = "LOGENTRY_URL", length = 2048) private String logentryUrl; + public boolean isAutomatedReduction() { + return !modifiedBy.equals(authorizedBy); + } + @OneToMany(cascade = CascadeType.ALL, mappedBy = "rfAuthorization", fetch = FetchType.EAGER) private List rfSegmentAuthorizationList; diff --git a/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag b/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag index ff4f4b14..85b74399 100644 --- a/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag +++ b/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag @@ -122,12 +122,12 @@ -

Notes

+

Change Notes

- - + +

Digital Signature

@@ -135,6 +135,11 @@
Authorized by ${s:formatUsername(beamAuthorization.authorizedBy)} on
+ +
+ † Automatically reduced on +
+
None
diff --git a/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag b/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag index 5e5b96a2..d68503bb 100644 --- a/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag +++ b/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag @@ -100,19 +100,26 @@ -

Notes

+

Change Notes

- - + +

Digital Signature

-
Authorized by ${s:formatUsername(rfAuthorization.authorizedBy)} on
+
+ Authorized by ${s:formatUsername(rfAuthorization.authorizedBy)} on +
+ +
+ † Automatically reduced on +
+
None
diff --git a/src/main/webapp/WEB-INF/views/authorization-history/beam-history.jsp b/src/main/webapp/WEB-INF/views/authorization-history/beam-history.jsp index 1031c16f..0aeed001 100644 --- a/src/main/webapp/WEB-INF/views/authorization-history/beam-history.jsp +++ b/src/main/webapp/WEB-INF/views/authorization-history/beam-history.jsp @@ -11,6 +11,9 @@ .auth-notes-span { white-space: pre-line; } + td:nth-child(2) { + width: 130px; + } @@ -33,6 +36,7 @@
None
+
†Automated Auth Reduction
@@ -41,17 +45,42 @@ - + + - - - + + + diff --git a/src/main/webapp/WEB-INF/views/authorization-history/destinations-history.jsp b/src/main/webapp/WEB-INF/views/authorization-history/destinations-history.jsp index 6b11c21c..deee23ce 100644 --- a/src/main/webapp/WEB-INF/views/authorization-history/destinations-history.jsp +++ b/src/main/webapp/WEB-INF/views/authorization-history/destinations-history.jsp @@ -42,8 +42,8 @@
- -
This is an automated authorization reduction
+ +
†This is an automated authorization reduction
 diff --git a/src/main/webapp/WEB-INF/views/authorization-history/rf-history.jsp b/src/main/webapp/WEB-INF/views/authorization-history/rf-history.jsp index efa47b26..0d08aea5 100644 --- a/src/main/webapp/WEB-INF/views/authorization-history/rf-history.jsp +++ b/src/main/webapp/WEB-INF/views/authorization-history/rf-history.jsp @@ -11,6 +11,9 @@ .auth-notes-span { white-space: pre-line; } + td:nth-child(2) { + width: 130px; + } @@ -33,6 +36,7 @@
None
+
†Automated Auth Reduction
Modified By Authorization Date Authorized ByNotesChange Notes Destination Authorizations
+ + + † + + + + + + + + + + + + + + + + + + + + + Destination Details
@@ -41,17 +45,42 @@ - + + - - - + + + diff --git a/src/main/webapp/WEB-INF/views/authorization-history/segments-history.jsp b/src/main/webapp/WEB-INF/views/authorization-history/segments-history.jsp index 221eaf4e..3115998e 100644 --- a/src/main/webapp/WEB-INF/views/authorization-history/segments-history.jsp +++ b/src/main/webapp/WEB-INF/views/authorization-history/segments-history.jsp @@ -42,8 +42,8 @@
- -
This is an automated authorization reduction
+ +
†This is an automated authorization reduction
 diff --git a/src/main/webapp/resources/css/authorizations.css b/src/main/webapp/resources/css/authorizations.css index 4f7256bc..6c20d47f 100644 --- a/src/main/webapp/resources/css/authorizations.css +++ b/src/main/webapp/resources/css/authorizations.css @@ -5,6 +5,9 @@ h3 { .signature-field { margin-top: 0.25em; } +.signature-panel { + margin-top: 0.5em; +} .auth-notes-span { white-space: pre-line; } @@ -83,4 +86,9 @@ textarea[readonly] { .logentry-panel { flex: 2; text-align: right; + margin-top: auto; +} +.reduction-note { + font-style: italic; + margin-top: 0.25em; } \ No newline at end of file From 1c0c5ec603f85f74d2158ddb3302e5f50d3a075b Mon Sep 17 00:00:00 2001 From: ryans Date: Mon, 5 May 2025 12:38:16 -0400 Subject: [PATCH 3/4] Calculate diff on director save --- .../session/BeamAuthorizationFacade.java | 74 ++++++++++++++++++- .../session/RFAuthorizationFacade.java | 57 ++++++++++++++ .../jam/business/util/EqualityHelper.java | 74 +++++++++++++++++++ .../WEB-INF/tags/beam-operations-panel.tag | 2 +- .../WEB-INF/tags/rf-operations-panel.tag | 2 +- 5 files changed, 203 insertions(+), 6 deletions(-) create mode 100644 src/main/java/org/jlab/jam/business/util/EqualityHelper.java diff --git a/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java b/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java index e522cc80..88c31149 100644 --- a/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java +++ b/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java @@ -16,10 +16,8 @@ import javax.persistence.PersistenceContext; import javax.persistence.Query; import javax.persistence.TypedQuery; -import org.jlab.jam.persistence.entity.BeamAuthorization; -import org.jlab.jam.persistence.entity.BeamDestination; -import org.jlab.jam.persistence.entity.BeamDestinationAuthorization; -import org.jlab.jam.persistence.entity.Facility; +import org.jlab.jam.business.util.EqualityHelper; +import org.jlab.jam.persistence.entity.*; import org.jlab.jam.persistence.enumeration.OperationsType; import org.jlab.smoothness.business.exception.UserFriendlyException; @@ -145,6 +143,8 @@ public BigInteger saveAuthorization( authorizerFacade.isAuthorizer(facility, OperationsType.BEAM, username); } + BeamAuthorization previousAuth = findCurrent(facility); + BeamAuthorization beamAuthorization = new BeamAuthorization(); beamAuthorization.setFacility(facility); beamAuthorization.setComments(comments); @@ -203,6 +203,11 @@ public BigInteger saveAuthorization( da.setAuthorization(beamAuthorization); da.getDestinationAuthorizationPK() .setAuthorizationId(beamAuthorization.getBeamAuthorizationId()); + + boolean changed = isChanged(da, previousAuth); + + da.setChanged(changed); + em.persist(da); } @@ -213,6 +218,67 @@ public BigInteger saveAuthorization( return beamAuthorization.getBeamAuthorizationId(); } + private boolean isChanged( + BeamDestinationAuthorization newDestAuth, BeamAuthorization previousAuth) { + boolean changed = true; + + // System.err.println("Beam Authorization changed?: " + newDestAuth); + + if (previousAuth != null) { + List destList = previousAuth.getDestinationAuthorizationList(); + + // System.err.println("destList: " + destList == null ? "null" : destList.size()); + + for (BeamDestinationAuthorization oldDestAuth : destList) { + if (oldDestAuth + .getDestinationAuthorizationPK() + .getBeamDestinationId() + .equals(newDestAuth.getDestinationAuthorizationPK().getBeamDestinationId())) { + /*System.err.println("Found matching destination \"" + oldDestAuth.getDestination() + "\""); + System.err.println( + "Beam Mode Change \"" + + !EqualityHelper.nullableStringEqual( + oldDestAuth.getBeamMode(), newDestAuth.getBeamMode()) + + "\""); + System.err.println( + "Current Limit Change \"" + + !EqualityHelper.nullableObjEqual( + oldDestAuth.getCwLimit(), newDestAuth.getCwLimit()) + + "\""); + System.err.println( + "Date Change \"" + + !EqualityHelper.nullableDateEqual( + oldDestAuth.getExpirationDate(), newDestAuth.getExpirationDate()) + + "\" - \"" + + oldDestAuth.getExpirationDate() + + "\" vs \"" + + newDestAuth.getExpirationDate() + + "\""); + System.err.println( + "Comment Change \"" + + !EqualityHelper.nullableStringEqual( + oldDestAuth.getComments(), newDestAuth.getComments()) + + "\"");*/ + + // Check if change + changed = + (!EqualityHelper.nullableStringEqual( + oldDestAuth.getBeamMode(), newDestAuth.getBeamMode())) + || (!EqualityHelper.nullableObjEqual( + oldDestAuth.getCwLimit(), newDestAuth.getCwLimit())) + || !EqualityHelper.nullableDateEqual( + oldDestAuth.getExpirationDate(), newDestAuth.getExpirationDate()) + || !EqualityHelper.nullableStringEqual( + oldDestAuth.getComments(), newDestAuth.getComments()); + + break; + } + } + } + + return changed; + } + @PermitAll public void setLogEntry(BigInteger beamAuthorizationId, Long logId, String logbookServer) { BeamAuthorization current = find(beamAuthorizationId); diff --git a/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java b/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java index 9f9623fd..f4322680 100644 --- a/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java +++ b/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java @@ -13,6 +13,7 @@ import javax.persistence.PersistenceContext; import javax.persistence.Query; import javax.persistence.TypedQuery; +import org.jlab.jam.business.util.EqualityHelper; import org.jlab.jam.persistence.entity.*; import org.jlab.jam.persistence.enumeration.OperationsType; import org.jlab.smoothness.business.exception.UserFriendlyException; @@ -137,6 +138,8 @@ public BigInteger saveAuthorization( authorizerFacade.isAuthorizer(facility, OperationsType.RF, username); } + RFAuthorization previousAuth = findCurrent(facility); + RFAuthorization authorization = new RFAuthorization(); authorization.setFacility(facility); authorization.setComments(comments); @@ -193,6 +196,11 @@ public BigInteger saveAuthorization( da.setRFAuthorization(authorization); da.getSegmentAuthorizationPK().setRFAuthorizationId(authorization.getRfAuthorizationId()); + + boolean changed = isChanged(da, previousAuth); + + da.setChanged(changed); + em.persist(da); } @@ -203,6 +211,55 @@ public BigInteger saveAuthorization( return authorization.getRfAuthorizationId(); } + private boolean isChanged(RFSegmentAuthorization newSegAuth, RFAuthorization previousAuth) { + boolean changed = true; + + // System.err.println("RF Authorization changed?: " + newSegAuth); + + if (previousAuth != null) { + List segList = previousAuth.getRFSegmentAuthorizationList(); + + // System.err.println("segList: " + segList == null ? "null" : segList.size()); + + for (RFSegmentAuthorization oldSegAuth : segList) { + if (oldSegAuth + .getSegmentAuthorizationPK() + .getRFSegmentId() + .equals(newSegAuth.getSegmentAuthorizationPK().getRFSegmentId())) { + /*System.err.println("Found matching segment \"" + oldSegAuth.getSegment() + "\""); + System.err.println( + "RF Change \"" + (oldSegAuth.isHighPowerRf() != newSegAuth.isHighPowerRf()) + "\""); + System.err.println( + "Date Change \"" + + !EqualityHelper.nullableDateEqual( + oldSegAuth.getExpirationDate(), newSegAuth.getExpirationDate()) + + "\" - \"" + + oldSegAuth.getExpirationDate() + + "\" vs \"" + + newSegAuth.getExpirationDate() + + "\""); + System.err.println( + "Comment Change \"" + + !EqualityHelper.nullableStringEqual( + oldSegAuth.getComments(), newSegAuth.getComments()) + + "\"");*/ + + // Check if change + changed = + (oldSegAuth.isHighPowerRf() != newSegAuth.isHighPowerRf()) + || !EqualityHelper.nullableDateEqual( + oldSegAuth.getExpirationDate(), newSegAuth.getExpirationDate()) + || !EqualityHelper.nullableStringEqual( + oldSegAuth.getComments(), newSegAuth.getComments()); + + break; + } + } + } + + return changed; + } + @PermitAll public void setLogEntry(BigInteger rfAuthorizationId, Long logId, String logbookServer) { RFAuthorization current = find(rfAuthorizationId); diff --git a/src/main/java/org/jlab/jam/business/util/EqualityHelper.java b/src/main/java/org/jlab/jam/business/util/EqualityHelper.java new file mode 100644 index 00000000..31b581c7 --- /dev/null +++ b/src/main/java/org/jlab/jam/business/util/EqualityHelper.java @@ -0,0 +1,74 @@ +package org.jlab.jam.business.util; + +import java.util.Date; + +public final class EqualityHelper { + private EqualityHelper() { + // Can't instantiate because private + } + + public static boolean nullableObjEqual(Object one, Object two) { + boolean equal = false; + + if (one == null) { + if (two == null) { + equal = true; + } + } else { + equal = one.equals(two); + } + + return equal; + } + + public static boolean nullableStringEqual(String one, String two) { + // String can be null, or contain just whitespace and we treat them as equal + + boolean equal = false; + + if (one != null && one.isBlank()) { + one = null; + } + + if (two != null && two.isBlank()) { + two = null; + } + + if (one == null) { + if (two == null) { + equal = true; + } + } else { + equal = one.equals(two); + } + + return equal; + } + + public static boolean nullableDateEqual(Date one, Date two) { + // Dates can be of type sql.Date vs util.Date and we treat them as equal + + boolean equal = false; + + Long oneUnix = null; + Long twoUnix = null; + + if (one != null) { + oneUnix = one.getTime(); + } + + if (two != null) { + twoUnix = two.getTime(); + } + + if (one == null) { + if (two == null) { + equal = true; + } + } else { + equal = oneUnix.equals(twoUnix); + } + + return equal; + } +} diff --git a/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag b/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag index 85b74399..88b686eb 100644 --- a/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag +++ b/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag @@ -136,7 +136,7 @@
Authorized by ${s:formatUsername(beamAuthorization.authorizedBy)} on
-
+
† Automatically reduced on
diff --git a/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag b/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag index d68503bb..baaf00fe 100644 --- a/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag +++ b/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag @@ -116,7 +116,7 @@ Authorized by ${s:formatUsername(rfAuthorization.authorizedBy)} on
-
+
† Automatically reduced on
From 79042c9df95379eb7157bfaaf8eb5dbc397b7da3 Mon Sep 17 00:00:00 2001 From: ryans Date: Mon, 5 May 2025 12:40:52 -0400 Subject: [PATCH 4/4] Clear comments on OFF --- .../org/jlab/jam/business/session/BeamAuthorizationFacade.java | 2 ++ .../org/jlab/jam/business/session/RFAuthorizationFacade.java | 1 + 2 files changed, 3 insertions(+) diff --git a/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java b/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java index 88c31149..8e05f0d0 100644 --- a/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java +++ b/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java @@ -198,6 +198,8 @@ public BigInteger saveAuthorization( } else { // mode = NONE (OFF) // We force expiration to empty da.setExpirationDate(null); + da.setCwLimit(null); + da.setComments(null); } da.setAuthorization(beamAuthorization); diff --git a/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java b/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java index f4322680..5271bdd2 100644 --- a/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java +++ b/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java @@ -192,6 +192,7 @@ public BigInteger saveAuthorization( } else { // High Power = OFF // We force expiration to empty da.setExpirationDate(null); + da.setComments(null); } da.setRFAuthorization(authorization);
Modified By Authorization Date Authorized ByNotesChange Notes Segment Authorizations
+ + + † + + + + + + + + + + + + + + + + + + + + + Segment Details