Commit 5be2ac47 by Tuomas Riihimäki

There, I fixeds it

1 parent 49762fda
package fi.codecrew.moya.beans; package fi.codecrew.moya.beans;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter; import java.io.StringWriter;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
...@@ -91,10 +92,25 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal { ...@@ -91,10 +92,25 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal {
|| merchantPassword == null || merchantPassword.isEmpty()); || merchantPassword == null || merchantPassword.isEmpty());
} }
public static void main(String[] asd) public static void main(String[] asd) throws ParserConfigurationException, SAXException, IOException
{ {
System.out.println(Calendar.getInstance().getTimeInMillis()); // DocumentBuilderFactory dbFactory =
System.out.println(Calendar.getInstance().getTimeInMillis() / 1000); // DocumentBuilderFactory.newInstance();
// DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
// Document doc = dBuilder.parse(xmlstr);
// // DOMParser parser = new DOMParser();
// // Document doc = parser.getDocument();
// // parser.parse(new InputSource(new StringReader(xmlReturn)));
// Element root = doc.getDocumentElement();
// root.normalize();
// // NodeList rootChildren = root.getChildNodes();
// // for (int i = 0; i < rootChildren.getLength(); ++i)
// // {
// // logger.info("Rootchild {}", rootChildren.item(i).getNodeName());
// // }
//
// Node payments = root.getElementsByTagName("banks").item(0);
} }
private static final String DATEFORMAT = "yyyyMMdd"; private static final String DATEFORMAT = "yyyyMMdd";
...@@ -226,7 +242,10 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal { ...@@ -226,7 +242,10 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal {
// parser.parse(new InputSource(new StringReader(xmlReturn))); // parser.parse(new InputSource(new StringReader(xmlReturn)));
DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
DocumentBuilder dBuilder = dbFactory.newDocumentBuilder(); DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
Document doc = dBuilder.parse(xmlReturn);
InputStream xmlstr = IOUtils.toInputStream(xmlReturn);
Document doc = dBuilder.parse(xmlstr);
// Document doc = parser.getDocument(); // Document doc = parser.getDocument();
Element root = doc.getDocumentElement(); Element root = doc.getDocumentElement();
root.normalize(); root.normalize();
......
...@@ -483,7 +483,6 @@ public class PlaceBean implements PlaceBeanLocal { ...@@ -483,7 +483,6 @@ public class PlaceBean implements PlaceBeanLocal {
@RolesAllowed(MapPermission.S_BUY_PLACES) @RolesAllowed(MapPermission.S_BUY_PLACES)
public Place unbuyPlace(Place place) { public Place unbuyPlace(Place place) {
place = placeFacade.reload(place); place = placeFacade.reload(place);
if (place.getGroup() != null) { if (place.getGroup() != null) {
place.getGroup().getPlaces().remove(place); place.getGroup().getPlaces().remove(place);
} }
......
...@@ -4,10 +4,9 @@ ...@@ -4,10 +4,9 @@
*/ */
package fi.codecrew.moya.model; package fi.codecrew.moya.model;
import static javax.persistence.CascadeType.ALL;
import java.util.Calendar; import java.util.Calendar;
import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
...@@ -50,7 +49,7 @@ public class GroupMembership extends GenericEntity { ...@@ -50,7 +49,7 @@ public class GroupMembership extends GenericEntity {
@Column(name = "invite_name") @Column(name = "invite_name")
private String inviteName; private String inviteName;
@ManyToOne(optional = false, cascade = ALL) @ManyToOne(optional = false, cascade = CascadeType.PERSIST)
@JoinColumn(name = GROUP_ID, referencedColumnName = "id", nullable = false) @JoinColumn(name = GROUP_ID, referencedColumnName = "id", nullable = false)
private PlaceGroup placeGroup; private PlaceGroup placeGroup;
......
...@@ -64,15 +64,14 @@ public class PlaceGroup extends GenericEntity { ...@@ -64,15 +64,14 @@ public class PlaceGroup extends GenericEntity {
@ManyToOne @ManyToOne
private EventUser creator; private EventUser creator;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "placeGroup") @OneToMany(cascade = { CascadeType.PERSIST }, mappedBy = "placeGroup")
private List<GroupMembership> members = new ArrayList<GroupMembership>(); private List<GroupMembership> members = new ArrayList<GroupMembership>();
@OneToMany(mappedBy = "group") @OneToMany(mappedBy = "group")
@OrderBy("name") @OrderBy("name")
private List<Place> places; private List<Place> places;
public PlaceGroup(LanEvent event, Calendar groupCreated, Calendar groupEdited, public PlaceGroup(LanEvent event, Calendar groupCreated, Calendar groupEdited, boolean groupActive) {
boolean groupActive) {
this.event = event; this.event = event;
this.created = groupCreated; this.created = groupCreated;
this.edited = groupEdited; this.edited = groupEdited;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!