Merge pull request #7162 from fstagni/prodDNAuthor

[8.1] Production System: from DN to Author

Author: fstagni

src/DIRAC/ProductionSystem/DB/ProductionDB.py

@@ -44,7 +44,7 @@ def __init__(self, dbname=None, dbconfig=None, dbIn=None, parentLogger=None):
             "Description",
             "CreationDate",
             "LastUpdate",
-            "AuthorDN",
+            "Author",
             "AuthorGroup",
             "Status",
         ]
@@ -77,12 +77,12 @@ def __init__(self, dbname=None, dbconfig=None, dbIn=None, parentLogger=None):
             "Cleaned": "cleanTransformation",
         }
 
-    def addProduction(self, prodName, prodDescription, authorDN, authorGroup, connection=False):
+    def addProduction(self, prodName, prodDescription, author, authorGroup, connection=False):
         """Create new production starting from its description
 
         :param str prodName: a string with the Production name
         :param str prodDescription: a json object with the Production description
-        :param str authorDN: string with the author DN
+        :param str author: string with the author
         :param str authorGroup: string with author group
         """
         connection = self.__getConnection(connection)
@@ -96,9 +96,9 @@ def addProduction(self, prodName, prodDescription, authorDN, authorGroup, connec
 
         req = (
             "INSERT INTO Productions (ProductionName,Description,CreationDate,LastUpdate,\
-                                    AuthorDN,AuthorGroup,Status)\
+                                    Author,AuthorGroup,Status)\
                                 VALUES ('%s','%s',UTC_TIMESTAMP(),UTC_TIMESTAMP(),'%s','%s','New');"
-            % (prodName, prodDescription, authorDN, authorGroup)
+            % (prodName, prodDescription, author, authorGroup)
         )
 
         res = self._update(req, conn=connection)

src/DIRAC/ProductionSystem/DB/ProductionDB.sql

@@ -25,7 +25,8 @@ CREATE TABLE Productions(
     Description LONGTEXT,
     CreationDate DATETIME,
     LastUpdate DATETIME,
-    AuthorDN VARCHAR(255) NOT NULL,
+    Author VARCHAR(255) NOT NULL,
+    AuthorDN VARCHAR(255) DEFAULT NULL,
     AuthorGroup VARCHAR(255) NOT NULL,
     Status  CHAR(32) DEFAULT 'New',
     PRIMARY KEY(ProductionID),

src/DIRAC/ProductionSystem/Service/ProductionManagerHandler.py

@@ -30,23 +30,23 @@ def initializeHandler(cls, serviceInfoDict):
     # These are the methods to manipulate the Productions table
     #
 
-    types_addProduction = [str, str]
+    types_addProduction = [prodTypes, str]
 
     def export_addProduction(self, prodName, prodDescription):
         credDict = self.getRemoteCredentials()
-        authorDN = credDict.get("DN", credDict.get("CN"))
+        author = credDict.get("username", credDict.get("DN", credDict.get("CN")))
         authorGroup = credDict.get("group")
-        res = self.productionDB.addProduction(prodName, prodDescription, authorDN, authorGroup)
+        res = self.productionDB.addProduction(prodName, prodDescription, author, authorGroup)
         if res["OK"]:
-            gLogger.info("Added production %d" % res["Value"])
+            gLogger.info("Added production", res["Value"])
         return res
 
     types_deleteProduction = [prodTypes]
 
     def export_deleteProduction(self, prodName):
         credDict = self.getRemoteCredentials()
-        authorDN = credDict.get("DN", credDict.get("CN"))
-        return self.productionDB.deleteProduction(prodName, author=authorDN)
+        author = credDict.get("username")
+        return self.productionDB.deleteProduction(prodName, author=author)
 
     types_getProductions = []
 

src/DIRAC/TransformationSystem/DB/TransformationDB.sql

@@ -29,7 +29,7 @@ CREATE TABLE Transformations(
     CreationDate DATETIME,
     LastUpdate DATETIME,
     Author VARCHAR(255) NOT NULL,
-    AuthorDN VARCHAR(255),
+    AuthorDN VARCHAR(255) DEFAULT NULL,
     AuthorGroup VARCHAR(255) NOT NULL,
     Type CHAR(32) DEFAULT 'Simulation',
     Plugin CHAR(32) DEFAULT 'None',