From fe9e5d70d21a813e679921a767c487f37559147f Mon Sep 17 00:00:00 2001
From: "Matthew D. Groves" <me@mgroves.com>
Date: Mon, 25 Sep 2023 13:36:17 -0400
Subject: [PATCH] #20 I screwed up, trying that again

---
 .../Integration/GlobalCouchbaseIntegrationSetUp.cs     | 10 +++++-----
 .../Articles/Services/CommentsDataService.cs           |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Conduit/Conduit.Tests/Integration/GlobalCouchbaseIntegrationSetUp.cs b/Conduit/Conduit.Tests/Integration/GlobalCouchbaseIntegrationSetUp.cs
index d9ce9eec85..95ca482080 100644
--- a/Conduit/Conduit.Tests/Integration/GlobalCouchbaseIntegrationSetUp.cs
+++ b/Conduit/Conduit.Tests/Integration/GlobalCouchbaseIntegrationSetUp.cs
@@ -64,19 +64,19 @@ public async Task RunBeforeAllTests()
         services.AddCouchbaseBucket<IConduitBucketProvider>(_config["Couchbase:BucketName"], b =>
         {
             b
-                .AddScope("_default")
+                .AddScope(_config["Couchbase:ScopeName"])
                 .AddCollection<IConduitTagsCollectionProvider>("Tags");
             b
-                .AddScope("_default")
+                .AddScope(_config["Couchbase:ScopeName"])
                 .AddCollection<IConduitArticlesCollectionProvider>("Articles");
             b
-                .AddScope("_default")
+                .AddScope(_config["Couchbase:ScopeName"])
                 .AddCollection<IConduitFavoritesCollectionProvider>("Favorites");
             b
-                .AddScope("_default")
+                .AddScope(_config["Couchbase:ScopeName"])
                 .AddCollection<IConduitUsersCollectionProvider>("Users");
             b
-                .AddScope("_default")
+                .AddScope(_config["Couchbase:ScopeName"])
                 .AddCollection<IConduitFollowsCollectionProvider>("Follows");
         });
 
diff --git a/Conduit/Conduit.Web/Articles/Services/CommentsDataService.cs b/Conduit/Conduit.Web/Articles/Services/CommentsDataService.cs
index 6ded10a9e6..19938feb90 100644
--- a/Conduit/Conduit.Web/Articles/Services/CommentsDataService.cs
+++ b/Conduit/Conduit.Web/Articles/Services/CommentsDataService.cs
@@ -77,9 +77,9 @@ public async Task<DataServiceResult<List<CommentListDataView>>> Get(string slug,
                 }}
             }}
 
-        FROM {bucket.Name}._default.Comments c2
+        FROM {bucket.Name}.`{scope.Name}`.`Comments` c2
         UNNEST c2 AS c
-        JOIN `{bucket.Name}`.`{scope.Name}`._default.Users author ON c.authorUsername = META(author).id
+        JOIN `{bucket.Name}`.`{scope.Name}`.`Users` author ON c.authorUsername = META(author).id
 
         {loggedInJoin}