refactor(groups): change db structure and remove group locales

Reverts some changes and implements other tweaks.
Grades are now stored as a separate table (rather than JSON).
Groups will add all columns to the OxGroup state.
Removed default groups.

locales/en.json

@@ -14,15 +14,5 @@
   "non_binary": "Non-Binary",
   "date_of_birth": "Date of birth",
   "withdraw": "Withdraw",
-  "deposit": "Deposit",
-  "groups": {
-    "police": {
-      "name": "Los Santos Police Department",
-      "grades": ["Cadet", "Officer", "Sergeant", "Captain", "Commander", "Chief"]
-    },
-    "dispatch": {
-      "name": "Police Dispatch",
-      "grades": ["Dispatcher"]
-    }
-  }
+  "deposit": "Deposit"
 }

server/groups/db.ts

@@ -1,9 +1,20 @@
 import { db } from 'db';
-
-export type GroupsTable = { name: string; grades: number; colour?: number };
+import type { DbGroups } from 'types';
 
 export function SelectGroups() {
-  return db.query<GroupsTable>('SELECT * FROM ox_groups');
+  return db.query<DbGroups>(`
+    SELECT 
+      ox_groups.*, 
+      JSON_ARRAYAGG(ox_group_grades.label ORDER BY ox_group_grades.grade) AS grades
+    FROM 
+        ox_groups 
+    JOIN 
+        ox_group_grades
+    ON
+        ox_groups.name = ox_group_grades.group
+    GROUP BY 
+        ox_groups.name;
+  `);
 }
 
 export async function AddCharacterGroup(charId: number, name: string, grade: number) {

server/groups/index.ts

@@ -2,7 +2,7 @@ import { addAce, addCommand, addPrincipal, locale, removeAce, removePrincipal }
 import { SelectGroups } from './db';
 import { OxPlayer } from 'player/class';
 import type { Dict, OxGroup } from 'types';
-import type { GroupsTable } from './db';
+import type { GroupsResult } from './db';
 import { GetGroupPermissions } from '../../common';
 
 const groups: Dict<OxGroup> = {};
@@ -29,23 +29,17 @@ export function RemoveGroupPermission(groupName: string, grade: number, permissi
   GlobalState[`group.${groupName}:permissions`] = permissions;
 }
 
-async function CreateGroup({ name, grades, colour }: GroupsTable) {
+async function CreateGroup(data: GroupsResult) {
   const group: OxGroup = {
-    name,
-    colour,
-    label: locale(`groups.${name}.name`),
-    principal: `group.${name}`,
-    grades: [],
+    ...data,
+    grades: JSON.parse(data.grades),
+    principal: `group.${data.name}`,
   };
 
-  for (let index = 0; index < grades; index++) {
-    group.grades[index] = locale(`groups.${name}.grades.${index}`);
-  }
-
   GlobalState[group.principal] = group;
   GlobalState[`${group.name}:count`] = 0;
 
-  groups[name] = group;
+  groups[group.name] = group;
   group.grades = group.grades.reduce(
     (acc, value, index) => {
       acc[index + 1] = value;
@@ -126,4 +120,4 @@ addCommand<{ target: string; group: string; grade?: number }>(
 );
 
 exports('SetGroupPermission', SetGroupPermission);
-exports('RemoveGroupPermission', RemoveGroupPermission)
+exports('RemoveGroupPermission', RemoveGroupPermission);

sql/install.sql

@@ -65,28 +65,18 @@ CREATE TABLE
 CREATE TABLE
   IF NOT EXISTS `ox_groups` (
     `name` VARCHAR(20) NOT NULL,
-    `grades` LONGTEXT NOT NULL,
+    `label` VARCHAR(50) NOT NULL,
     `colour` TINYINT UNSIGNED DEFAULT NULL,
     PRIMARY KEY (`name`) USING BTREE
   );
 
-INSERT INTO
-  `ox_groups` (
-    `name`,
-    `grades`,
-    `colour`
-  )
-VALUES
-  (
-    'police',
-    6,
-    6
-  ),
-  (
-    'dispatch',
-    1,
-    1
-  );
+CREATE TABLE `ox_group_grades` (
+	`group` VARCHAR(20) NOT NULL,
+	`grade` TINYINT(3) UNSIGNED NOT NULL DEFAULT '1',
+	`label` VARCHAR(50) NOT NULL,
+	PRIMARY KEY (`group`, `grade`) USING BTREE,
+	CONSTRAINT `FK_ox_group_grades_ox_groups` FOREIGN KEY (`group`) REFERENCES `ox_groups` (`name`) ON UPDATE CASCADE ON DELETE CASCADE
+);
 
 CREATE TABLE
   IF NOT EXISTS `character_groups` (

types/index.ts

@@ -120,14 +120,18 @@ export interface OxAccount {
   role: 'contributor' | 'manager' | 'owner';
 }
 
-export interface OxGroup {
+export interface DbGroups {
   name: string;
   label: string;
   grades: string[];
-  principal: string;
   colour?: number;
 }
 
+export interface OxGroup extends DbGroups {
+  grades: string[];
+  principal: string;
+}
+
 export interface OxGroupPermissions {
   [grade: string]: { [permission: string]: boolean };
 }