@carbonorm/carbonreact 3.4.4 → 3.4.5

package/src/api/rest/User_Groups.tsx

@@ -1,144 +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_Groups, user_groups, RestTableNames} from "./C6";
-
-/**
-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;
-**/
-
-type GetCustomAndRequiredFields = {}
-
-type GetRequestTableOverrides = {}
-
-// required parameters, optional parameters, parameter type overrides, response, and table names
-export const Get = restRequest<GetCustomAndRequiredFields, iUser_Groups, GetRequestTableOverrides, iGetC6RestResponse<iUser_Groups>, RestTableNames>({
-    C6: C6,
-    tableName: user_groups.TABLE_NAME,
-    requestMethod: GET,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully received user_groups!'
-        request.error ??= 'An unknown issue occurred creating the user_groups!'
-        return request
-    },
-    responseCallback: (response, _request) => {
-        updateRestfulObjectArrays<iUser_Groups>(response?.data?.rest, "user_groups", C6.user_groups.PRIMARY_SHORT as (keyof iUser_Groups)[])
-    }
-});
-
-type PutCustomAndRequiredFields = {}
-
-type PutRequestTableOverrides = {}
-
-export function putStateUser_Groups(response : AxiosResponse<iPutC6RestResponse<iUser_Groups>>, request : iAPI<Modify<iUser_Groups, PutRequestTableOverrides>> & PutCustomAndRequiredFields) {
-    updateRestfulObjectArrays<iUser_Groups>([
-        removeInvalidKeys<iUser_Groups>({
-            ...request,
-            ...response?.data?.rest,
-        }, C6.TABLES)
-    ], "user_groups", user_groups.PRIMARY_SHORT as (keyof iUser_Groups)[])
-}
-
-export const Put = restRequest<PutCustomAndRequiredFields, iUser_Groups, PutRequestTableOverrides, iPutC6RestResponse<iUser_Groups>, RestTableNames>({
-    C6: C6,
-    tableName: user_groups.TABLE_NAME,
-    requestMethod: PUT,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully updated user_groups data!'
-        request.error ??= 'An unknown issue occurred updating the user_groups data!'
-        return request
-    },
-    responseCallback: putStateUser_Groups
-});
-
-type PostCustomAndRequiredFields = {}
-
-type PostRequestTableOverrides = {}
-
-export function postStateUser_Groups(response : AxiosResponse<iPostC6RestResponse<iUser_Groups>>, request : iAPI<Modify<iUser_Groups, PostRequestTableOverrides>> & PostCustomAndRequiredFields, id: string | number | boolean) {
-    if ('number' === typeof id || 'string' === typeof id) {
-        if (1 !== user_groups.PRIMARY_SHORT.length) {
-            console.error("C6 received unexpected result's given the primary key length");
-        } else {
-            request[user_groups.PRIMARY_SHORT[0]] = id
-        }
-    }
-    updateRestfulObjectArrays<iUser_Groups>(
-        undefined !== request.dataInsertMultipleRows
-            ? request.dataInsertMultipleRows.map((request, index) => {
-                return removeInvalidKeys<iUser_Groups>({
-                    ...request,
-                    ...(index === 0 ? response?.data?.rest : {}),
-                }, C6.TABLES)
-            })
-            : [
-                removeInvalidKeys<iUser_Groups>({
-                    ...request,
-                    ...response?.data?.rest,
-                    }, C6.TABLES)
-            ],
-        "user_groups",
-        user_groups.PRIMARY_SHORT as (keyof iUser_Groups)[]
-    )
-}
-
-export const Post = restRequest<PostCustomAndRequiredFields, iUser_Groups, PostRequestTableOverrides, iPostC6RestResponse<iUser_Groups>, RestTableNames>({
-    C6: C6,
-    tableName: user_groups.TABLE_NAME,
-    requestMethod: POST,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully created the user_groups data!'
-        request.error ??= 'An unknown issue occurred creating the user_groups data!'
-        return request
-    },
-    responseCallback: postStateUser_Groups
-});
-
-type DeleteCustomAndRequiredFields = {}
-
-type DeleteRequestTableOverrides = {}
-
-export function deleteStateUser_Groups(_response : AxiosResponse<iDeleteC6RestResponse<iUser_Groups>>, request : iAPI<Modify<iUser_Groups, DeleteRequestTableOverrides>> & DeleteCustomAndRequiredFields) {
-    deleteRestfulObjectArrays<iUser_Groups>([
-        request
-    ], "user_groups", user_groups.PRIMARY_SHORT as (keyof iUser_Groups)[])
-}
-
-export const Delete = restRequest<DeleteCustomAndRequiredFields, iUser_Groups, DeleteRequestTableOverrides, iDeleteC6RestResponse<iUser_Groups>, RestTableNames>({
-    C6: C6,
-    tableName: user_groups.TABLE_NAME,
-    requestMethod: DELETE,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully removed the user_groups data!'
-        request.error ??= 'An unknown issue occurred removing the user_groups data!'
-        return request
-    },
-    responseCallback: deleteStateUser_Groups
-});
-
-export default {
-    // Export all GET, POST, PUT, DELETE functions for each table
-    Get,
-    Post,
-    Put,
-    Delete,
-}

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

