julien/vaquant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add uuid to account ids

Browse Source
This commit is contained in:
Julien Calixte
2019-08-27 00:28:05 +02:00
parent ee74bf3276
commit 7a3f168218
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
package-lock.json generated
View File

@@ -1346,6 +1346,15 @@
"integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==", "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==",
"dev": true "dev": true
}, },
"@types/uuid": {
"version": "3.4.5",
"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.5.tgz",
"integrity": "sha512-MNL15wC3EKyw1VLF+RoVO4hJJdk9t/Hlv3rt1OL65Qvuadm4BYo6g9ZJQqoq7X8NBFSsQXgAujWciovh2lpVjA==",
"dev": true,
"requires": {
"@types/node": "*"
}
},
"@types/webpack-env": { "@types/webpack-env": {
"version": "1.14.0", "version": "1.14.0",
"resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.14.0.tgz", "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.14.0.tgz",
@@ -15175,9 +15184,9 @@
"dev": true "dev": true
}, },
"uuid": { "uuid": {
"version": "3.3.2", "version": "3.3.3",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
}, },
"validate-npm-package-license": { "validate-npm-package-license": {
"version": "3.0.4", "version": "3.0.4",

2
package.json
View File

@@ -27,6 +27,7 @@
"pouchdb-authentication": "^1.1.3", "pouchdb-authentication": "^1.1.3",
"pouchdb-browser": "^7.1.1", "pouchdb-browser": "^7.1.1",
"register-service-worker": "^1.6.2", "register-service-worker": "^1.6.2",
"uuid": "^3.3.3",
"vue": "^2.6.10", "vue": "^2.6.10",
"vue-class-component": "^7.1.0", "vue-class-component": "^7.1.0",
"vue-click-outside": "^1.0.7", "vue-click-outside": "^1.0.7",
@@ -43,6 +44,7 @@
"@types/md5": "^2.1.33", "@types/md5": "^2.1.33",
"@types/notyf": "^2.0.0", "@types/notyf": "^2.0.0",
"@types/pouchdb": "^6.4.0", "@types/pouchdb": "^6.4.0",
"@types/uuid": "^3.4.5",
"@vue/cli-plugin-babel": "^3.10.0", "@vue/cli-plugin-babel": "^3.10.0",
"@vue/cli-plugin-pwa": "^3.10.0", "@vue/cli-plugin-pwa": "^3.10.0",
"@vue/cli-plugin-typescript": "^3.10.0", "@vue/cli-plugin-typescript": "^3.10.0",

2
src/services/AccountService.ts
View File

@@ -26,7 +26,7 @@ class AccountService {
public async add(account: IAccount): Promise<PouchDB.Core.Response> { public async add(account: IAccount): Promise<PouchDB.Core.Response> {
try { try {
account.slug = slug(account.name) account.slug = slug(account.name)
const id = couchService.newId('acc') const id = couchService.newId('acc', true)
account._id = id account._id = id
account.doctype = 'account' account.doctype = 'account'
const response = await couchService.save(account) const response = await couchService.save(account)

5
src/services/CouchService.ts
View File

@@ -1,4 +1,5 @@
import axios from 'axios' import axios from 'axios'
import uuid from 'uuid/v4'
import PouchDb from 'pouchdb-browser' import PouchDb from 'pouchdb-browser'
import PouchDbAuthentication from 'pouchdb-authentication' import PouchDbAuthentication from 'pouchdb-authentication'
import bus, { SYNC } from '@/utils/bus-event' import bus, { SYNC } from '@/utils/bus-event'
@@ -340,8 +341,8 @@ class CouchService {
return false return false
} }
public newId(...prefixes: string[]): string { public newId(prefix: string, withUuid: boolean = false): string {
return `${prefixes.join('-')}${Date.now().toString()}` return `${prefix}${Date.now().toString()}${withUuid ? uuid() : ''}`
} }
public async purgeDb(): Promise<void> { public async purgeDb(): Promise<void> {