Dev database
This commit is contained in:
parent
01a9b55b6a
commit
ad9863f2de
|
|
@ -27,6 +27,10 @@ const datastore = new Datastore({
|
|||
app.use(express.json());
|
||||
app.use((req, res, next) => {
|
||||
req.datastore = datastore;
|
||||
req.types = {
|
||||
event: process.env.NODE_ENV === 'production' ? 'Event' : 'DevEvent',
|
||||
person: process.env.NODE_ENV === 'production' ? 'Person' : 'DevPerson',
|
||||
};
|
||||
next();
|
||||
});
|
||||
app.options('*', cors(corsOptions));
|
||||
|
|
@ -43,5 +47,5 @@ app.post('/event/:eventId/people/:personName', login);
|
|||
app.patch('/event/:eventId/people/:personName', updatePerson);
|
||||
|
||||
app.listen(port, () => {
|
||||
console.log(`Crabfit API listening at http://localhost:${port}`)
|
||||
console.log(`Crabfit API listening at http://localhost:${port} in ${process.env.NODE_ENV === 'production' ? 'prod' : 'dev'} mode`)
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "crabfit-backend",
|
||||
"version": "1.0.0",
|
||||
"version": "1.1.0",
|
||||
"description": "API for Crabfit",
|
||||
"main": "index.js",
|
||||
"author": "Ben Grant",
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ module.exports = async (req, res) => {
|
|||
const currentTime = dayjs().unix();
|
||||
|
||||
const entity = {
|
||||
key: req.datastore.key(['Event', eventId]),
|
||||
key: req.datastore.key([req.types.event, eventId]),
|
||||
data: {
|
||||
name: name,
|
||||
created: currentTime,
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ module.exports = async (req, res) => {
|
|||
const { person } = req.body;
|
||||
|
||||
try {
|
||||
const event = (await req.datastore.get(req.datastore.key(['Event', eventId])))[0];
|
||||
const query = req.datastore.createQuery('Person')
|
||||
const event = (await req.datastore.get(req.datastore.key([req.types.event, eventId])))[0];
|
||||
const query = req.datastore.createQuery(req.types.person)
|
||||
.filter('eventId', eventId)
|
||||
.filter('name', person.name);
|
||||
let personResult = (await req.datastore.runQuery(query))[0][0];
|
||||
|
|
@ -23,7 +23,7 @@ module.exports = async (req, res) => {
|
|||
}
|
||||
|
||||
const entity = {
|
||||
key: req.datastore.key('Person'),
|
||||
key: req.datastore.key(req.types.person),
|
||||
data: {
|
||||
name: person.name.trim(),
|
||||
password: hash,
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ module.exports = async (req, res) => {
|
|||
const { eventId } = req.params;
|
||||
|
||||
try {
|
||||
const event = (await req.datastore.get(req.datastore.key(['Event', eventId])))[0];
|
||||
const event = (await req.datastore.get(req.datastore.key([req.types.event, eventId])))[0];
|
||||
|
||||
if (event) {
|
||||
res.send({
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ module.exports = async (req, res) => {
|
|||
const { eventId } = req.params;
|
||||
|
||||
try {
|
||||
const query = req.datastore.createQuery('Person').filter('eventId', eventId);
|
||||
const query = req.datastore.createQuery(req.types.person).filter('eventId', eventId);
|
||||
let people = (await req.datastore.runQuery(query))[0];
|
||||
people = people.map(person => ({
|
||||
name: person.name,
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ module.exports = async (req, res) => {
|
|||
const { person } = req.body;
|
||||
|
||||
try {
|
||||
const query = req.datastore.createQuery('Person')
|
||||
const query = req.datastore.createQuery(req.types.person)
|
||||
.filter('eventId', eventId)
|
||||
.filter('name', personName);
|
||||
let personResult = (await req.datastore.runQuery(query))[0][0];
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ module.exports = async (req, res) => {
|
|||
let personCount = null;
|
||||
|
||||
try {
|
||||
const eventQuery = req.datastore.createQuery(['__Stat_Kind__']).filter('kind_name', 'Event');
|
||||
const personQuery = req.datastore.createQuery(['__Stat_Kind__']).filter('kind_name', 'Person');
|
||||
const eventQuery = req.datastore.createQuery(['__Stat_Kind__']).filter('kind_name', req.types.event);
|
||||
const personQuery = req.datastore.createQuery(['__Stat_Kind__']).filter('kind_name', req.types.person);
|
||||
|
||||
eventCount = (await req.datastore.runQuery(eventQuery))[0][0].count;
|
||||
personCount = (await req.datastore.runQuery(personQuery))[0][0].count;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ module.exports = async (req, res) => {
|
|||
const { person } = req.body;
|
||||
|
||||
try {
|
||||
const query = req.datastore.createQuery('Person')
|
||||
const query = req.datastore.createQuery(req.types.person)
|
||||
.filter('eventId', eventId)
|
||||
.filter('name', personName);
|
||||
let personResult = (await req.datastore.runQuery(query))[0][0];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "crabfit-frontend",
|
||||
"version": "0.1.0",
|
||||
"version": "1.0.0",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@emotion/react": "^11.1.5",
|
||||
|
|
|
|||
Loading…
Reference in a new issue