Revize 9e6f791a

Re #8571 - Fixed problems during walk-through code review

src/controllers/certificates_controller.py

@@ -12 +12 @@
 from src.exceptions.database_exception import DatabaseException
 from src.model.subject import Subject
 from src.services.certificate_service import CertificateService, RevocationReasonInvalidException, \
-    CertificateStatusInvalidException, CertificateNotFoundException
+    CertificateStatusInvalidException, CertificateNotFoundException, CertificateAlreadyRevokedException
 #  responsibility.
 from src.services.key_service import KeyService
 
@@ -35 +35 @@
 
 E_NO_ISSUER_FOUND = {"success": False, "data": "No certificate authority with such unique ID exists."}
 E_NO_CERTIFICATES_FOUND = {"success": False, "data": "No such certificate found."}
+E_NO_CERTIFICATE_ALREADY_REVOKED = {"success": False, "data": "Certificate is already revoked."}
 E_NO_CERT_PRIVATE_KEY_FOUND = {"success": False,
                                "data": "Internal server error (certificate's private key cannot be found)."}
 E_NOT_JSON_FORMAT = {"success": False, "data": "The request must be JSON-formatted."}
@@ -340 +341 @@
             try:
                 # set certificate status using certificate_service
                 self.certificate_service.set_certificate_revocation_status(identifier, status, reason)
-            except (RevocationReasonInvalidException, CertificateStatusInvalidException, CertificateNotFoundException):
+            except (RevocationReasonInvalidException, CertificateStatusInvalidException):
                 # these exceptions are thrown in case invalid status or revocation reason is passed to the controller
                 return E_WRONG_PARAMETERS, C_BAD_REQUEST
+            except CertificateAlreadyRevokedException:
+                return E_NO_CERTIFICATE_ALREADY_REVOKED, C_BAD_REQUEST
+            except CertificateNotFoundException:
+                return E_NO_CERTIFICATES_FOUND, C_NOT_FOUND
             return {"success": True,
                     "data": "Certificate status updated successfully."}, C_SUCCESS
         # throw an error in case the request does not contain a json body