X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FCertificateOwner.java;h=84acca2eefb7d55e8f670e29147d8686c93ef1ab;hb=673e3f834a719f3b1bfceedfd801a21ca7842cf2;hp=26a70b67101019f36dc089531f9c7221904a45f9;hpb=6f951295dfd62c5fa1ddb0977febeb58728bec50;p=gigi.git

diff --git a/src/org/cacert/gigi/dbObjects/CertificateOwner.java b/src/org/cacert/gigi/dbObjects/CertificateOwner.java
index 26a70b67..84acca2e 100644
--- a/src/org/cacert/gigi/dbObjects/CertificateOwner.java
+++ b/src/org/cacert/gigi/dbObjects/CertificateOwner.java
@@ -8,15 +8,20 @@ import org.cacert.gigi.database.GigiResultSet;
 
 public abstract class CertificateOwner implements IdCachable {
 
-    private static ObjectCache<CertificateOwner> myCache = new ObjectCache<>();
+    private static final ObjectCache<CertificateOwner> myCache = new ObjectCache<>();
 
     private int id;
 
-    public CertificateOwner(int id) {
+    protected CertificateOwner(int id) {
         this.id = id;
     }
 
-    public CertificateOwner() {}
+    protected CertificateOwner() {
+        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO `certOwners` DEFAULT VALUES");
+        ps.execute();
+        id = ps.lastInsertId();
+        myCache.put(this);
+    }
 
     public int getId() {
         return id;
@@ -25,7 +30,7 @@ public abstract class CertificateOwner implements IdCachable {
     public static synchronized CertificateOwner getById(int id) {
         CertificateOwner u = myCache.get(id);
         if (u == null) {
-            GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT *, users.id AS uid, organisations.id AS oid FROM certOwners LEFT JOIN users ON users.id=certOwners.id LEFT JOIN organisations ON organisations.id = certOwners.id WHERE certOwners.id=? AND deleted is null");
+            GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT *, `users`.`id` AS uid, `organisations`.`id` AS oid FROM `certOwners` LEFT JOIN `users` ON `users`.`id`=`certOwners`.`id` LEFT JOIN `organisations` ON `organisations`.`id` = `certOwners`.`id` WHERE `certOwners`.`id`=? AND `deleted` is null");
             ps.setInt(1, id);
             try (GigiResultSet rs = ps.executeQuery()) {
                 if ( !rs.next()) {
@@ -43,22 +48,8 @@ public abstract class CertificateOwner implements IdCachable {
         return u;
     }
 
-    protected int insert() {
-        synchronized (User.class) {
-            if (id != 0) {
-                throw new Error("refusing to insert");
-            }
-            GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO certOwners() VALUES()");
-            ps.execute();
-            id = ps.lastInsertId();
-            myCache.put(this);
-        }
-
-        return id;
-    }
-
     public Domain[] getDomains() {
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM domains WHERE memid=? AND deleted IS NULL");
+        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `id` FROM `domains` WHERE `memid`=? AND `deleted` IS NULL");
         ps.setInt(1, getId());
 
         try (GigiResultSet rs = ps.executeQuery()) {
@@ -75,9 +66,9 @@ public abstract class CertificateOwner implements IdCachable {
     public Certificate[] getCertificates(boolean includeRevoked) {
         GigiPreparedStatement ps;
         if (includeRevoked) {
-            ps = DatabaseConnection.getInstance().prepare("SELECT serial FROM certs WHERE memid=?");
+            ps = DatabaseConnection.getInstance().prepare("SELECT id FROM certs WHERE memid=?");
         } else {
-            ps = DatabaseConnection.getInstance().prepare("SELECT serial FROM certs WHERE memid=? AND revoked IS NULL");
+            ps = DatabaseConnection.getInstance().prepare("SELECT id FROM certs WHERE memid=? AND revoked IS NULL");
         }
         ps.setInt(1, getId());
 
@@ -85,7 +76,7 @@ public abstract class CertificateOwner implements IdCachable {
             LinkedList<Certificate> data = new LinkedList<Certificate>();
 
             while (rs.next()) {
-                data.add(Certificate.getBySerial(rs.getString(1)));
+                data.add(Certificate.getById(rs.getInt(1)));
             }
 
             return data.toArray(new Certificate[0]);
@@ -106,7 +97,7 @@ public abstract class CertificateOwner implements IdCachable {
     public abstract boolean isValidEmail(String email);
 
     public void delete() {
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE certOwners SET deleted=NOW() WHERE id=?");
+        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE `certOwners` SET `deleted`=NOW() WHERE `id`=?");
         ps.setInt(1, getId());
         ps.execute();
         myCache.remove(this);