CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-06-21 11:51:00 +12:00
Code Issues Projects Releases Wiki Activity

id generation in utilities module

Browse source
This commit is contained in:
Michael Shanks 2020-05-18 16:22:09 +01:00
parent 8d4faa0bf9
commit 2b48a92013
5 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/server/src/api/controllers/application.js
View file

@ -1,7 +1,7 @@
const CouchDB = require("../../db")
const ClientDb = require("../../db/clientDb")
const { getPackageForBuilder } = require("../../utilities/builder")
const uuid = require("uuid")
const newid = require("../../db/newid")
const env = require("../../environment")
exports.fetch = async function(ctx) {
@ -24,7 +24,7 @@ exports.create = async function(ctx) {
const db = new CouchDB(ClientDb.name(env.CLIENT_ID))
const newApplication = {
_id: uuid.v4().replace(/-/g, ""),
_id: newid(),
type: "app",
instances: [],
userInstanceMap: {},

5
packages/server/src/api/controllers/instance.js
View file

@ -1,12 +1,11 @@
const CouchDB = require("../../db")
const client = require("../../db/clientDb")
const uuid = require("uuid")
const newid = require("../../db/newid")
const env = require("../../environment")
exports.create = async function(ctx) {
const instanceName = ctx.request.body.name
const uid = uuid.v4().replace(/-/g, "")
const instanceId = `inst_${ctx.params.applicationId.substring(0, 7)}_${uid}`
const instanceId = `inst_${ctx.params.applicationId.substring(0, 7)}_${newid()}`
const { applicationId } = ctx.params
const clientId = env.CLIENT_ID
const db = new CouchDB(instanceId)

4
packages/server/src/api/controllers/model.js
View file

@ -1,5 +1,5 @@
const CouchDB = require("../../db")
const uuid = require("uuid")
const newid = require("../../db/newid")
exports.fetch = async function(ctx) {
const db = new CouchDB(ctx.params.instanceId)
@ -15,7 +15,7 @@ exports.create = async function(ctx) {
const newModel = {
type: "model",
...ctx.request.body,
_id: uuid.v4().replace(/-/g, ""),
_id: newid(),
}
const result = await db.post(newModel)

4
packages/server/src/api/controllers/record.js
View file

@ -1,6 +1,6 @@
const CouchDB = require("../../db")
const Ajv = require("ajv")
const uuid = require("uuid")
const newid = require("../../db/newid")
const ajv = new Ajv()
@ -9,7 +9,7 @@ exports.save = async function(ctx) {
const record = ctx.request.body
if (!record._rev && !record._id) {
record._id = uuid.v4().replace(/-/, "")
record._id = newid()
}
// validation with ajv

5
packages/server/src/db/newid.js Normal file
View file

@ -0,0 +1,5 @@
const { v4 } = require("uuid")
module.exports = function() {
return v4().replace(/-/g, "")
}