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.

Sign up for GitHub

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

TRUNK-5822 : FormField Domain - Switching from Hibernate Mappings to Annotations #4856

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

TRUNK-5822 : FormField Domain - Switching from Hibernate Mappings to Annotations #4856

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a4ee4b0
TRUNK-5822 : FormField Domain - Switching from Hibernate Mappings to …
rishabhrawat05 Dec 2, 2024
6f05566
TRUNK-5822 : FormField Domain - Switching from Hibernate Mappings to …
rishabhrawat05 Dec 2, 2024
d494be7
TRUNK-5822 : Updated FormField class
rishabhrawat05 Dec 3, 2024
39444e4
Updated Form Field Domain
rishabhrawat05 Jan 22, 2025
9d5146b
Update FormField Domain
rishabhrawat05 Jan 22, 2025
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
36 changes: 35 additions & 1 deletion api/src/main/java/org/openmrs/FormField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,20 @@

import java.io.Serializable;
import java.util.Comparator;
import org.hibernate.annotations.Parameter;

rishabhrawat05 marked this conversation as resolved.
Show resolved Hide resolved
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;

import org.codehaus.jackson.annotate.JsonIgnore;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.envers.Audited;

/**
Expand All @@ -23,33 +35,55 @@
* @see org.openmrs.Form
* @see org.openmrs.Field
*/
@Entity
@Table(name = "form_field")
@Audited
public class FormField extends BaseChangeableOpenmrsMetadata implements java.io.Serializable, Comparable<FormField> {

public static final long serialVersionUID = 3456L;

// Fields

@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "form_field_id_seq")
@GenericGenerator(
name = "form_field_id_seq",
strategy = "native",
parameters = @Parameter(name = "sequence", value = "form_field_form_field_id_seq")
)
@Column(name = "form_field_id")
protected Integer formFieldId;

@ManyToOne
rishabhrawat05 marked this conversation as resolved.
Show resolved Hide resolved
@JoinColumn(name = "parent_form_field")
protected FormField parent;

@ManyToOne
@JoinColumn(name = "form_id", nullable = false)
protected Form form;

@ManyToOne(cascade = CascadeType.ALL)
rishabhrawat05 marked this conversation as resolved.
Show resolved Hide resolved
@JoinColumn(name = "field_id", nullable = false)
protected Field field;

@Column(name = "field_number", length = 11)
protected Integer fieldNumber;

@Column(name = "field_part", length = 5)
protected String fieldPart;

@Column(name = "page_number", length = 11)
protected Integer pageNumber;

@Column(name = "min_occurs", length = 11)
protected Integer minOccurs;

@Column(name = "max_occurs", length = 11)
protected Integer maxOccurs;

@Column(name = "reguired", nullable = false, length = 1)
protected Boolean required = false;

@Column(name = "sort_weight", length = 5, nullable = true)
protected Float sortWeight;

// Constructors
Expand Down
1 change: 0 additions & 1 deletion api/src/main/resources/hibernate.cfg.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
<mapping resource="org/openmrs/api/db/hibernate/Field.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/FieldType.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/Form.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/FormField.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/FormResource.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/GlobalProperty.hbm.xml" />
<mapping resource="org/openmrs/api/db/hibernate/Obs.hbm.xml" />
Expand Down
79 changes: 0 additions & 79 deletions api/src/main/resources/org/openmrs/api/db/hibernate/FormField.hbm.xml
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions api/src/test/java/org/openmrs/api/OrderServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.openmrs.DrugIngredient;
import org.openmrs.DrugOrder;
import org.openmrs.Encounter;
import org.openmrs.FormField;
import org.openmrs.FreeTextDosingInstructions;
import org.openmrs.GlobalProperty;
import org.openmrs.Location;
Expand Down Expand Up @@ -2740,6 +2741,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
.addAnnotatedClass(ProgramAttributeType.class)
.addAnnotatedClass(HL7InError.class)
.addAnnotatedClass(OrderType.class)
.addAnnotatedClass(FormField.class)
.getMetadataBuilder().build();


Expand Down