Change happened_on field to datetime

cubing · Mar 4, 2021 · 70dc1f1 · 70dc1f1
1 parent 19aa005
commit 70dc1f1
Show file tree

Hide file tree

Showing 32 changed files with 730 additions and 658 deletions.
diff --git a/backend/functions/db/migrations/20210303180546_happened_on_to_datetime.ts b/backend/functions/db/migrations/20210303180546_happened_on_to_datetime.ts
@@ -0,0 +1,13 @@
+import * as Knex from "knex";
+
+export async function up(knex: Knex): Promise<void> {
+  return knex.schema.alterTable("personalBest", function (t) {
+    t.dateTime("happened_on").notNullable().alter();
+  });
+}
+
+export async function down(knex: Knex): Promise<void> {
+  return knex.schema.alterTable("personalBest", function (t) {
+    t.date("happened_on").notNullable().alter();
+  });
+}
diff --git a/backend/functions/migration.ts b/backend/functions/migration.ts
@@ -53,7 +53,7 @@ export async function up(knex: Knex): Promise<void[]> {
       table.integer("attempts_succeeded").notNullable();
       table.integer("attempts_total").notNullable();
       table.integer("product").nullable();
-      table.date("happened_on").notNullable();
+      table.dateTime("happened_on").notNullable();
       table.integer("time_elapsed").notNullable();
       table.dateTime("created_at").notNullable().defaultTo(knex.fn.now());
       table.dateTime("updated_at").nullable();

diff --git a/backend/functions/package-lock.json b/backend/functions/package-lock.json
diff --git a/backend/functions/package.json b/backend/functions/package.json
@@ -22,7 +22,7 @@
     "express": "^4.17.1",
     "firebase-admin": "^9.2.0",
     "firebase-functions": "^3.13.1",
-    "jomql": "^0.3.12",
+    "jomql": "^0.3.13",
     "jsonwebtoken": "^8.5.1",
     "knex": "^0.21.17",
     "pg": "^8.5.1",

diff --git a/backend/functions/src/schema/helpers/typeDef.ts b/backend/functions/src/schema/helpers/typeDef.ts
@@ -153,8 +153,8 @@ export function generateStringField(
   });
 }
 
