@carbonorm/carbonreact 3.4.4 → 3.4.5

package/src/api/rest/Subscription.tsx

@@ -1,151 +0,0 @@
-import {
-    iPostC6RestResponse,
-    restRequest,
-    GET,
-    POST,
-    PUT,
-    DELETE,
-    iDeleteC6RestResponse,
-    iGetC6RestResponse,
-    iPutC6RestResponse,
-    removeInvalidKeys
-} from "@carbonorm/carbonnode";
-import {AxiosResponse} from "axios";
-import {iAPI, Modify} from "restRequest";
-import {deleteRestfulObjectArrays, updateRestfulObjectArrays} from "@carbonorm/carbonreact";
-import {C6, iSubscription, subscription, RestTableNames} from "./C6";
-
-/**
-CREATE TABLE `carbon_subscription` (
-  `subscription_id` binary(16) NOT NULL,
-  `subscription_to_entity_id` binary(16) DEFAULT NULL,
-  `subscription_for_entity_id` binary(16) DEFAULT NULL,
-  `subscription_price` varchar(16) DEFAULT NULL,
-  `subscription_start_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `subscription_end_date` datetime DEFAULT NULL,
-  `subscription_transaction_id` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`subscription_id`),
-  KEY `carbon_subscription_carbon_carbons_entity_pk_fk2` (`subscription_to_entity_id`),
-  KEY `carbon_subscription_carbon_carbons_entity_pk_fk3` (`subscription_for_entity_id`),
-  CONSTRAINT `carbon_subscription_carbon_carbons_entity_pk_fk` FOREIGN KEY (`subscription_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `carbon_subscription_carbon_carbons_entity_pk_fk2` FOREIGN KEY (`subscription_to_entity_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `carbon_subscription_carbon_carbons_entity_pk_fk3` FOREIGN KEY (`subscription_for_entity_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-**/
-
-type GetCustomAndRequiredFields = {}
-
-type GetRequestTableOverrides = {}
-
-// required parameters, optional parameters, parameter type overrides, response, and table names
-export const Get = restRequest<GetCustomAndRequiredFields, iSubscription, GetRequestTableOverrides, iGetC6RestResponse<iSubscription>, RestTableNames>({
-    C6: C6,
-    tableName: subscription.TABLE_NAME,
-    requestMethod: GET,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully received subscription!'
-        request.error ??= 'An unknown issue occurred creating the subscription!'
-        return request
-    },
-    responseCallback: (response, _request) => {
-        updateRestfulObjectArrays<iSubscription>(response?.data?.rest, "subscription", C6.subscription.PRIMARY_SHORT as (keyof iSubscription)[])
-    }
-});
-
-type PutCustomAndRequiredFields = {}
-
-type PutRequestTableOverrides = {}
-
-export function putStateSubscription(response : AxiosResponse<iPutC6RestResponse<iSubscription>>, request : iAPI<Modify<iSubscription, PutRequestTableOverrides>> & PutCustomAndRequiredFields) {
-    updateRestfulObjectArrays<iSubscription>([
-        removeInvalidKeys<iSubscription>({
-            ...request,
-            ...response?.data?.rest,
-        }, C6.TABLES)
-    ], "subscription", subscription.PRIMARY_SHORT as (keyof iSubscription)[])
-}
-
-export const Put = restRequest<PutCustomAndRequiredFields, iSubscription, PutRequestTableOverrides, iPutC6RestResponse<iSubscription>, RestTableNames>({
-    C6: C6,
-    tableName: subscription.TABLE_NAME,
-    requestMethod: PUT,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully updated subscription data!'
-        request.error ??= 'An unknown issue occurred updating the subscription data!'
-        return request
-    },
-    responseCallback: putStateSubscription
-});
-
-type PostCustomAndRequiredFields = {}
-
-type PostRequestTableOverrides = {}
-
-export function postStateSubscription(response : AxiosResponse<iPostC6RestResponse<iSubscription>>, request : iAPI<Modify<iSubscription, PostRequestTableOverrides>> & PostCustomAndRequiredFields, id: string | number | boolean) {
-    if ('number' === typeof id || 'string' === typeof id) {
-        if (1 !== subscription.PRIMARY_SHORT.length) {
-            console.error("C6 received unexpected result's given the primary key length");
-        } else {
-            request[subscription.PRIMARY_SHORT[0]] = id
-        }
-    }
-    updateRestfulObjectArrays<iSubscription>(
-        undefined !== request.dataInsertMultipleRows
-            ? request.dataInsertMultipleRows.map((request, index) => {
-                return removeInvalidKeys<iSubscription>({
-                    ...request,
-                    ...(index === 0 ? response?.data?.rest : {}),
-                }, C6.TABLES)
-            })
-            : [
-                removeInvalidKeys<iSubscription>({
-                    ...request,
-                    ...response?.data?.rest,
-                    }, C6.TABLES)
-            ],
-        "subscription",
-        subscription.PRIMARY_SHORT as (keyof iSubscription)[]
-    )
-}
-
-export const Post = restRequest<PostCustomAndRequiredFields, iSubscription, PostRequestTableOverrides, iPostC6RestResponse<iSubscription>, RestTableNames>({
-    C6: C6,
-    tableName: subscription.TABLE_NAME,
-    requestMethod: POST,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully created the subscription data!'
-        request.error ??= 'An unknown issue occurred creating the subscription data!'
-        return request
-    },
-    responseCallback: postStateSubscription
-});
-
-type DeleteCustomAndRequiredFields = {}
-
-type DeleteRequestTableOverrides = {}
-
-export function deleteStateSubscription(_response : AxiosResponse<iDeleteC6RestResponse<iSubscription>>, request : iAPI<Modify<iSubscription, DeleteRequestTableOverrides>> & DeleteCustomAndRequiredFields) {
-    deleteRestfulObjectArrays<iSubscription>([
-        request
-    ], "subscription", subscription.PRIMARY_SHORT as (keyof iSubscription)[])
-}
-
-export const Delete = restRequest<DeleteCustomAndRequiredFields, iSubscription, DeleteRequestTableOverrides, iDeleteC6RestResponse<iSubscription>, RestTableNames>({
-    C6: C6,
-    tableName: subscription.TABLE_NAME,
-    requestMethod: DELETE,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully removed the subscription data!'
-        request.error ??= 'An unknown issue occurred removing the subscription data!'
-        return request
-    },
-    responseCallback: deleteStateSubscription
-});
-
-export default {
-    // Export all GET, POST, PUT, DELETE functions for each table
-    Get,
-    Post,
-    Put,
-    Delete,
-}

