diff --git a/server/biz/SockType.cs b/server/biz/SockType.cs index 1994215..a383e87 100644 --- a/server/biz/SockType.cs +++ b/server/biz/SockType.cs @@ -32,7 +32,7 @@ namespace Sockeye.Biz [CoreBizObject, ReportableBizObject, ImportableBizObject] Customer = 8, ServerJob = 9, - + ServerMetrics = 12, Translation = 13, UserOptions = 14, @@ -48,7 +48,7 @@ namespace Sockeye.Biz NotifySubscription = 51, [CoreBizObject, ReportableBizObject] Reminder = 52, - + OpsNotificationSettings = 56, Report = 57, DashboardView = 58, @@ -60,8 +60,16 @@ namespace Sockeye.Biz Review = 61, DataListColumnView = 68, CustomerNotifySubscription = 84,//proxy subs for customers - Integration = 92 //3rd party or add-on integration data store - + Integration = 92,//3rd party or add-on integration data store + //------------ SOCKEYE NEW TYPES NOT IN AYANOVA --------- + [CoreBizObject, ReportableBizObject] + License = 93, + [CoreBizObject, ReportableBizObject] + TrialLicenseRequest = 94, + [CoreBizObject, ReportableBizObject] + SubscriptionServer = 95, + [CoreBizObject, ReportableBizObject] + Sale = 96 diff --git a/server/util/AySchema.cs b/server/util/AySchema.cs index e333bff..b896775 100644 --- a/server/util/AySchema.cs +++ b/server/util/AySchema.cs @@ -20,7 +20,7 @@ namespace Sockeye.Util /////////// CHANGE THIS ON NEW SCHEMA UPDATE //////////////////// //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImportingAsync WHEN NEW TABLES ADDED!!!! - private const int DESIRED_SCHEMA_LEVEL = 14; + private const int DESIRED_SCHEMA_LEVEL = 16; internal const long EXPECTED_COLUMN_COUNT = 385; internal const long EXPECTED_INDEX_COUNT = 63; @@ -252,8 +252,8 @@ namespace Sockeye.Util await ExecQueryAsync("CREATE TABLE aglobalbizsettings (id INTEGER NOT NULL PRIMARY KEY, " + "webaddress TEXT, phone1 TEXT, phone2 TEXT, emailaddress TEXT, postaddress TEXT, postcity TEXT, postregion TEXT, postcountry TEXT, postcode TEXT, " + "address TEXT, city TEXT, region TEXT, country TEXT, latitude DECIMAL(9,6), longitude DECIMAL(9,6), " - + "filtercasesensitive BOOL DEFAULT FALSE, " - + "customerallowusersettings BOOL DEFAULT FALSE, customerallowusersettingsintags VARCHAR(255) ARRAY " + + "filtercasesensitive BOOL DEFAULT FALSE, " + + "customerallowusersettings BOOL DEFAULT FALSE, customerallowusersettingsintags VARCHAR(255) ARRAY " + ")"); //create global ops BACKUP settings table @@ -853,7 +853,90 @@ $BODY$ LANGUAGE PLPGSQL STABLE"); } + ////////////////////////////////////////////////// + // + // + // + if (currentSchema < 16) + { + LogUpdateMessage(log); + await ExecQueryAsync("CREATE TABLE alicense (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, created TIMESTAMPTZ NOT NULL, " + + "customerid BIGINT NOT NULL REFERENCES acustomer(id), regto TEXT NOT NULL, key TEXT NOT NULL, fetchcode TEXT, fetchemail TEXT, " + + "fetchedon TIMESTAMPTZ, fetched BOOL default false, dbid TEXT, licenseexpire TIMESTAMPZ, maintenanceexpire TIMESTAMPZ NOT NULL, " + + "wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY, toid BIGINT NOT NULL REFERENCES auser(id) )"); + + + currentSchema = 16; + await SetSchemaLevelAsync(currentSchema); + + } + + + /* + CREATE TABLE license (id INTEGER PRIMARY KEY, dtcreated integer not null, customerid integer not null, regto text not null, + key text not null, code text not null, email text not null, fetchfrom text, dtfetched integer, fetched boolean default 0 NOT NULL CHECK (fetched IN (0,1)), + dbid text default 'v7_no_dbid' NOT NULL, siteid integer, dtLicenseExpiration integer, dtMaintenanceExpiration integer, perpetual boolean default 0 NOT NULL CHECK (perpetual IN (0,1))) + + [KEY + { + "AyaNovaLicenseKey": { + "SchemaVersion": "7", + "Id": "1670002683", + "Created": "2022-12-02T09:38:03.5126283-08:00", + "Sub": "true", + "RegisteredTo": "CompCare Compressed Air Ltd", + "EmailAddress": "m.knowles@compcare-air.co.uk", + "FetchCode": "slAERKGVtq", + "Source": "5246494432", + "InstallableUntil": "2023-12-02T09:38:03.5125736-08:00", + "TotalScheduleableUsers": "10", + "Expires": "2023-12-02T00:00:00", + "RequestedTrial": "False", + "Plugins": { + "Plugin": [ + { + "Item": "ExportToXls", + "SubscriptionExpires": "2023-12-02T00:00:00" + }, + { + "Item": "RI - Responsive Interface", + "SubscriptionExpires": "2023-12-02T00:00:00" + } + ] + } + } + } + KEY] + [SIGNATURE + c6duLfqPW0Cp7vnQ+6CON3rAUWtL8dVpUhoxb6SBXgin6FsYErYLGY5VNkOWGBrsZ04/VXqqkayCBmZuKS6TwD8ki636bZU0VlGituuSdnR3oUcXyNWubc8FXIo8pmZtigTw904uXnVdhSImV0rhNt9EHyprBqgFVq5j0QMePsJmu9tucqwSxVEcWOWAE7j6735AVQua3pyqVtT+j/qSzPSgaxojBG2OHlS/8qMFaKxVQVJ7uFyU5rzQ2CA2CDfusyTit3Bii7Xewm5AhMjxRCbLOp16wWbz5iIC3XZ37hR0+klN6NYvkipVLsL6f2Knf0TFUnt6oF0FwL3M7aSl+w== + SIGNATURE] + + + [KEY + { + "Key": { + "LicenseFormat": "8", + "Id": "1669501889", + "RegisteredTo": "Vicom Australia", + "DBID": "mZaliiy+/TsHF9rcMpIGWO20Q5FhPD1ZdnWO2cMKMW8=", + "Perpetual": true, + "LicenseExpiration": "5555-01-01T00:00:00", + "MaintenanceExpiration": "2023-11-25T00:00:00", + "Features": [ + { + "Name": "ActiveInternalUsers", + "Count": 3 + } + ] + } + } + KEY] + [SIGNATURE + O4kbtlVvQnHusjYXw3ppdhfkuPV7J7tHys33OYkcSl/KXgIqMhNMwU8TfTt5zsYElMLT0UKPmCoUlBIFmbayHx46xT17qHGm0j4C7HH1FmEefxOrNPtOa7k2AJ4fJvZESZGAIVboOHA2EAATV8WIyTOXAtG2JhHWIN/NVjMK0SlFs+0wkdsmx+8BQ9oZvz19w3I9bnt6kBwIogMTV4NBHk0637TmgGiNMZAXP8g4n/FaMQEXjVXGK05iLMf0jz4HohLSFvx1tpbg65pQ8lJtrdSgiFAvl09WgkpKpFakXuO/xP6HcnkzLIFitB8VCiOzj81YtQ81jldUiig2QYf+IQ== + SIGNATURE] + + */