Business logic skeletons

diff --git a/logic/pom.xml b/logic/pom.xml
index f0e3afc..04d8192 100644 (file)
--- a/logic/pom.xml
+++ b/logic/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>aquarium</artifactId>
@@ -11,4 +12,18 @@
   <version>0.0.1-SNAPSHOT</version>
   <name>Aquarium Business Logic</name>
 
+  <dependencies>
+    <dependency>
+      <groupId>gr.grnet.aquarium</groupId>
+      <artifactId>model</artifactId>
+      <version>0.0.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-libs</groupId>
+      <artifactId>scalajpa_2.9.1</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
 </project>

diff --git a/logic/src/main/scala/gr/grnet/aquarium/logic/Accounts.scala b/logic/src/main/scala/gr/grnet/aquarium/logic/Accounts.scala
new file mode 100644 (file)
index 0000000..c98e5ee
--- /dev/null
+++ b/logic/src/main/scala/gr/grnet/aquarium/logic/Accounts.scala
@@ -0,0 +1,20 @@
+package gr.grnet.aquarium.logic
+
+import gr.grnet.aquarium.model._
+import org.scala_libs.jpa.{ThreadLocalEM, LocalEMF}
+
+object DB extends LocalEMF("aquarium", true) with ThreadLocalEM {}
+
+trait Accounts {
+
+  def addUserToGroup(u : User, g : Group) = {
+    g.users.add u
+    DB.persist g
+  }
+
+
+  def addUserToOrg(u : User, o : Organization) = {
+    o.users.add u
+    DB.persist o
+  }
+}
\ No newline at end of file

diff --git a/logic/src/main/scala/gr/grnet/aquarium/logic/Bills.scala b/logic/src/main/scala/gr/grnet/aquarium/logic/Bills.scala
new file mode 100644 (file)
index 0000000..b9cd6fc
--- /dev/null
+++ b/logic/src/main/scala/gr/grnet/aquarium/logic/Bills.scala
@@ -0,0 +1,13 @@
+package gr.grnet.aquarium.logic
+
+import gr.grnet.aquarium.model._
+import org.scala_libs.jpa.{ThreadLocalEM, LocalEMF}
+
+object DB extends LocalEMF("aquarium", true) with ThreadLocalEM {}
+
+trait Bills {
+
+  def calc_bill(u : User) = {
+
+  }
+}
\ No newline at end of file

diff --git a/logic/src/main/scala/gr/grnet/aquarium/logic/Entities.scala b/logic/src/main/scala/gr/grnet/aquarium/logic/Entities.scala
deleted file mode 100644 (file)
index 39de769..0000000
--- a/logic/src/main/scala/gr/grnet/aquarium/logic/Entities.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-package gr.grnet.aquarium.logic
-
-class Entities {
-
-}
\ No newline at end of file

diff --git a/logic/src/test/scala/gr/grnet/aquarium/logic/test/EntitiesTest.scala b/logic/src/test/scala/gr/grnet/aquarium/logic/test/AccountsTest.scala
similarity index 64%
rename from logic/src/test/scala/gr/grnet/aquarium/logic/test/EntitiesTest.scala
rename to logic/src/test/scala/gr/grnet/aquarium/logic/test/AccountsTest.scala
index cc24be6..f01d44a 100644 (file)
--- a/logic/src/test/scala/gr/grnet/aquarium/logic/test/EntitiesTest.scala
+++ b/logic/src/test/scala/gr/grnet/aquarium/logic/test/AccountsTest.scala
@@ -1,6 +1,6 @@
 package gr.grnet.aquarium.logic.test
 
 
-class EntitiesTest {
+class AccountsTest {
 
 }
\ No newline at end of file

diff --git a/model/pom.xml b/model/pom.xml
index b1a8ab7..89aa298 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -11,6 +11,7 @@
     <version>0.0.1-SNAPSHOT</version>
   </parent>
 
+  <groupId>gr.grnet.aquarium</groupId>
   <artifactId>model</artifactId>
   <name>Aquarium Data Model</name>