package/src/api/rest/User_Followers.test.tsx

@@ -1,130 +0,0 @@
-import {xdescribe, expect, test} from '@jest/globals';
-import {CarbonReact} from "@carbonorm/carbonreact";
-import {checkAllRequestsComplete} from "@carbonorm/carbonnode";
-import {act, waitFor} from '@testing-library/react';
-import {C6, iRestfulObjectArrayTypes, iUser_Followers, user_followers } from "api/rest/C6";
-import User_Followers from "./User_Followers";
-
-const randomString = Math.random().toString(36).substring(7);
-const randomInt = Math.floor(Math.random() * 1000000);
-const fillString = 'string' + randomString + randomInt;
-
-/**
-CREATE TABLE `carbon_user_followers` (
-  `follower_table_id` binary(16) NOT NULL,
-  `follows_user_id` binary(16) NOT NULL,
-  `user_id` binary(16) NOT NULL,
-  PRIMARY KEY (`follower_table_id`),
-  KEY `followers_entity_entity_pk_fk` (`follows_user_id`),
-  KEY `followers_entity_entity_followers_pk_fk` (`user_id`),
-  CONSTRAINT `carbon_user_followers_carbons_entity_pk_fk` FOREIGN KEY (`follower_table_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `followers_entity_entity_follows_pk_fk` FOREIGN KEY (`follows_user_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `followers_entity_followers_pk_fk` FOREIGN KEY (`user_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-**/
-
-const Test_Data: iUser_Followers = {
-
-}
-
-export default Test_Data;
-
-xdescribe('REST User_Followers api', () => {
-
-    let testData = Test_Data;
-
-    test('GET POST PUT DELETE', async () => {
-
-        await act(async () => {
-
-            let selectAllResponse = await User_Followers.Get({})
-
-            if ('function' === typeof selectAllResponse) {
-                throw Error('selectAllResponse is a promise, this typically means this specific get request has already run during test setup.');
-            }
-
-            // We don't care if it is filled or not, just that the request can be made.
-            expect(selectAllResponse?.data?.rest).not.toBeUndefined();
-
-            const postResponse = await User_Followers.Post(testData);
-
-            console.log('postResponse', postResponse?.data)
-
-            expect(postResponse?.data?.created).not.toBeUndefined();
-
-            const primaryKey = user_followers.PRIMARY_SHORT[0];
-
-            const postID = postResponse?.data?.created
-
-            const singleRowSelect = await User_Followers.Get({
-                [C6.WHERE]: {
-                    [user_followers[primaryKey.toUpperCase()]]: postID,
-                }
-            })
-
-            if ('function' === typeof singleRowSelect) {
-                throw Error('singleRowSelect is a promise, this is unexpected.');
-            }
-
-            console.log('singleRowSelect', singleRowSelect?.data)
-
-            // Ensure the expected response datastructure is returned
-            expect(singleRowSelect?.data?.rest).not.toBeUndefined();
-
-            // Make sure the previously created post is now returned
-            expect(typeof singleRowSelect?.data?.rest).toEqual('object');
-
-            // todo - make this work correctly with multiple primary keys
-            const selectedPostId = singleRowSelect?.data?.rest[0][primaryKey]
-
-            expect(selectedPostId).toEqual(postID);
-
-            const multipleRowSelect = await User_Followers.Get({
-                [C6.WHERE]: {
-                    [user_followers[primaryKey.toUpperCase()]]: [C6.IN, [0, postID]],
-                }
-            })
-
-            if ('function' === typeof multipleRowSelect) {
-                throw Error('singleRowSelect is a promise, this is unexpected.');
-            }
-
-            console.log('singleRowSelect', multipleRowSelect?.data)
-
-            // Ensure the expected response datastructure is returned
-            expect(multipleRowSelect?.data?.rest).not.toBeUndefined();
-
-            // Make sure the previously created post is now returned
-            expect(typeof multipleRowSelect?.data?.rest).toEqual('object');
-
-            testData[primaryKey] = postID
-
-            testData.follower_table_id = fillString.substring(0, 16);
-            testData.follows_user_id = fillString.substring(0, 16);
-            testData.user_id = fillString.substring(0, 16);
-
-            // wait for the global state to be updated
-            expect(CarbonReact.getState<iRestfulObjectArrayTypes>().user_followers).not.toBeUndefined();
-
-            const updateResponse = await User_Followers.Put(testData)
-
-            expect(updateResponse?.data?.updated).not.toBeUndefined();
-
-            const deleteResponse = await User_Followers.Delete({
-                [primaryKey]: postID
-            })
-
-            console.log('deleteResponse', deleteResponse?.data)
-
-            expect(deleteResponse?.data?.deleted).not.toBeUndefined();
-
-            await waitFor(async () => {
-                expect(checkAllRequestsComplete()).toEqual(true);
-            }, {timeout: 10000, interval: 1000});
-
-        })
-
-    }, 100000);
-
-})
-

