@snowtop/ent 0.1.0-alpha16 → 0.1.0-alpha160-test2

package/core/query/shared_assoc_test.js

@@ -1,33 +1,18 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assocTests = void 0;
-const db_mock_1 = require("../../testutils/db_mock");
+const base_1 = require("../base");
 const ent_1 = require("../ent");
 const viewer_1 = require("../viewer");
 const jest_date_mock_1 = require("jest-date-mock");
 const index_1 = require("../../testutils/fake_data/index");
 const test_helpers_1 = require("../../testutils/fake_data/test_helpers");
-const db_1 = __importStar(require("../db"));
-function assocTests() {
+const clause_1 = require("../clause");
+const builder_1 = require("../../testutils/builder");
+const luxon_1 = require("luxon");
+const convert_1 = require("../convert");
+function assocTests(ml, global = false) {
+    ml.mock();
     describe("custom edge", () => {
         let user1, user2;
         beforeEach(async () => {
@@ -67,29 +52,37 @@ function assocTests() {
     function firstNEntsFilter(contacts) {
         return contacts.reverse().slice(0, N);
     }
-    function verifyQuery({ length = 1, numQueries = 1, limit = ent_1.DefaultLimit, disablePaginationBump = false, }) {
-        if (db_1.default.getDialect() === db_1.Dialect.SQLite) {
-            return;
-        }
-        const queries = db_mock_1.QueryRecorder.getCurrentQueries();
-        expect(queries.length).toBe(length);
+    function getWhereClause(query) {
+        let execArray = /^SELECT (.+) FROM (.+) WHERE (.+)?/.exec(query.query);
+        return execArray?.[3];
+    }
+    function verifyQuery({ length = 1, numQueries = 1, limit = (0, ent_1.getDefaultLimit)(), disablePaginationBump = false, }) {
+        expect(ml.logs.length).toBe(length);
         for (let i = 0; i < numQueries; i++) {
-            const query = queries[i];
+            const whereClause = getWhereClause(ml.logs[i]);
             let expLimit = disablePaginationBump ? limit : limit + 1;
-            expect(query.qs?.whereClause, `${i}`).toBe(
-            // default limit
-            `id1 = $1 AND edge_type = $2 ORDER BY time DESC LIMIT ${expLimit}`);
+            if (global) {
+                expect(whereClause, `${i}`).toBe(
+                // default limit
+                `${(0, clause_1.And)((0, clause_1.Eq)("id1", ""), (0, clause_1.Eq)("edge_type", ""), (0, clause_1.Eq)("deleted_at", null)).clause(1)} ORDER BY time DESC, id2 DESC LIMIT ${expLimit}`);
+            }
+            else {
+                expect(whereClause, `${i}`).toBe(
+                // default limit
+                `${(0, clause_1.And)((0, clause_1.Eq)("id1", ""), (0, clause_1.Eq)("edge_type", "")).clause(1)} ORDER BY time DESC, id2 DESC LIMIT ${expLimit}`);
+            }
         }
     }
     function verifyCountQuery({ length = 1, numQueries = 1 }) {
-        if (db_1.default.getDialect() === db_1.Dialect.SQLite) {
-            return;
-        }
-        const queries = db_mock_1.QueryRecorder.getCurrentQueries();
-        expect(queries.length).toBe(length);
+        expect(ml.logs.length).toBe(length);
         for (let i = 0; i < numQueries; i++) {
-            const query = queries[i];
-            expect(query.qs?.whereClause).toBe(`id1 = $1 AND edge_type = $2`);
+            const whereClause = getWhereClause(ml.logs[i]);
+            if (global) {
+                expect(whereClause).toBe(`${(0, clause_1.And)((0, clause_1.Eq)("id1", ""), (0, clause_1.Eq)("edge_type", ""), (0, clause_1.Eq)("deleted_at", null)).clause(1)}`);
+            }
+            else {
+                expect(whereClause).toBe(`${(0, clause_1.And)((0, clause_1.Eq)("id1", ""), (0, clause_1.Eq)("edge_type", "")).clause(1)}`);
+            }
         }
     }
     // TODO need to test multi-ids with id1s that aren't visible...
@@ -103,16 +96,18 @@ function assocTests() {
         }
         async beforeEach() {
             let [user1, user2, user3] = await Promise.all([
-                (0, test_helpers_1.createAllContacts)({ firstName: "Jon", lastName: "Snow" }),
-                (0, test_helpers_1.createAllContacts)({ firstName: "Aegon", lastName: "Targaryen" }),
-                (0, test_helpers_1.createAllContacts)({ firstName: "Ned", lastName: "Stark" }),
+                (0, test_helpers_1.createAllContacts)({ input: { firstName: "Jon", lastName: "Snow" } }),
+                (0, test_helpers_1.createAllContacts)({
+                    input: { firstName: "Aegon", lastName: "Targaryen" },
+                }),
+                (0, test_helpers_1.createAllContacts)({ input: { firstName: "Ned", lastName: "Stark" } }),
             ]);
             // modify contacts as needed
             user1[1] = this.ents(user1[1]);
             user2[1] = this.ents(user2[1]);
             user3[1] = this.ents(user3[1]);
             this.dataz = [user1, user2, user3];
-            db_mock_1.QueryRecorder.clearQueries();
+            ml.clear();
         }
         getQuery(viewer) {
             return this.filter(index_1.UserToContactsQuery.query(viewer || new viewer_1.LoggedOutViewer(), this.dataz.map((data) => data[0])));
@@ -127,7 +122,7 @@ function assocTests() {
             verifyQuery({
                 length: this.dataz.length,
                 numQueries: this.dataz.length,
-                limit: this.limit || ent_1.DefaultLimit,
+                limit: this.limit || (0, ent_1.getDefaultLimit)(),
             });
         }
         // rawCount isn't affected by filters...
@@ -150,7 +145,7 @@ function assocTests() {
             verifyQuery({
                 length: this.dataz.length,
                 numQueries: this.dataz.length,
-                limit: this.limit || ent_1.DefaultLimit,
+                limit: this.limit || (0, ent_1.getDefaultLimit)(),
             });
         }
         async testEdges() {
@@ -163,7 +158,7 @@ function assocTests() {
             verifyQuery({
                 length: this.dataz.length,
                 numQueries: this.dataz.length,
-                limit: this.limit || ent_1.DefaultLimit,
+                limit: this.limit || (0, ent_1.getDefaultLimit)(),
             });
         }
         async testEnts() {
@@ -187,7 +182,7 @@ function assocTests() {
                 // and then twice to fetch all the nodes for the contacts
                 length: this.dataz.length + this.dataz.length + this.dataz.length * 2,
                 numQueries: this.dataz.length,
-                limit: this.limit || ent_1.DefaultLimit,
+                limit: this.limit || (0, ent_1.getDefaultLimit)(),
             });
         }
     }
@@ -457,7 +452,7 @@ function assocTests() {
             }
             //order is users, then events
             this.expCount = this.ents([...this.users, ...this.events]).length;
-            db_mock_1.QueryRecorder.clearQueries();
+            ml.clear();
         }
         getQuery(viewer) {
             return this.filter(index_1.UserToFollowingQuery.query(viewer || new viewer_1.IDViewer(this.user.id), this.user));
@@ -473,7 +468,7 @@ function assocTests() {
             verifyQuery({
                 length: 1,
                 numQueries: 1,
-                limit: this.limit || ent_1.DefaultLimit,
+                limit: this.limit || (0, ent_1.getDefaultLimit)(),
             });
         }
         // rawCount isn't affected by filters...
@@ -488,7 +483,7 @@ function assocTests() {
             verifyQuery({
                 length: 1,
                 numQueries: 1,
-                limit: this.limit || ent_1.DefaultLimit,
+                limit: this.limit || (0, ent_1.getDefaultLimit)(),
             });
         }
         async testEdges() {
@@ -509,7 +504,7 @@ function assocTests() {
             verifyQuery({
                 length: 1,
                 numQueries: 1,
-                limit: this.limit || ent_1.DefaultLimit,
+                limit: this.limit || (0, ent_1.getDefaultLimit)(),
             });
         }
         async testEnts() {
@@ -533,7 +528,7 @@ function assocTests() {
             //   // 1 for edges, 1 for users, 1 for events
             //   length: 3,
             //   numQueries: 3,
-            //   limit: this.limit || DefaultLimit,
+            //   limit: this.limit || getDefaultLimit(),
             // });
         }
     }
@@ -619,10 +614,9 @@ function assocTests() {
         let user;
         let friendRequests;
         let user2;
-        let friendRequests2;
         beforeEach(async () => {
             [user, friendRequests] = await (0, test_helpers_1.createUserPlusFriendRequests)();
-            [user2, friendRequests2] = await (0, test_helpers_1.createUserPlusFriendRequests)();
+            [user2] = await (0, test_helpers_1.createUserPlusFriendRequests)();
         });
         function getQuery(viewer) {
             return index_1.UserToIncomingFriendRequestsQuery.query(viewer || user.viewer, [
@@ -642,7 +636,7 @@ function assocTests() {
             expect(countMap.get(user.id)).toBe(friendRequests.length);
             expect(countMap.get(user2.id)).toBe(0);
         });
-        test("count", async () => {
+        test("raw count", async () => {
             const countMap = await getQuery().queryAllRawCount();
             expect(countMap.size).toBe(2);
             expect(countMap.get(user.id)).toBe(friendRequests.length);
@@ -669,5 +663,142 @@ function assocTests() {
             expect(entsMapFromUserVCToken.get(user2.id)?.length).toBe(0);
         });
     });
+    if (!global) {
+        return;
+    }
+    // global only tests here
+    describe("deleted edges", () => {
+        let user;
+        let friendRequests;
+        let user2;
+        let postDeletedCount;
+        beforeEach(async () => {
+            [user, friendRequests] = await (0, test_helpers_1.createUserPlusFriendRequests)();
+            user2 = await (0, test_helpers_1.createTestUser)();
+            postDeletedCount = Math.floor(friendRequests.length / 2);
+        });
+        async function deleteEdges() {
+            const action = new builder_1.SimpleAction(user.viewer, index_1.FakeUserSchema, new Map(), base_1.WriteOperation.Edit, user);
+            for (let i = 0; i < friendRequests.length; i++) {
+                if (i % 2 == 0) {
+                    action.builder.orchestrator.removeInboundEdge(friendRequests[i].id, index_1.EdgeType.UserToFriendRequests);
+                }
+            }
+            await action.saveX();
+        }
+        function getQuery(viewer) {
+            return index_1.UserToIncomingFriendRequestsQuery.query(viewer, user.id);
+        }
+        test("ids", async () => {
+            const ids = await getQuery(user.viewer).queryIDs();
+            expect(ids.length).toBe(friendRequests.length);
+        });
+        test("ids after deleted", async () => {
+            await deleteEdges();
+            const idsFromUser = await getQuery(user.viewer).queryIDs();
+            expect(idsFromUser.length).toBe(postDeletedCount);
+        });
+        test("ids deleted. fetch deleted anyways", async () => {
+            await deleteEdges();
+            const idsFromUser = await getQuery(user.viewer)
+                .withoutTransformations()
+                .queryIDs();
+            expect(idsFromUser.length).toBe(friendRequests.length);
+        });
+        test("count", async () => {
+            const count = await getQuery(user.viewer).queryCount();
+            expect(count).toBe(friendRequests.length);
+        });
+        test("count after deleted", async () => {
+            await deleteEdges();
+            const count = await getQuery(user.viewer).queryCount();
+            expect(count).toBe(postDeletedCount);
+        });
+        test("count after deleted. fetch deleted", async () => {
+            await deleteEdges();
+            const count = await getQuery(user.viewer)
+                .withoutTransformations()
+                .queryCount();
+            expect(count).toBe(friendRequests.length);
+        });
+        test("raw count", async () => {
+            const count = await getQuery(user.viewer).queryCount();
+            expect(count).toBe(friendRequests.length);
+        });
+        test("raw count after deleted", async () => {
+            await deleteEdges();
+            const count = await getQuery(user.viewer).queryRawCount();
+            expect(count).toBe(postDeletedCount);
+        });
+        test("raw count after deleted. fetch deleted", async () => {
+            await deleteEdges();
+            const count = await getQuery(user.viewer)
+                .withoutTransformations()
+                .queryRawCount();
+            expect(count).toBe(friendRequests.length);
+        });
+        test("edges", async () => {
+            const edges = await getQuery(user.viewer).queryEdges();
+            expect(edges.length).toBe(friendRequests.length);
+            for (const edge of edges) {
+                expect(edge.deleted_at).toBeNull();
+            }
+        });
+        test("edges after deleted", async () => {
+            await deleteEdges();
+            const edges = await getQuery(user.viewer).queryEdges();
+            expect(edges.length).toBe(postDeletedCount);
+            for (const edge of edges) {
+                expect(edge.deleted_at).toBeNull();
+            }
+        });
+        test("edges after deleted. fetch deleted", async () => {
+            await deleteEdges();
+            const edges = await getQuery(user.viewer)
+                .withoutTransformations()
+                .queryEdges();
+            expect(edges.length).toBe(friendRequests.length);
+            let notDeletedAtCt = 0;
+            for (const edge of edges) {
+                if (edge.deleted_at === null) {
+                    notDeletedAtCt++;
+                }
+                else {
+                    expect(luxon_1.DateTime.fromJSDate((0, convert_1.convertDate)(edge.deleted_at)).isValid).toBe(true);
+                }
+            }
+            expect(notDeletedAtCt).toBe(postDeletedCount);
+        });
+        test("ents", async () => {
+            const viewer = new index_1.ViewerWithAccessToken(user.id, {
+                tokens: {
+                    allow_incoming_friend_request: true,
+                },
+            });
+            const ents = await getQuery(viewer).queryEnts();
+            expect(ents.length).toBe(friendRequests.length);
+        });
+        test("ents after deleted", async () => {
+            await deleteEdges();
+            const viewer = new index_1.ViewerWithAccessToken(user.id, {
+                tokens: {
+                    allow_incoming_friend_request: true,
+                },
+            });
+            const ents = await getQuery(viewer).queryEnts();
+            expect(ents.length).toBe(postDeletedCount);
+        });
+        test("ents after deleted. fetch deleted", async () => {
+            await deleteEdges();
+            const viewer = new index_1.ViewerWithAccessToken(user.id, {
+                tokens: {
+                    allow_incoming_friend_request: true,
+                    always_allow_user: true,
+                },
+            });
+            const ents = await getQuery(viewer).withoutTransformations().queryEnts();
+            expect(ents.length).toBe(friendRequests.length);
+        });
+    });
 }
 exports.assocTests = assocTests;

package/core/query/shared_test.d.ts

@@ -1,14 +1,21 @@
 import { Data, Viewer } from "../base";
 import { FakeUser, FakeContact } from "../../testutils/fake_data/index";
 import { EdgeQuery } from "./query";
+import { MockLogs } from "../../testutils/mock_log";
+import { Clause } from "../clause";
+import { OrderBy } from "../query_impl";
 interface options<TData extends Data> {
     newQuery: (v: Viewer, user: FakeUser) => EdgeQuery<FakeUser, FakeContact, TData>;
     tableName: string;
+    uniqKey: string;
+    ml: MockLogs;
     entsLength?: number;
-    where: string;
-    sortCol: string;
+    clause: Clause;
     livePostgresDB?: boolean;
     sqlite?: boolean;
+    globalSchema?: boolean;
+    orderby: OrderBy;
+    rawDataVerify?(user: FakeUser): Promise<void>;
 }
 export declare const commonTests: <TData extends Data>(opts: options<TData>) => void;
 export {};