@drax/identity-back 0.11.4 → 0.12.1

package/src/repository/sqlite/TenantSqliteRepository.ts

@@ -1,170 +1,30 @@
 import {ITenant, ITenantBase} from '@drax/identity-share'
 import {ITenantRepository} from '../../interfaces/ITenantRepository'
-import {UUID} from "crypto";
-import sqlite from "better-sqlite3";
-import {randomUUID} from "node:crypto";
-import {IDraxPaginateResult, IDraxPaginateOptions, IDraxFindOptions} from "@drax/crud-share";
-import {SqliteErrorToValidationError, SqliteTableBuilder, SqlQueryFilter, SqlSort} from "@drax/common-back";
 import type {SqliteTableField} from "@drax/common-back";
+import {AbstractSqliteRepository} from "@drax/crud-back";
 
+class TenantSqliteRepository extends AbstractSqliteRepository<ITenant,ITenantBase,ITenantBase> implements ITenantRepository{
 
-const tableFields: SqliteTableField[] = [
-    {name: "name", type: "TEXT", unique: false, primary: false},
-    {name: "createdAt", type: "TEXT", unique: false, primary: false},
-    {name: "updatedAt", type: "TEXT", unique: false, primary: false},
-]
+    protected db: any;
+    protected tableName: string = 'tenants';
+    protected dataBaseFile: string;
+    protected searchFields: string[] = [];
+    protected booleanFields: string[] = [];
+    protected identifier: string = '_id';
+    protected populateFields = []
+    protected tableFields: SqliteTableField[] = [
+        {name: "name", type: "TEXT", unique: false, primary: false},
+        {name: "createdAt", type: "TEXT", unique: false, primary: false},
+        {name: "updatedAt", type: "TEXT", unique: false, primary: false},
+    ]
+    protected verbose: boolean;
 
 
-class TenantSqliteRepository implements ITenantRepository{
-
-    private db: any;
-    private dataBaseFile: string;
-
-    constructor(dataBaseFile:string, verbose:boolean = false) {
-        this.dataBaseFile = dataBaseFile;
-        this.db = new sqlite(this.dataBaseFile, {verbose: verbose ? console.log : null});
-        this.table()
-    }
-
-    table() {
-        const builder = new SqliteTableBuilder(
-            this.dataBaseFile,
-            'tenants',
-            tableFields,
-            false);
-        builder.build('id')
-    }
-
-
-
-    async create(tenantData: ITenantBase): Promise<ITenant> {
-        try{
-
-            if(!tenantData.id){
-                tenantData.id = randomUUID()
-            }
-
-            tenantData.createdAt = (new Date().toISOString())
-
-            const fields = Object.keys(tenantData)
-                .map(field => `${field}`)
-                .join(', ');
-
-            const values = Object.keys(tenantData)
-                .map(field => `@${field}`)
-                .join(', ');
-
-        const stmt = this.db.prepare(`INSERT INTO tenants (${fields}) VALUES (${values})`);
-        stmt.run(tenantData)
-        return this.findById(tenantData.id as UUID)
-        }catch (e){
-            console.log(e)
-            throw SqliteErrorToValidationError(e, tenantData)
-        }
-    }
-
-    async findById(id: string): Promise<ITenant | null>{
-        const tenant = this.db.prepare('SELECT * FROM tenants WHERE id = ?').get(id);
-        return tenant
-    }
-
     async findByName(name: string): Promise<ITenant | null>{
-        const tenant = this.db.prepare('SELECT * FROM tenants WHERE name = ?').get(name);
+        const tenant = this.db.prepare(`SELECT * FROM ${this.tableName} WHERE name = ?`).get(name);
         return tenant
     }
 
-    async update(id: string, tenantData: ITenantBase): Promise<ITenant> {
-        try{
-
-            tenantData.updatedAt = (new Date().toISOString())
-
-            const setClauses = Object.keys(tenantData)
-                .map(field => `${field} = @${field}`)
-                .join(', ');
-
-            tenantData.id = id
-
-            const stmt = this.db.prepare( `UPDATE tenants SET ${setClauses} WHERE id = @id `);
-            stmt.run(tenantData);
-            return this.findById(id)
-        }catch (e){
-            console.log(e)
-            throw SqliteErrorToValidationError(e, tenantData)
-        }
-
-    }
-
-    async delete(id: string): Promise<boolean> {
-        const stmt = this.db.prepare('DELETE FROM tenants WHERE id = ?');
-        stmt.run(id);
-        return true
-    }
-
-    async deleteAll(): Promise<boolean> {
-        const stmt = this.db.prepare('DELETE FROM tenants');
-        stmt.run();
-        return true
-    }
-
-    async fetchAll(): Promise<ITenant[]>{
-        const tenants = this.db.prepare('SELECT * FROM tenants').all();
-        for (const tenant of tenants) {
-            tenant.permissions = tenant.permissions? tenant.permissions.split(",") : []
-        }
-        return tenants
-    }
-
-    async paginate({
-                       page= 1,
-                       limit= 5,
-                       orderBy= '',
-                       order= false,
-                       search= '',
-                       filters= []} : IDraxPaginateOptions): Promise<IDraxPaginateResult<ITenant>>{
-        const offset = page > 1 ? (page - 1) * limit : 0
-
-        let where=""
-        if (search) {
-            where = ` WHERE name LIKE '%${search}%'`
-        }
-
-        where = SqlQueryFilter.applyFilters(where, filters)
-        const sort = SqlSort.applySort(orderBy, order)
-
-        const rCount = this.db.prepare('SELECT COUNT(*) as count FROM tenants'+where).get();
-        where += sort
-        const tenants = this.db.prepare('SELECT * FROM tenants '  + where + ' LIMIT ? OFFSET ?').all([limit, offset]);
-
-        return {
-            page: page,
-            limit: limit,
-            total: rCount.count,
-            items: tenants
-        }
-    }
-
-    async find({
-                   limit = 0,
-                   orderBy = '',
-                   order = false,
-                   search = '',
-                   filters = []
-               }: IDraxFindOptions): Promise<ITenant[]>{
-
-        let where=""
-        if (search) {
-            where = ` WHERE name LIKE '%${search}%'`
-        }
-
-        where = SqlQueryFilter.applyFilters(where, filters)
-        const sort = SqlSort.applySort(orderBy, order)
-
-        where += sort
-        const tenants = this.db.prepare('SELECT * FROM tenants '  + where).all();
-
-        return tenants
-    }
-
 
 }
 

package/src/repository/sqlite/UserApiKeySqliteRepository.ts

@@ -1,186 +1,83 @@
 import {IUserApiKey, IUserApiKeyBase} from '@drax/identity-share'
 import {IUserApiKeyRepository} from '../../interfaces/IUserApiKeyRepository'
-import {UUID} from "crypto";
 import sqlite from "better-sqlite3";
-import {randomUUID} from "node:crypto";
-import {IDraxPaginateResult, IDraxPaginateOptions} from "@drax/crud-share";
-import {SqliteErrorToValidationError, SqliteTableBuilder, SqlQueryFilter, SqlSort} from "@drax/common-back";
 import type {SqliteTableField} from "@drax/common-back";
 import UserSqliteRepository from "./UserSqliteRepository.js";
+import {AbstractSqliteRepository} from "@drax/crud-back";
 
 
-const tableFields: SqliteTableField[] = [
-    {name: "secret", type: "TEXT", unique: true, primary: false},
-    {name: "name", type: "TEXT", unique: false, primary: false},
-    {name: "user", type: "TEXT", unique: false, primary: false},
-    {name: "ipv4", type: "TEXT", unique: false, primary: false},
-    {name: "ipv6", type: "TEXT", unique: false, primary: false},
-    {name: "createdAt", type: "TEXT", unique: false, primary: false}
-]
+class UserApiKeySqliteRepository extends AbstractSqliteRepository<IUserApiKey, IUserApiKeyBase, IUserApiKeyBase> implements IUserApiKeyRepository {
 
-class UserApiKeySqliteRepository implements IUserApiKeyRepository {
-
-    private db: any;
-    private dataBaseFile: string;
     private userRepository: UserSqliteRepository;
 
+    protected db: any;
+    protected tableName: string = 'user_api_keys';
+    protected dataBaseFile: string;
+    protected searchFields: string[] = [];
+    protected booleanFields: string[] = [];
+    protected identifier: string = '_id';
+    protected populateFields = []
+    protected tableFields: SqliteTableField[] = [
+        {name: "secret", type: "TEXT", unique: true, primary: false},
+        {name: "name", type: "TEXT", unique: false, primary: false},
+        {name: "user", type: "TEXT", unique: false, primary: false},
+        {name: "ipv4", type: "TEXT", unique: false, primary: false},
+        {name: "ipv6", type: "TEXT", unique: false, primary: false},
+        {name: "createdBy", type: "TEXT", unique: false, primary: false},
+        {name: "createdAt", type: "TEXT", unique: false, primary: false}
+    ]
+    protected verbose: boolean;
+
     constructor(dataBaseFile: string, verbose: boolean = false) {
+        super(dataBaseFile, verbose)
         this.dataBaseFile = dataBaseFile
         this.userRepository = new UserSqliteRepository(dataBaseFile, verbose)
         this.db = new sqlite(dataBaseFile, {verbose: verbose ? console.log : null});
-        this.table()
     }
 
     async findUserById(id: string) {
         return await this.userRepository.findById(id)
     }
 
-    table() {
-        const builder = new SqliteTableBuilder(
-            this.dataBaseFile,
-            'user_api_keys',
-            tableFields,
-            false);
-        builder.build('id')
-    }
-
-
-    async create(userApiKeyData: IUserApiKeyBase): Promise<IUserApiKey> {
-        try {
-
-            if (!userApiKeyData.id) {
-                userApiKeyData.id = randomUUID()
-            }
-
-            if (userApiKeyData.ipv4 && Array.isArray(userApiKeyData.ipv4) && userApiKeyData.ipv4.length > 0) {
-                userApiKeyData.ipv4 = userApiKeyData.ipv4.join(',')
-            }else{
-                userApiKeyData.ipv4 = ""
-            }
+    async prepareItem(item: any): Promise<any> {
+        if (item && item.user) {
+            item.user = await this.findUserById(item.user)
+        }
 
-            if (userApiKeyData.ipv6 && Array.isArray(userApiKeyData.ipv6) && userApiKeyData.ipv6.length > 0) {
-                userApiKeyData.ipv6 = userApiKeyData.ipv6.join(',')
-            }else{
-                userApiKeyData.ipv6 = ""
-            }
+        if (item && item.createdBy) {
+            item.createdBy = await this.findUserById(item.createdBy)
+        }
 
-            userApiKeyData.createdAt = (new Date().toISOString())
+        if (item && item.ipv4) {
+            item.ipv4 = item.ipv4 != "" ? item.ipv4.split(',') : []
+        }
 
-            const fields = Object.keys(userApiKeyData)
-                .map(field => `${field}`)
-                .join(', ');
+        if (item && item.ipv6) {
+            item.ipv6 = item.ipv6 != "" ? item.ipv6.split(',') : []
+        }
+    }
 
-            const values = Object.keys(userApiKeyData)
-                .map(field => `@${field}`)
-                .join(', ');
+    async prepareData(userApiKeyData) {
+        if (userApiKeyData.ipv4 && Array.isArray(userApiKeyData.ipv4) && userApiKeyData.ipv4.length > 0) {
+            userApiKeyData.ipv4 = userApiKeyData.ipv4.join(',')
+        } else {
+            userApiKeyData.ipv4 = ""
+        }
 
-            const stmt = this.db.prepare(`INSERT INTO user_api_keys (${fields})
-                                          VALUES (${values})`);
-            stmt.run(userApiKeyData)
-            return this.findById(userApiKeyData.id as UUID)
-        } catch (e) {
-            console.log(e)
-            throw SqliteErrorToValidationError(e, userApiKeyData)
+        if (userApiKeyData.ipv6 && Array.isArray(userApiKeyData.ipv6) && userApiKeyData.ipv6.length > 0) {
+            userApiKeyData.ipv6 = userApiKeyData.ipv6.join(',')
+        } else {
+            userApiKeyData.ipv6 = ""
         }
     }
 
-    async findById(id: string): Promise<IUserApiKey | null> {
-        const userApiKey = this.db.prepare('SELECT * FROM user_api_keys WHERE id = ?').get(id);
-        userApiKey.ipv4 = userApiKey.ipv4 != "" ? userApiKey.ipv4.split(',') : []
-        userApiKey.ipv6 = userApiKey.ipv6 != "" ? userApiKey.ipv6.split(',') : []
-        userApiKey.user = await this.findUserById(userApiKey.user)
-        return userApiKey
-    }
 
     async findBySecret(secret: string): Promise<IUserApiKey | null> {
         const userApiKey = this.db.prepare('SELECT * FROM user_api_keys WHERE secret = ?').get(secret);
-        userApiKey.ipv4 = userApiKey.ipv4 != "" ? userApiKey.ipv4.split(',') : []
-        userApiKey.ipv6 = userApiKey.ipv6 != "" ? userApiKey.ipv6.split(',') : []
-        userApiKey.user = await this.findUserById(userApiKey.user)
+        await this.decorate(userApiKey)
         return userApiKey
     }
 
-    async update(id: string, userApiKeyData: IUserApiKeyBase): Promise<IUserApiKey> {
-        try {
-
-            if (userApiKeyData.ipv4 && Array.isArray(userApiKeyData.ipv4) && userApiKeyData.ipv4.length > 0) {
-                userApiKeyData.ipv4 = userApiKeyData.ipv4.join(',')
-            }else{
-                userApiKeyData.ipv4 = ""
-            }
-
-            if (userApiKeyData.ipv6 && Array.isArray(userApiKeyData.ipv6) && userApiKeyData.ipv6.length > 0) {
-                userApiKeyData.ipv6 = userApiKeyData.ipv6.join(',')
-            }else{
-                userApiKeyData.ipv6 = ""
-            }
-
-            delete userApiKeyData.secret
-
-            const setClauses = Object.keys(userApiKeyData)
-                .map(field => `${field} = @${field}`)
-                .join(', ');
-
-            userApiKeyData.id = id
-
-            const stmt = this.db.prepare(`UPDATE user_api_keys
-                                          SET ${setClauses}
-                                          WHERE id = @id `);
-            stmt.run(userApiKeyData);
-            return this.findById(id)
-        } catch (e) {
-            console.log(e)
-            throw SqliteErrorToValidationError(e, userApiKeyData)
-        }
-
-    }
-
-    async delete(id: string): Promise<boolean> {
-        const stmt = this.db.prepare('DELETE FROM user_api_keys WHERE id = ?');
-        stmt.run(id);
-        return true
-    }
-
-
-    async paginate({
-                       page = 1,
-                       limit = 5,
-                       orderBy = '',
-                       order = false,
-                       search = '',
-                       filters = []
-                   }: IDraxPaginateOptions): Promise<IDraxPaginateResult<IUserApiKey>> {
-        const offset = page > 1 ? (page - 1) * limit : 0
-
-        let where = ""
-        if (search) {
-            where = ` WHERE name LIKE '%${search}%'`
-        }
-
-        where = SqlQueryFilter.applyFilters(where, filters)
-        const sort = SqlSort.applySort(orderBy, order)
-
-        console.log("where", where)
-
-        const rCount = this.db.prepare('SELECT COUNT(*) as count FROM user_api_keys' + where).get();
-        where += sort
-        const userApiKeys = this.db.prepare('SELECT * FROM user_api_keys ' + where + ' LIMIT ? OFFSET ?').all([limit, offset]);
-
-        for (const userApiKey of userApiKeys) {
-            userApiKey.ipv4 = userApiKey.ipv4 != "" ? userApiKey.ipv4.split(',') : []
-            userApiKey.ipv6 = userApiKey.ipv6 != "" ? userApiKey.ipv6.split(',') : []
-            userApiKey.user = await this.findUserById(userApiKey.user)
-        }
-
-        return {
-            page: page,
-            limit: limit,
-            total: rCount.count,
-            items: userApiKeys
-        }
-    }
-
-
 }
 
 export default UserApiKeySqliteRepository