package/src/api/rest/User_Followers.tsx

@@ -1,147 +0,0 @@
-import {
-    iPostC6RestResponse,
-    restRequest,
-    GET,
-    POST,
-    PUT,
-    DELETE,
-    iDeleteC6RestResponse,
-    iGetC6RestResponse,
-    iPutC6RestResponse,
-    removeInvalidKeys
-} from "@carbonorm/carbonnode";
-import {AxiosResponse} from "axios";
-import {iAPI, Modify} from "restRequest";
-import {deleteRestfulObjectArrays, updateRestfulObjectArrays} from "@carbonorm/carbonreact";
-import {C6, iUser_Followers, user_followers, RestTableNames} from "./C6";
-
-/**
-CREATE TABLE `carbon_user_followers` (
-  `follower_table_id` binary(16) NOT NULL,
-  `follows_user_id` binary(16) NOT NULL,
-  `user_id` binary(16) NOT NULL,
-  PRIMARY KEY (`follower_table_id`),
-  KEY `followers_entity_entity_pk_fk` (`follows_user_id`),
-  KEY `followers_entity_entity_followers_pk_fk` (`user_id`),
-  CONSTRAINT `carbon_user_followers_carbons_entity_pk_fk` FOREIGN KEY (`follower_table_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `followers_entity_entity_follows_pk_fk` FOREIGN KEY (`follows_user_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `followers_entity_followers_pk_fk` FOREIGN KEY (`user_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-**/
-
-type GetCustomAndRequiredFields = {}
-
-type GetRequestTableOverrides = {}
-
-// required parameters, optional parameters, parameter type overrides, response, and table names
-export const Get = restRequest<GetCustomAndRequiredFields, iUser_Followers, GetRequestTableOverrides, iGetC6RestResponse<iUser_Followers>, RestTableNames>({
-    C6: C6,
-    tableName: user_followers.TABLE_NAME,
-    requestMethod: GET,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully received user_followers!'
-        request.error ??= 'An unknown issue occurred creating the user_followers!'
-        return request
-    },
-    responseCallback: (response, _request) => {
-        updateRestfulObjectArrays<iUser_Followers>(response?.data?.rest, "user_followers", C6.user_followers.PRIMARY_SHORT as (keyof iUser_Followers)[])
-    }
-});
-
-type PutCustomAndRequiredFields = {}
-
-type PutRequestTableOverrides = {}
-
-export function putStateUser_Followers(response : AxiosResponse<iPutC6RestResponse<iUser_Followers>>, request : iAPI<Modify<iUser_Followers, PutRequestTableOverrides>> & PutCustomAndRequiredFields) {
-    updateRestfulObjectArrays<iUser_Followers>([
-        removeInvalidKeys<iUser_Followers>({
-            ...request,
-            ...response?.data?.rest,
-        }, C6.TABLES)
-    ], "user_followers", user_followers.PRIMARY_SHORT as (keyof iUser_Followers)[])
-}
-
-export const Put = restRequest<PutCustomAndRequiredFields, iUser_Followers, PutRequestTableOverrides, iPutC6RestResponse<iUser_Followers>, RestTableNames>({
-    C6: C6,
-    tableName: user_followers.TABLE_NAME,
-    requestMethod: PUT,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully updated user_followers data!'
-        request.error ??= 'An unknown issue occurred updating the user_followers data!'
-        return request
-    },
-    responseCallback: putStateUser_Followers
-});
-
-type PostCustomAndRequiredFields = {}
-
-type PostRequestTableOverrides = {}
-
-export function postStateUser_Followers(response : AxiosResponse<iPostC6RestResponse<iUser_Followers>>, request : iAPI<Modify<iUser_Followers, PostRequestTableOverrides>> & PostCustomAndRequiredFields, id: string | number | boolean) {
-    if ('number' === typeof id || 'string' === typeof id) {
-        if (1 !== user_followers.PRIMARY_SHORT.length) {
-            console.error("C6 received unexpected result's given the primary key length");
-        } else {
-            request[user_followers.PRIMARY_SHORT[0]] = id
-        }
-    }
-    updateRestfulObjectArrays<iUser_Followers>(
-        undefined !== request.dataInsertMultipleRows
-            ? request.dataInsertMultipleRows.map((request, index) => {
-                return removeInvalidKeys<iUser_Followers>({
-                    ...request,
-                    ...(index === 0 ? response?.data?.rest : {}),
-                }, C6.TABLES)
-            })
-            : [
-                removeInvalidKeys<iUser_Followers>({
-                    ...request,
-                    ...response?.data?.rest,
-                    }, C6.TABLES)
-            ],
-        "user_followers",
-        user_followers.PRIMARY_SHORT as (keyof iUser_Followers)[]
-    )
-}
-
-export const Post = restRequest<PostCustomAndRequiredFields, iUser_Followers, PostRequestTableOverrides, iPostC6RestResponse<iUser_Followers>, RestTableNames>({
-    C6: C6,
-    tableName: user_followers.TABLE_NAME,
-    requestMethod: POST,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully created the user_followers data!'
-        request.error ??= 'An unknown issue occurred creating the user_followers data!'
-        return request
-    },
-    responseCallback: postStateUser_Followers
-});
-
-type DeleteCustomAndRequiredFields = {}
-
-type DeleteRequestTableOverrides = {}
-
-export function deleteStateUser_Followers(_response : AxiosResponse<iDeleteC6RestResponse<iUser_Followers>>, request : iAPI<Modify<iUser_Followers, DeleteRequestTableOverrides>> & DeleteCustomAndRequiredFields) {
-    deleteRestfulObjectArrays<iUser_Followers>([
-        request
-    ], "user_followers", user_followers.PRIMARY_SHORT as (keyof iUser_Followers)[])
-}
-
-export const Delete = restRequest<DeleteCustomAndRequiredFields, iUser_Followers, DeleteRequestTableOverrides, iDeleteC6RestResponse<iUser_Followers>, RestTableNames>({
-    C6: C6,
-    tableName: user_followers.TABLE_NAME,
-    requestMethod: DELETE,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully removed the user_followers data!'
-        request.error ??= 'An unknown issue occurred removing the user_followers data!'
-        return request
-    },
-    responseCallback: deleteStateUser_Followers
-});
-
-export default {
-    // Export all GET, POST, PUT, DELETE functions for each table
-    Get,
-    Post,
-    Put,
-    Delete,
-}

