X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FOrganisation.java;h=d96f95a16a3cbc6e94ebbaaf2374ad9f0a06b29a;hb=3b87dffa5bc6f26356526e2f9d1ae4f14caeca1c;hp=d85ffb81fb42f993d56b2203a5483da197905a3d;hpb=fa1ae652fbff9c7caeded3fc89680703d1da381b;p=gigi.git

diff --git a/src/org/cacert/gigi/dbObjects/Organisation.java b/src/org/cacert/gigi/dbObjects/Organisation.java
index d85ffb81..d96f95a1 100644
--- a/src/org/cacert/gigi/dbObjects/Organisation.java
+++ b/src/org/cacert/gigi/dbObjects/Organisation.java
@@ -6,30 +6,66 @@ import java.util.List;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
+import org.cacert.gigi.dbObjects.Certificate.CertificateStatus;
 
 public class Organisation extends CertificateOwner {
 
-    private final String name;
+    public class Affiliation {
 
-    private final String state;
+        private final User target;
 
-    private final String province;
+        private final boolean master;
 
-    private final String city;
+        private final String fixedOU;
 
-    public Organisation(String name, String state, String province, String city, User creator) {
+        public Affiliation(User target, boolean master, String fixedOU) {
+            this.target = target;
+            this.master = master;
+            this.fixedOU = fixedOU;
+        }
+
+        public User getTarget() {
+            return target;
+        }
+
+        public boolean isMaster() {
+            return master;
+        }
+
+        public String getFixedOU() {
+            return fixedOU;
+        }
+
+        public Organisation getOrganisation() {
+            return Organisation.this;
+        }
+    }
+
+    private String name;
+
+    private String state;
+
+    private String province;
+
+    private String city;
+
+    private String email;
+
+    public Organisation(String name, String state, String province, String city, String email, User creator) {
         this.name = name;
         this.state = state;
         this.province = province;
         this.city = city;
+        this.email = email;
         int id = super.insert();
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO organisations SET id=?, name=?, state=?, province=?, city=?, creator=?");
+        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO organisations SET id=?, name=?, state=?, province=?, city=?, contactEmail=?, creator=?");
         ps.setInt(1, id);
         ps.setString(2, name);
         ps.setString(3, state);
         ps.setString(4, province);
         ps.setString(5, city);
-        ps.setInt(6, creator.getId());
+        ps.setString(6, email);
+        ps.setInt(7, creator.getId());
         synchronized (Organisation.class) {
             ps.execute();
         }
@@ -37,10 +73,12 @@ public class Organisation extends CertificateOwner {
     }
 
     protected Organisation(GigiResultSet rs) {
+        super(rs.getInt("id"));
         name = rs.getString("name");
         state = rs.getString("state");
         province = rs.getString("province");
         city = rs.getString("city");
+        email = rs.getString("contactEmail");
     }
 
     public String getName() {
@@ -59,6 +97,10 @@ public class Organisation extends CertificateOwner {
         return city;
     }
 
+    public String getContactEmail() {
+        return email;
+    }
+
     public static synchronized Organisation getById(int id) {
         CertificateOwner co = CertificateOwner.getById(id);
         if (co instanceof Organisation) {
@@ -67,12 +109,20 @@ public class Organisation extends CertificateOwner {
         return null;
     }
 
-    public void addAdmin(User admin, User actor) {
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO org_admin SET orgid=?, memid=?, creator=?");
-        ps.setInt(1, getId());
-        ps.setInt(2, admin.getId());
-        ps.setInt(3, actor.getId());
-        ps.execute();
+    public synchronized void addAdmin(User admin, User actor, boolean master) {
+        GigiPreparedStatement ps1 = DatabaseConnection.getInstance().prepare("SELECT 1 FROM org_admin WHERE orgid=? AND memid=? AND deleted is null");
+        ps1.setInt(1, getId());
+        ps1.setInt(2, admin.getId());
+        GigiResultSet result = ps1.executeQuery();
+        if (result.next()) {
+            return;
+        }
+        GigiPreparedStatement ps2 = DatabaseConnection.getInstance().prepare("INSERT INTO org_admin SET orgid=?, memid=?, creator=?, master=?");
+        ps2.setInt(1, getId());
+        ps2.setInt(2, admin.getId());
+        ps2.setInt(3, actor.getId());
+        ps2.setString(4, master ? "y" : "n");
+        ps2.execute();
     }
 
     public void removeAdmin(User admin, User actor) {
@@ -83,16 +133,51 @@ public class Organisation extends CertificateOwner {
         ps.execute();
     }
 
-    public List<User> getAllAdmins() {
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT memid FROM org_admin WHERE orgid=? AND deleted is null");
+    public List<Affiliation> getAllAdmins() {
+        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT memid, master FROM org_admin WHERE orgid=? AND deleted is null");
         ps.setInt(1, getId());
         GigiResultSet rs = ps.executeQuery();
         rs.last();
-        ArrayList<User> al = new ArrayList<>(rs.getRow());
+        ArrayList<Affiliation> al = new ArrayList<>(rs.getRow());
         rs.beforeFirst();
         while (rs.next()) {
-            al.add(User.getById(rs.getInt(1)));
+            al.add(new Affiliation(User.getById(rs.getInt(1)), rs.getString(2).equals("y"), null));
         }
         return al;
     }
+
+    public static Organisation[] getOrganisations(int offset, int count) {
+        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT certOwners.id FROM organisations inner join certOwners on certOwners.id=organisations.id where certOwners.deleted is null LIMIT ?,?");
+        ps.setInt(1, offset);
+        ps.setInt(2, count);
+        GigiResultSet res = ps.executeQuery();
+        res.last();
+        Organisation[] resu = new Organisation[res.getRow()];
+        res.beforeFirst();
+        int i = 0;
+        while (res.next()) {
+            resu[i++] = getById(res.getInt(1));
+        }
+        return resu;
+    }
+
+    public void update(String o, String c, String st, String l, String mail) {
+        for (Certificate cert : getCertificates(false)) {
+            if (cert.getStatus() == CertificateStatus.ISSUED) {
+                cert.revoke();
+            }
+        }
+        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE organisations SET name=?, state=?, province=?, city=?, contactEmail=?");
+        ps.setString(1, o);
+        ps.setString(2, c);
+        ps.setString(3, st);
+        ps.setString(4, l);
+        ps.setString(5, mail);
+        ps.execute();
+        email = mail;
+        name = o;
+        state = c;
+        province = st;
+        city = l;
+    }
 }