-// as UNIX timestamp
-export function generateDateTimeField(
+// DateTime as UNIX timestamp
+export function generateUnixTimestampField(
   params: {
     nowOnly?: boolean; // if the unix timestamp can only be set to now()
   } & GenerateFieldParams
@@ -184,7 +184,6 @@ export function generateDateTimeField(
       parseValue: nowOnly
         ? () => knex.fn.now()
         : (value: unknown) => {
-            console.log(value);
             if (typeof value !== "number") throw 1; // should never happen
             return new Date(value);
           },
@@ -426,7 +425,7 @@ export function generateEnumField(
  */
 
 export function generateCreatedAtField() {
-  return generateDateTimeField({
+  return generateUnixTimestampField({
     name: "created_at",
     description: "When the record was created",
     allowNull: false,
@@ -436,7 +435,7 @@ export function generateCreatedAtField() {
 }
 
 export function generateUpdatedAtField() {
-  return generateDateTimeField({
+  return generateUnixTimestampField({
     name: "updated_at",
     description: "When the record was last updated",
     allowNull: true,

diff --git a/backend/functions/src/schema/models/personalBest/service.ts b/backend/functions/src/schema/models/personalBest/service.ts
@@ -1,9 +1,6 @@
 import { PaginatedService } from "../../core/services";
-import { generateUserRoleGuard } from "../../helpers/permissions";
-import { userRoleKenum } from "../../enums";
 import { permissionsCheck } from "../../helpers/permissions";
 import * as Resolver from "../../helpers/resolver";
-import * as errorHelper from "../../helpers/error";
 import * as sqlHelper from "../../helpers/sql";
 import { ServiceFunctionInputs } from "../../../types";
 import { JomqlBaseError } from "jomql";
@@ -29,6 +26,11 @@ export class PersonalBestService extends PaginatedService {
     id: {},
     created_at: {},
     score: {},
+    "event.name": {},
+    "pb_class.name": {},
+    set_size: {},
+    time_elapsed: {},
+    happened_on: {},
   };
 
   searchFieldsMap = {
@@ -208,7 +210,7 @@ export class PersonalBestService extends PaginatedService {
       fieldPath,
       options: {
         onConflict: {
-          columns: ["pb_class", "event", "set_size"],
+          columns: ["pb_class", "event", "set_size", "created_by"],
           action: "merge",
         },
       },

diff --git a/backend/functions/src/schema/models/personalBest/typeDef.ts b/backend/functions/src/schema/models/personalBest/typeDef.ts
@@ -10,11 +10,10 @@ import {
   generateIdField,
   generateCreatedAtField,
   generateUpdatedAtField,
-  generateCreatedByField,
   generateTypenameField,
   generateJoinableField,
   generateIntegerField,
-  generateDateField,
+  generateUnixTimestampField,
 } from "../../helpers/typeDef";
 
 export default new JomqlObjectType(<ObjectTypeDefinition>{
@@ -59,7 +58,7 @@ export default new JomqlObjectType(<ObjectTypeDefinition>{
       service: Product,
       allowNull: true,
     }),
-    happened_on: generateDateField({
+    happened_on: generateUnixTimestampField({
       allowNull: false,
     }),
     time_elapsed: generateIntegerField({

diff --git a/frontend/components/interface/crud/crudRecordInterface.vue b/frontend/components/interface/crud/crudRecordInterface.vue
@@ -55,7 +55,12 @@
             </v-badge>
           </v-btn>
           <v-spacer></v-spacer>
-          <v-btn icon :loading="loading.exportData" @click="exportData()">
+          <v-btn
+            v-if="recordInfo.paginationOptions.downloadOptions"
+            icon
+            :loading="loading.exportData"
+            @click="exportData()"
+          >
             <v-icon>mdi-download</v-icon>
           </v-btn>
           <v-btn icon @click="syncFilters() || reset()">
@@ -66,7 +71,7 @@
         <v-container v-if="showFilterInterface" fluid class="pb-0 mt-3">
           <v-row>
             <v-col
-              v-if="recordInfo.hasSearch"
+              v-if="recordInfo.paginationOptions.hasSearch"
               :key="-1"
               sm="12"
               lg="3"
@@ -113,6 +118,7 @@
                     autocomplete="off"
                     v-bind="attrs"
                     v-on="on"
+                    @change="filterChanged = true"
                   ></v-text-field>
                 </template>
                 <v-date-picker

diff --git a/frontend/components/interface/crud/deleteRecordInterface.vue b/frontend/components/interface/crud/deleteRecordInterface.vue
@@ -21,9 +21,8 @@
 </template>
 
 <script>
-import sharedService from '~/services/shared'
 import { executeJomql } from '~/services/jomql'
-import { capitalizeString } from '~/services/common'
+import { capitalizeString, handleError } from '~/services/common'
 
 export default {
   props: {
@@ -51,8 +50,8 @@ export default {
         : this.selectedItem
     },
 
-    capitalizedType() {
-      return capitalizeString(this.recordInfo.type)
+    capitalizedTypename() {
+      return capitalizeString(this.recordInfo.typename)
     },
   },
 
@@ -62,7 +61,7 @@ export default {
       try {
         const data = await executeJomql(this, {
           [this.recordInfo.deleteOptions.operationName ??
-          'delete' + this.capitalizedType]: {
+          'delete' + this.capitalizedTypename]: {
             id: true,
             __args: {
               id: this.selectedItem.id,
@@ -71,13 +70,13 @@ export default {
         })
 
         this.$notifier.showSnackbar({
-          message: this.capitalizedType + ' Deleted',
+          message: this.capitalizedTypename + ' Deleted',
           variant: 'success',
         })
 
         this.$emit('handleSubmit', data)
       } catch (err) {
-        sharedService.handleError(err, this.$root)
+        handleError(this, err)
       }
       this.loading.deleteRecord = false
     },

diff --git a/frontend/components/interface/crud/editRecordInterface.vue b/frontend/components/interface/crud/editRecordInterface.vue
@@ -17,7 +17,6 @@
             v-for="(item, i) in inputsArray"
             :key="i"
             cols="12"
-            xs="12"
             class="py-0"
           >
             <div
@@ -28,7 +27,6 @@
                 <v-img :src="item.value" contain></v-img>
               </v-avatar>
             </div>
-
             <v-textarea
               v-else-if="item.fieldInfo.inputType === 'textarea'"
               v-model="item.value"
@@ -78,6 +76,7 @@
                 v-model="item.value"
                 color="primary"
                 no-title
+                :readonly="item.readonly || mode === 'view'"
                 @input="item.focused = false"
               ></v-date-picker>
             </v-menu>

diff --git a/frontend/components/page/crudRecordPage.vue b/frontend/components/page/crudRecordPage.vue
@@ -1,8 +1,8 @@
 <template>
   <v-container fluid>
     <v-layout column justify-left align-left>
-      <v-flex xs12 sm8 md6>
-        <div class="pt-2">
+      <v-row>
+        <v-col cols="12">
           <component
             :is="interfaceComponent"
             :record-info="recordInfo"
@@ -16,16 +16,15 @@
             dense
             @filters-updated="handleFiltersUpdated"
           ></component>
-        </div>
-      </v-flex>
+        </v-col>
+      </v-row>
     </v-layout>
   </v-container>
 </template>
 
 <script>
-import sharedService from '~/services/shared'
 import CrudRecordInterface from '~/components/interface/crud/crudRecordInterface.vue'
-import { isObject } from '~/services/common'
+import { isObject, capitalizeString } from '~/services/common'
 
 export default {
   props: {
@@ -60,11 +59,14 @@ export default {
   },
   computed: {
     interfaceComponent() {
-      return this.recordInfo.interfaceComponent || CrudRecordInterface
+      return (
+        this.recordInfo.paginationOptions.interfaceComponent ||
+        CrudRecordInterface
+      )
     },
 
-    capitalizedType() {
-      return sharedService.capitalizeString(this.recordInfo.type)
+    capitalizedTypename() {
+      return capitalizeString(this.recordInfo.typename)
     },
 
     // parses the query params and transforms into raw filterArray
@@ -75,7 +77,7 @@ export default {
           const decoded = decodeURIComponent(ele)
           const filterParts = decoded.split(' ')
           if (filterParts.length === 3) {
-            const filter = this.recordInfo.filters.find(
+            const filter = this.recordInfo.paginationOptions.filters.find(
               (filterObject) => filterObject.field === filterParts[0]
             )
 
@@ -86,8 +88,8 @@ export default {
             if (!fieldInfo) throw new Error('Unknown field: ' + filter.field)
 
             // if value === '_null' it is understood to be null.
-            const value = fieldInfo.parseValue
-              ? fieldInfo.parseValue(filterParts[2])
+            const value = fieldInfo.parseQueryValue
+              ? fieldInfo.parseQueryValue(filterParts[2])
               : filterParts[2]
             filterArray.push({
               field: filterParts[0],