package/src/api/rest/User_Groups.test.tsx

@@ -1,126 +0,0 @@
-import {xdescribe, expect, test} from '@jest/globals';
-import {CarbonReact} from "@carbonorm/carbonreact";
-import {checkAllRequestsComplete} from "@carbonorm/carbonnode";
-import {act, waitFor} from '@testing-library/react';
-import {C6, iRestfulObjectArrayTypes, iUser_Groups, user_groups } from "api/rest/C6";
-import User_Groups from "./User_Groups";
-
-const randomString = Math.random().toString(36).substring(7);
-const randomInt = Math.floor(Math.random() * 1000000);
-const fillString = 'string' + randomString + randomInt;
-
-/**
-CREATE TABLE `carbon_user_groups` (
-  `group_id` binary(16) DEFAULT NULL,
-  `user_id` binary(16) DEFAULT NULL,
-  KEY `carbon_user_groups_carbons_entity_pk_fk` (`group_id`),
-  KEY `carbon_user_groups_carbons_entity_pk_fk_2` (`user_id`),
-  CONSTRAINT `carbon_user_groups_carbons_entity_pk_fk` FOREIGN KEY (`group_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `carbon_user_groups_carbons_entity_pk_fk_2` FOREIGN KEY (`user_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-**/
-
-const Test_Data: iUser_Groups = {
-
-}
-
-export default Test_Data;
-
-xdescribe('REST User_Groups api', () => {
-
-    let testData = Test_Data;
-
-    test('GET POST PUT DELETE', async () => {
-
-        await act(async () => {
-
-            let selectAllResponse = await User_Groups.Get({})
-
-            if ('function' === typeof selectAllResponse) {
-                throw Error('selectAllResponse is a promise, this typically means this specific get request has already run during test setup.');
-            }
-
-            // We don't care if it is filled or not, just that the request can be made.
-            expect(selectAllResponse?.data?.rest).not.toBeUndefined();
-
-            const postResponse = await User_Groups.Post(testData);
-
-            console.log('postResponse', postResponse?.data)
-
-            expect(postResponse?.data?.created).not.toBeUndefined();
-
-            const primaryKey = user_groups.PRIMARY_SHORT[0];
-
-            const postID = postResponse?.data?.created
-
-            const singleRowSelect = await User_Groups.Get({
-                [C6.WHERE]: {
-                    [user_groups[primaryKey.toUpperCase()]]: postID,
-                }
-            })
-
-            if ('function' === typeof singleRowSelect) {
-                throw Error('singleRowSelect is a promise, this is unexpected.');
-            }
-
-            console.log('singleRowSelect', singleRowSelect?.data)
-
-            // Ensure the expected response datastructure is returned
-            expect(singleRowSelect?.data?.rest).not.toBeUndefined();
-
-            // Make sure the previously created post is now returned
-            expect(typeof singleRowSelect?.data?.rest).toEqual('object');
-
-            // todo - make this work correctly with multiple primary keys
-            const selectedPostId = singleRowSelect?.data?.rest[0][primaryKey]
-
-            expect(selectedPostId).toEqual(postID);
-
-            const multipleRowSelect = await User_Groups.Get({
-                [C6.WHERE]: {
-                    [user_groups[primaryKey.toUpperCase()]]: [C6.IN, [0, postID]],
-                }
-            })
-
-            if ('function' === typeof multipleRowSelect) {
-                throw Error('singleRowSelect is a promise, this is unexpected.');
-            }
-
-            console.log('singleRowSelect', multipleRowSelect?.data)
-
-            // Ensure the expected response datastructure is returned
-            expect(multipleRowSelect?.data?.rest).not.toBeUndefined();
-
-            // Make sure the previously created post is now returned
-            expect(typeof multipleRowSelect?.data?.rest).toEqual('object');
-
-            testData[primaryKey] = postID
-
-            testData.group_id = fillString.substring(0, 16);
-            testData.user_id = fillString.substring(0, 16);
-
-            // wait for the global state to be updated
-            expect(CarbonReact.getState<iRestfulObjectArrayTypes>().user_groups).not.toBeUndefined();
-
-            const updateResponse = await User_Groups.Put(testData)
-
-            expect(updateResponse?.data?.updated).not.toBeUndefined();
-
-            const deleteResponse = await User_Groups.Delete({
-                [primaryKey]: postID
-            })
-
-            console.log('deleteResponse', deleteResponse?.data)
-
-            expect(deleteResponse?.data?.deleted).not.toBeUndefined();
-
-            await waitFor(async () => {
-                expect(checkAllRequestsComplete()).toEqual(true);
-            }, {timeout: 10000, interval: 1000});
-
-        })
-
-    }, 100000);
-
-})
-