sergiodt
/
vn-verdnaturachat
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chore: Migrate database/services and database/utils to TS (#3708) 

* migrate database services and utils to ts

* Migrate tests

Co-authored-by: Diego Mello <diegolmello@gmail.com>
This commit is contained in:
Gerzon Z 2022-02-16 18:19:04 -04:00 committed by GitHub
parent 5e60f58bb3
commit 88172f0aa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/lib/database/services/Message.js → app/lib/database/services/Message.ts
View File

@ -1,9 +1,10 @@
import database from '..'; import database from '..';
import { TAppDatabase } from '../interfaces';
import { MESSAGES_TABLE } from '../model/Message'; import { MESSAGES_TABLE } from '../model/Message';
const getCollection = db => db.get(MESSAGES_TABLE); const getCollection = (db: TAppDatabase) => db.get(MESSAGES_TABLE);
export const getMessageById = async messageId => { export const getMessageById = async (messageId: string) => {
const db = database.active; const db = database.active;
const messageCollection = getCollection(db); const messageCollection = getCollection(db);
try { try {

5
app/lib/database/services/Thread.js → app/lib/database/services/Thread.ts
View File

@ -1,9 +1,10 @@
import database from '..'; import database from '..';
import { TAppDatabase } from '../interfaces';
import { THREADS_TABLE } from '../model/Thread'; import { THREADS_TABLE } from '../model/Thread';
const getCollection = db => db.get(THREADS_TABLE); const getCollection = (db: TAppDatabase) => db.get(THREADS_TABLE);
export const getThreadById = async tmid => { export const getThreadById = async (tmid: string) => {
const db = database.active; const db = database.active;
const threadCollection = getCollection(db); const threadCollection = getCollection(db);
try { try {

5
app/lib/database/services/ThreadMessage.js → app/lib/database/services/ThreadMessage.ts
View File

@ -1,9 +1,10 @@
import database from '..'; import database from '..';
import { TAppDatabase } from '../interfaces';
import { THREAD_MESSAGES_TABLE } from '../model/ThreadMessage'; import { THREAD_MESSAGES_TABLE } from '../model/ThreadMessage';
const getCollection = db => db.get(THREAD_MESSAGES_TABLE); const getCollection = (db: TAppDatabase) => db.get(THREAD_MESSAGES_TABLE);
export const getThreadMessageById = async messageId => { export const getThreadMessageById = async (messageId: string) => {
const db = database.active; const db = database.active;
const threadMessageCollection = getCollection(db); const threadMessageCollection = getCollection(db);
try { try {

7
app/lib/database/utils.js
View File

@ -1,7 +0,0 @@
import XRegExp from 'xregexp';
// Matches letters from any alphabet and numbers
const likeStringRegex = new XRegExp('[^\\p{L}\\p{Nd}]', 'g');
export const sanitizeLikeString = str => str?.replace(likeStringRegex, '_');
export const sanitizer = r => r;

4
app/lib/database/utils.test.js → app/lib/database/utils.test.ts
View File

@ -1,14 +1,12 @@
/* eslint-disable no-undef */
import * as utils from './utils'; import * as utils from './utils';
describe('sanitizeLikeStringTester', () => { describe('sanitizeLikeStringTester', () => {
// example chars that shouldn't return // example chars that shouldn't return
const disallowedChars = ',./;[]!@#$%^&*()_-=+~'; const disallowedChars = ',./;[]!@#$%^&*()_-=+~';
const sanitizeLikeStringTester = str => const sanitizeLikeStringTester = (str: string) =>
expect(utils.sanitizeLikeString(`${str}${disallowedChars}`)).toBe(`${str}${'_'.repeat(disallowedChars.length)}`); expect(utils.sanitizeLikeString(`${str}${disallowedChars}`)).toBe(`${str}${'_'.repeat(disallowedChars.length)}`);
test('render empty', () => { test('render empty', () => {
expect(utils.sanitizeLikeString(null)).toBe(undefined);
expect(utils.sanitizeLikeString('')).toBe(''); expect(utils.sanitizeLikeString('')).toBe('');
expect(utils.sanitizeLikeString(undefined)).toBe(undefined); expect(utils.sanitizeLikeString(undefined)).toBe(undefined);
}); });

7
app/lib/database/utils.ts Normal file
View File

@ -0,0 +1,7 @@
import XRegExp from 'xregexp';
// Matches letters from any alphabet and numbers
const likeStringRegex = XRegExp('[^\\p{L}\\p{Nd}]', 'g');
export const sanitizeLikeString = (str?: string): string | undefined => str?.replace(likeStringRegex, '_');
export const sanitizer = (r: object): object => r;