@@ -1,137 +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_Messages, user_messages } from "api/rest/C6";
-import User_Messages from "./User_Messages";
-
-const randomString = Math.random().toString(36).substring(7);
-const randomInt = Math.floor(Math.random() * 1000000);
-const fillString = 'string' + randomString + randomInt;
-
-/**
-CREATE TABLE `carbon_user_messages` (
-  `message_id` binary(16) NOT NULL,
-  `from_user_id` binary(16) NOT NULL,
-  `to_user_id` binary(16) NOT NULL,
-  `message` text NOT NULL,
-  `message_read` tinyint DEFAULT '0',
-  `creation_date` datetime DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`message_id`),
-  KEY `messages_entity_entity_pk_fk` (`message_id`),
-  KEY `messages_entity_user_from_pk_fk` (`to_user_id`),
-  KEY `carbon_user_messages_carbon_entity_pk_fk` (`from_user_id`),
-  CONSTRAINT `carbon_user_messages_carbon_entity_pk_fk` FOREIGN KEY (`from_user_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `messages_entity_entity_pk_fk` FOREIGN KEY (`message_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `messages_entity_user_from_pk_fk` FOREIGN KEY (`to_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_Messages = {
-
-}
-
-export default Test_Data;
-
-xdescribe('REST User_Messages api', () => {
-
-    let testData = Test_Data;
-
-    test('GET POST PUT DELETE', async () => {
-
-        await act(async () => {
-
-            let selectAllResponse = await User_Messages.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_Messages.Post(testData);
-
-            console.log('postResponse', postResponse?.data)
-
-            expect(postResponse?.data?.created).not.toBeUndefined();
-
-            const primaryKey = user_messages.PRIMARY_SHORT[0];
-
-            const postID = postResponse?.data?.created
-
-            const singleRowSelect = await User_Messages.Get({
-                [C6.WHERE]: {
-                    [user_messages[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_Messages.Get({
-                [C6.WHERE]: {
-                    [user_messages[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.message_id = fillString.substring(0, 16);
-            testData.from_user_id = fillString.substring(0, 16);
-            testData.to_user_id = fillString.substring(0, 16);
-            testData.message = fillString.substring(0, );
-            testData.message_read = fillString.substring(0, );
-            testData.creation_date = fillString.substring(0, );
-
-            // wait for the global state to be updated
-            expect(CarbonReact.getState<iRestfulObjectArrayTypes>().user_messages).not.toBeUndefined();
-
-            const updateResponse = await User_Messages.Put(testData)
-
-            expect(updateResponse?.data?.updated).not.toBeUndefined();
-
-            const deleteResponse = await User_Messages.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_Messages.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, iUser_Messages, user_messages, RestTableNames} from "./C6";
-
-/**
-CREATE TABLE `carbon_user_messages` (
-  `message_id` binary(16) NOT NULL,
-  `from_user_id` binary(16) NOT NULL,
-  `to_user_id` binary(16) NOT NULL,
-  `message` text NOT NULL,
-  `message_read` tinyint DEFAULT '0',
-  `creation_date` datetime DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`message_id`),
-  KEY `messages_entity_entity_pk_fk` (`message_id`),
-  KEY `messages_entity_user_from_pk_fk` (`to_user_id`),
-  KEY `carbon_user_messages_carbon_entity_pk_fk` (`from_user_id`),
-  CONSTRAINT `carbon_user_messages_carbon_entity_pk_fk` FOREIGN KEY (`from_user_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `messages_entity_entity_pk_fk` FOREIGN KEY (`message_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `messages_entity_user_from_pk_fk` FOREIGN KEY (`to_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_Messages, GetRequestTableOverrides, iGetC6RestResponse<iUser_Messages>, RestTableNames>({
-    C6: C6,
-    tableName: user_messages.TABLE_NAME,
-    requestMethod: GET,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully received user_messages!'
-        request.error ??= 'An unknown issue occurred creating the user_messages!'
-        return request
-    },
-    responseCallback: (response, _request) => {
-        updateRestfulObjectArrays<iUser_Messages>(response?.data?.rest, "user_messages", C6.user_messages.PRIMARY_SHORT as (keyof iUser_Messages)[])
-    }
-});
-
-type PutCustomAndRequiredFields = {}
-
-type PutRequestTableOverrides = {}
-
-export function putStateUser_Messages(response : AxiosResponse<iPutC6RestResponse<iUser_Messages>>, request : iAPI<Modify<iUser_Messages, PutRequestTableOverrides>> & PutCustomAndRequiredFields) {
-    updateRestfulObjectArrays<iUser_Messages>([
-        removeInvalidKeys<iUser_Messages>({
-            ...request,
-            ...response?.data?.rest,
-        }, C6.TABLES)
-    ], "user_messages", user_messages.PRIMARY_SHORT as (keyof iUser_Messages)[])
-}
-
-export const Put = restRequest<PutCustomAndRequiredFields, iUser_Messages, PutRequestTableOverrides, iPutC6RestResponse<iUser_Messages>, RestTableNames>({
-    C6: C6,
-    tableName: user_messages.TABLE_NAME,
-    requestMethod: PUT,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully updated user_messages data!'
-        request.error ??= 'An unknown issue occurred updating the user_messages data!'
-        return request
-    },
-    responseCallback: putStateUser_Messages
-});
-
-type PostCustomAndRequiredFields = {}
-
-type PostRequestTableOverrides = {}
-
-export function postStateUser_Messages(response : AxiosResponse<iPostC6RestResponse<iUser_Messages>>, request : iAPI<Modify<iUser_Messages, PostRequestTableOverrides>> & PostCustomAndRequiredFields, id: string | number | boolean) {
-    if ('number' === typeof id || 'string' === typeof id) {
-        if (1 !== user_messages.PRIMARY_SHORT.length) {
-            console.error("C6 received unexpected result's given the primary key length");
-        } else {
-            request[user_messages.PRIMARY_SHORT[0]] = id
-        }
-    }
-    updateRestfulObjectArrays<iUser_Messages>(
-        undefined !== request.dataInsertMultipleRows
-            ? request.dataInsertMultipleRows.map((request, index) => {
-                return removeInvalidKeys<iUser_Messages>({
-                    ...request,
-                    ...(index === 0 ? response?.data?.rest : {}),
-                }, C6.TABLES)
-            })
-            : [
-                removeInvalidKeys<iUser_Messages>({
-                    ...request,
-                    ...response?.data?.rest,
-                    }, C6.TABLES)
-            ],
-        "user_messages",
-        user_messages.PRIMARY_SHORT as (keyof iUser_Messages)[]
-    )
-}
-
-export const Post = restRequest<PostCustomAndRequiredFields, iUser_Messages, PostRequestTableOverrides, iPostC6RestResponse<iUser_Messages>, RestTableNames>({
-    C6: C6,
-    tableName: user_messages.TABLE_NAME,
-    requestMethod: POST,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully created the user_messages data!'
-        request.error ??= 'An unknown issue occurred creating the user_messages data!'
-        return request
-    },
-    responseCallback: postStateUser_Messages
-});
-
-type DeleteCustomAndRequiredFields = {}
-
-type DeleteRequestTableOverrides = {}
-
-export function deleteStateUser_Messages(_response : AxiosResponse<iDeleteC6RestResponse<iUser_Messages>>, request : iAPI<Modify<iUser_Messages, DeleteRequestTableOverrides>> & DeleteCustomAndRequiredFields) {
-    deleteRestfulObjectArrays<iUser_Messages>([
-        request
-    ], "user_messages", user_messages.PRIMARY_SHORT as (keyof iUser_Messages)[])
-}
-
-export const Delete = restRequest<DeleteCustomAndRequiredFields, iUser_Messages, DeleteRequestTableOverrides, iDeleteC6RestResponse<iUser_Messages>, RestTableNames>({
-    C6: C6,
-    tableName: user_messages.TABLE_NAME,
-    requestMethod: DELETE,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully removed the user_messages data!'
-        request.error ??= 'An unknown issue occurred removing the user_messages data!'
-        return request
-    },
-    responseCallback: deleteStateUser_Messages
-});
-
-export default {
-    // Export all GET, POST, PUT, DELETE functions for each table
-    Get,
-    Post,
-    Put,
-    Delete,
-}

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

@@ -1,133 +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_Sessions, user_sessions } from "api/rest/C6";
-import User_Sessions from "./User_Sessions";
-
-const randomString = Math.random().toString(36).substring(7);
-const randomInt = Math.floor(Math.random() * 1000000);
-const fillString = 'string' + randomString + randomInt;
-
-/**
-CREATE TABLE `carbon_user_sessions` (
-  `user_id` binary(16) NOT NULL,
-  `user_ip` varchar(60) DEFAULT NULL,
-  `session_id` varchar(255) NOT NULL,
-  `session_expires` datetime NOT NULL,
-  `session_data` text,
-  `user_online_status` tinyint DEFAULT '1',
-  PRIMARY KEY (`session_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-**/
-
-const Test_Data: iUser_Sessions = {
-
-    session_data: fillString.substring(0, ),
-
-}
-
-export default Test_Data;
-
-xdescribe('REST User_Sessions api', () => {
-
-    let testData = Test_Data;
-
-    test('GET POST PUT DELETE', async () => {
-
-        await act(async () => {
-
-            let selectAllResponse = await User_Sessions.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_Sessions.Post(testData);
-
-            console.log('postResponse', postResponse?.data)
-
-            expect(postResponse?.data?.created).not.toBeUndefined();
-
-            const primaryKey = user_sessions.PRIMARY_SHORT[0];
-
-            const postID = postResponse?.data?.created
-
-            const singleRowSelect = await User_Sessions.Get({
-                [C6.WHERE]: {
-                    [user_sessions[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_Sessions.Get({
-                [C6.WHERE]: {
-                    [user_sessions[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.user_id = fillString.substring(0, 16);
-            testData.user_ip = fillString.substring(0, 60);
-            testData.session_id = fillString.substring(0, 255);
-            testData.session_expires = fillString.substring(0, );
-            testData.session_data = fillString.substring(0, );
-            testData.user_online_status = fillString.substring(0, );
-
-            // wait for the global state to be updated
-            expect(CarbonReact.getState<iRestfulObjectArrayTypes>().user_sessions).not.toBeUndefined();
-
-            const updateResponse = await User_Sessions.Put(testData)
-
-            expect(updateResponse?.data?.updated).not.toBeUndefined();
-
-            const deleteResponse = await User_Sessions.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);
-
-})
-