From 2cc16de79d34c1098c6cf1d9fc6ff0469f757701 Mon Sep 17 00:00:00 2001
From: dilankavishka <dkgamage01@gmail.com>
Date: Sun, 19 Jan 2025 10:22:17 +0530
Subject: [PATCH 1/2] update order set with annotations

---
 api/src/main/java/org/openmrs/OrderSet.java   | 28 ++++++-
 api/src/main/resources/hibernate.cfg.xml      |  1 -
 .../openmrs/api/db/hibernate/OrderSet.hbm.xml | 79 -------------------
 .../org/openmrs/api/OrderServiceTest.java     |  1 +
 4 files changed, 27 insertions(+), 82 deletions(-)
 delete mode 100644 api/src/main/resources/org/openmrs/api/db/hibernate/OrderSet.hbm.xml

diff --git a/api/src/main/java/org/openmrs/OrderSet.java b/api/src/main/java/org/openmrs/OrderSet.java
index b8d904aff6e8..adf00aa76ba0 100644
--- a/api/src/main/java/org/openmrs/OrderSet.java
+++ b/api/src/main/java/org/openmrs/OrderSet.java
@@ -12,15 +12,21 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
 import org.hibernate.envers.Audited;
 import org.openmrs.api.APIException;
 
+import javax.persistence.*;
+
 /**
  * Represents the grouping of orders into a set,
  * so as to give decision support for the doctors
  * 
  * @since 1.12
  */
+@Entity
+@Table(name = "order_set")
 @Audited
 public class OrderSet extends BaseCustomizableMetadata<OrderSetAttribute> {
 	
@@ -36,12 +42,30 @@ public enum Operator {
 		ALL, ONE, ANY
 	}
 	
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "order_set_id_seq")
+	@GenericGenerator(
+		name = "order_set_id_seq",
+		strategy = "native",
+		parameters = @Parameter(name = "sequence", value = "order_set_order_set_id_seq")
+	)
+	@Column(name = "order_set_id", nullable = false)
 	private Integer orderSetId;
-	
+
+	@Column(name = "operator", nullable = false)
+	@Enumerated(EnumType.STRING)
 	private Operator operator;
-	
+
+	@OneToMany(
+		mappedBy = "orderSet",
+		cascade = CascadeType.ALL,
+		orphanRemoval = true
+	)
+	@OrderColumn(name = "sequence_number")
 	private List<OrderSetMember> orderSetMembers;
 	
+	@ManyToOne
+	@JoinColumn(name = "category")
 	private Concept category;
 
 	/**
diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
index 2bd3c6ad8dc1..3ecd25083298 100644
--- a/api/src/main/resources/hibernate.cfg.xml
+++ b/api/src/main/resources/hibernate.cfg.xml
@@ -66,7 +66,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/Order.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/OrderAttribute.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/OrderAttributeType.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/OrderSet.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/OrderSetMember.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/OrderSetAttributeType.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/OrderSetAttribute.hbm.xml" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSet.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSet.hbm.xml
deleted file mode 100644
index 8e7e228dd9e7..000000000000
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSet.hbm.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    This Source Code Form is subject to the terms of the Mozilla Public License,
-    v. 2.0. If a copy of the MPL was not distributed with this file, You can
-    obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
-    the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
-
-    Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
-    graphic logo is a trademark of OpenMRS Inc.
-
--->
-<!DOCTYPE hibernate-mapping PUBLIC
-        "-//Hibernate/Hibernate Mapping DTD 3.1//EN"
-        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.openmrs">
-
-    <class name="OrderSet" table="order_set">
-
-        <id name="orderSetId" type="int" column="order_set_id" unsaved-value="0">
-            <generator class="native">
-                <param name="sequence">order_set_order_set_id_seq</param>
-            </generator>
-        </id>
-
-        <property name="name" type="java.lang.String"
-                  column="name" not-null="true" />
-        <property name="description" type="java.lang.String"
-                  column="description" not-null="true" />
-        <property name="operator" column="operator" not-null="true">
-            <type name="org.hibernate.type.EnumType">
-                <param name="enumClass">org.openmrs.OrderSet$Operator</param>
-                <param name="useNamed">true</param>
-            </type>
-        </property>
-
-        <many-to-one name="category" class="org.openmrs.Concept"
-			not-null="false" column="category" />
-
-        <list name="orderSetMembers" lazy="true" cascade="save-update" inverse="false">
-            <key column="order_set_id" not-null="true"/>
-            <list-index column="sequence_number"/>
-            <one-to-many class="OrderSetMember" />
-        </list>
-
-
-        <!-- bi-directional many-to-one association to User -->
-        <many-to-one name="creator" class="User" not-null="true">
-            <column name="creator"/>
-        </many-to-one>
-        <property name="dateCreated" type="java.util.Date"
-                  column="date_created" not-null="true" length="19" />
-        <property name="retired" type="java.lang.Boolean"
-                  column="retired" length="1" not-null="true"/>
-        <!-- bi-directional many-to-one association to User -->
-        <many-to-one name="retiredBy" class="User">
-            <column name="retired_by" />
-        </many-to-one>
-        <property name="retireReason" type="java.lang.String"
-                  column="retire_reason" length="255" />
-        <property name="dateRetired" type="java.util.Date"
-                  column="date_retired" length="19" />
-        <!-- bi-directional many-to-one association to User -->
-        <many-to-one name="changedBy" class="User">
-            <column name="changed_by" />
-        </many-to-one>
-        <property name="dateChanged" type="java.util.Date"
-                  column="date_changed" length="19" />
-        <property name="uuid" type="java.lang.String"
-                  column="uuid" length="38" unique="true" not-null="true"/>
-          <set name="attributes" lazy="true" inverse="true" batch-size="100"
-            cascade="all-delete-orphan" order-by="voided asc">
-            <key column="order_set_id" />
-            <one-to-many class="OrderSetAttribute" />
-        </set>        
-
-    </class>
-
-</hibernate-mapping>
diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
index 6d553c038256..aaa6fd7a8591 100644
--- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java
+++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -2740,6 +2740,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			.addAnnotatedClass(ProgramAttributeType.class)
 			.addAnnotatedClass(HL7InError.class)
 			.addAnnotatedClass(OrderType.class)
+			.addAnnotatedClass(OrderSet.class)
 			.getMetadataBuilder().build();
 
 

From 3c3906900f199ed03a7003b6eb275844c57a020a Mon Sep 17 00:00:00 2001
From: dilankavishka <dkgamage01@gmail.com>
Date: Sun, 19 Jan 2025 12:56:13 +0530
Subject: [PATCH 2/2] use individual imports instead of wild card imports

---
 api/src/main/java/org/openmrs/OrderSet.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/api/src/main/java/org/openmrs/OrderSet.java b/api/src/main/java/org/openmrs/OrderSet.java
index adf00aa76ba0..ab55cb58dad5 100644
--- a/api/src/main/java/org/openmrs/OrderSet.java
+++ b/api/src/main/java/org/openmrs/OrderSet.java
@@ -17,7 +17,19 @@
 import org.hibernate.envers.Audited;
 import org.openmrs.api.APIException;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
+import javax.persistence.Table;
 
 /**
  * Represents the grouping of orders into a set,