UR Merged Test

api-docs/openapi.json

@@ -2178,98 +2178,6 @@
         }
       }
     },
-    "/registry/org/{shortname}/id_quota": {
-      "get": {
-        "tags": [
-          "Registry Organization"
-        ],
-        "summary": "Retrieves an organization's CVE ID quota (accessible to all registered users)",
-        "description": "  <h2>Access Control</h2>  <p>All registered users can access this endpoint</p>  <h2>Expected Behavior</h2>  <p><b>Regular, CNA & Admin Users:</b> Retrieves the CVE ID quota for the user's organization</p>  <p><b>Secretariat:</b> Retrieves the CVE ID quota for any organization</p>",
-        "operationId": "orgIdQuota",
-        "parameters": [
-          {
-            "name": "shortname",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string"
-            },
-            "description": "The shortname of the organization"
-          },
-          {
-            "$ref": "#/components/parameters/apiEntityHeader"
-          },
-          {
-            "$ref": "#/components/parameters/apiUserHeader"
-          },
-          {
-            "$ref": "#/components/parameters/apiSecretHeader"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Returns the CVE ID quota for an organization",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "../schemas/registry-org/get-registry-org-quota-response.json"
-                }
-              }
-            }
-          },
-          "400": {
-            "description": "Bad Request",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "../schemas/errors/bad-request.json"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "Not Authenticated",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "../schemas/errors/generic.json"
-                }
-              }
-            }
-          },
-          "403": {
-            "description": "Forbidden",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "../schemas/errors/generic.json"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "Not Found",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "../schemas/errors/generic.json"
-                }
-              }
-            }
-          },
-          "500": {
-            "description": "Internal Server Error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "../schemas/errors/generic.json"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
     "/registry/org/{identifier}": {
       "get": {
         "tags": [

src/controller/audit.controller/audit.controller.js

@@ -78,7 +78,7 @@ async function createAuditDocumentForOrg (req, res, next) {
             body.target_uuid,
             entry.audit_object,
             entry.change_author,
-            { session }
+            { session, upsert: true }
           )
         }
       } else {
@@ -87,7 +87,7 @@ async function createAuditDocumentForOrg (req, res, next) {
           body.target_uuid,
           body.audit_object || {},
           body.change_author || req.ctx.org,
-          { session }
+          { session, upsert: true }
         )
       }
 

src/controller/conversation.controller/conversation.controller.js

@@ -23,7 +23,7 @@ async function getConversationsForTargetUUID (req, res, next) {
   const repo = req.ctx.repositories.getConversationRepository()
   const targetUUID = req.params.uuid
 
-  const response = await repo.getAllByTargetUUID(targetUUID)
+  const response = await repo.getAllByTargetUUID(targetUUID, true)
   return res.status(200).json(response)
 }
 
@@ -46,15 +46,7 @@ async function createConversationForTargetUUID (req, res, next) {
       return res.status(400).json({ message: 'Missing required field body' })
     }
 
-    const conversationBody = {
-      target_uuid: targetUUID,
-      author_id: user.UUID,
-      author_name: [user.name.first, user.name.last].join(' '),
-      author_role: 'Secretariat',
-      visibility: body.visibility ? body.visibility.toLowerCase() : 'private',
-      body: body.body
-    }
-    const result = await repo.createConversation(conversationBody, { session })
+    const result = await repo.createConversation(targetUUID, body, user, true, { session })
     await session.commitTransaction()
     if (!result) {
       return res.status(500).json({ message: 'Failed to create conversation' })
@@ -81,22 +73,8 @@ async function createConversationForTargetUUID (req, res, next) {
   }
 }
 
-async function updateMessage (req, res, next) {
-  const repo = req.ctx.repositories.getConversationRepository()
-  const targetUUID = req.params.uuid
-  const body = req.body
-
-  if (!body.body) {
-    return res.status(400).json({ message: 'Missing required field body' })
-  }
-
-  const result = await repo.updateConversation(body, targetUUID)
-  return res.status(200).json(result)
-}
-
 module.exports = {
   getAllConversations,
   getConversationsForTargetUUID,
-  createConversationForTargetUUID,
-  updateMessage
+  createConversationForTargetUUID
 }

src/controller/conversation.controller/index.js

@@ -33,12 +33,4 @@ router.post('/conversation/target/:uuid',
   controller.createConversationForTargetUUID
 )
 
-// Update conversation message - SEC only
-router.put('/conversation/:uuid/message',
-  mw.validateUser,
-  mw.onlySecretariat,
-  param(['uuid']).isUUID(4),
-  controller.updateMessage
-)
-
 module.exports = router