From 9d0b046ac736628d21d1ef02831432fea77a3c8a Mon Sep 17 00:00:00 2001
From: Michael Smith <55001769+mlsmith1@users.noreply.github.com>
Date: Tue, 10 Sep 2024 17:40:39 -0400
Subject: [PATCH] Fix duplicate incidentId in loggingservice.yaml

1. Removed duplicate incidentId in IncidentMergeLogEvent, IncidentUnmergeLogEvent, IncidentLinkLogEvent, and the IncidentUnLinkLogEvent.
2. Made the names match STA-010.3b for the members that represent the second incident id in these LogEvents. Corrected the camel case of "IncidentIdunlinkedFrom", changed it to "IncidentIdUnLinkedFrom". Must be fixed in 3b text.
3. DID NOT edit IncidentSplitLogEvent, which also has the duplicate incidentId problem, because the text in 3b doesn't specify a new name for the second incident id.
---
 loggingservice.yaml | 32 ++++++++++----------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/loggingservice.yaml b/loggingservice.yaml
index 589e603..62f4327 100644
--- a/loggingservice.yaml
+++ b/loggingservice.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Logging Service
-  version: "1.2.1"
+  version: "1.2.2"
 servers:
   - url: https://api.example.com/Logging/v1
 paths:
@@ -700,37 +700,28 @@ components:
         - $ref: '#/components/schemas/LogEvent'
         - type: object
           required:
-            - incidentId
-            - mergeIncidentId
+            - incidentIdMerge
           properties:
-            incidentId:
-              type: string
-            mergeIncidentId:
+            incidentIdMerge:
               type: string
     IncidentUnMergeLogEvent:
       allOf:
         - $ref: '#/components/schemas/LogEvent'
         - type: object
           required:
-            - incidentId
-            - unmergedFromIncidentId
+            - incidentIdUnmerge
           properties:
-            incidentId:
-              type: string
-            unmergedFromIncidentId:
+            incidentIdUnmerge:
               type: string
     IncidentLinkLogEvent:
       allOf:
         - $ref: '#/components/schemas/LogEvent'
         - type: object
           required:
-            - incidentId
-            - linkedIncidentId
+            - incidentIdLinked
             - relationship
           properties:
-            incidentId:
-              type: string
-            linkedIncidentId:
+            incidentIdLinked:
               type: string
             relationship:
               type: string
@@ -740,12 +731,9 @@ components:
         - $ref: '#/components/schemas/LogEvent'
         - type: object
           required:
-            - incidentId
-            - unlinkedFromIncidentId
+             - incidentIdUnLinkedFrom
           properties:
-            incidentId:
-              type: string
-            unlinkedFromIncidentId:
+            incidentIdUnLinkedFrom:
               type: string
     IncidentClearLogEvent:
       allOf:
@@ -1534,4 +1522,4 @@ components:
             closeText:
               type: string
             webSocketId:
-              type: string
\ No newline at end of file
+              type: string