From 05830925d54d71e4947eda99ea431f240a813c02 Mon Sep 17 00:00:00 2001
From: Zhihe Li <zhihe.li@hashicorp.com>
Date: Mon, 24 Apr 2023 12:07:23 -0400
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fix=20scope=20model=20in?=
 =?UTF-8?q?=20nested=20users/targets=20(#214)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mirage/serializers/session-recording.js   | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/api/mirage/serializers/session-recording.js b/addons/api/mirage/serializers/session-recording.js
index 4a0d3943c..f6be85e59 100644
--- a/addons/api/mirage/serializers/session-recording.js
+++ b/addons/api/mirage/serializers/session-recording.js
@@ -5,8 +5,7 @@
 
 import ApplicationSerializer from './application';
 import ConnectionRecordingSerializer from './connection-recording';
-import UserSerializer from './user';
-import TargetSerializer from './target';
+import ScopeSerializer from './scope';
 
 export default ApplicationSerializer.extend({
   modelName: 'session-recording',
@@ -15,7 +14,7 @@ export default ApplicationSerializer.extend({
       this,
       arguments
     );
-    const { connectionRecordings, users, targets } = this.schema;
+    const { connectionRecordings, scopes } = this.schema;
 
     // Manually map our models to the actual embedded json representation
     if (model.connectionRecordingIds) {
@@ -27,17 +26,17 @@ export default ApplicationSerializer.extend({
         );
       });
     }
-    if (model.userId) {
-      const user = users.find(model.userId);
-      json.user = UserSerializer.prototype._hashForModel.apply(this, [user]);
-    }
-    if (model.targetId) {
-      const target = targets.find(model.targetId);
-      json.target = TargetSerializer.prototype._hashForModel.apply(this, [
-        target,
+    if (model.user?.scopeId) {
+      const scope = scopes.find(model.user.scopeId);
+      json.user.scope = ScopeSerializer.prototype._hashForModel.apply(this, [
+        scope,
+      ]);
+    }
+    if (model.target?.scopeId) {
+      const scope = scopes.find(model.target.scopeId);
+      json.target.scope = ScopeSerializer.prototype._hashForModel.apply(this, [
+        scope,
       ]);
-      json.target.scope.name = model.target.scope.name;
-      json.target.scope.description = model.target.scope.description;
     }
 
     json.session_id = model.sessionId;