fix indexing date and time

Author: wulff007

Diff for: src/data-indexer/data-indexer.ts

@@ -413,13 +413,18 @@ export class DataIndexer {
                 if (field.type === 'datetime') {
 
                     _.set(item, f, _.has(item, f) && _.get(item, f) !== null
-                        ? dayjs(Number(_.get(item, f))).tz(timezone).format()
+                        ? dayjs(Number(_.get(item, f))).tz(timezone).format(formatValues ? 'DD.MM.YYYY hh:mm:ss' : '')
                         : null )
 
                 } else if (field.type === 'date') {
                     _.set(item, f, _.has(item, f) && _.get(item, f) !== null
-                        ? dayjs(Number(_.get(item, f))).tz(timezone).format(formatValues ? 'DD.MM.YYYY' : '')
+                        ? dayjs(String(_.get(item, f)), 'YYYYMMDD').format(formatValues ? 'DD.MM.YYYY' : 'YYYY-MM-DD')
                         : null )
+                } else if (field.type === 'time') {
+                    _.set(item, f, _.has(item, f) && _.get(item, f) !== null
+                        ? numeral(Number(_.get(item, f))).format('00:00:00')
+                        : null )
+
                 } else if (formatValues && field.type === 'number' && !field.isMultiple) {
 
                     _.set(item, f, _.has(item, f) && _.get(item, f) !== null

Diff for: src/data-indexer/internal-db.adapter.ts

@@ -44,21 +44,20 @@ export class InternalDbAdapter  extends IndexerDataAdapter {
                 val = JSON.parse(val)
             } else {
                 if(field.type === 'datetime') {
-                    val = val ? dayjs(val).utc(false).valueOf() : null
+                    val = val ? dayjs(val).utc().valueOf() : null
                 } else if (field.type === 'date') {
-
-                    val = val
-                        ? dayjs(val)
-                            .set('hour', 0)
-                            .set('minute', 0)
-                            .set('second', 0)
-                            .set('millisecond', 0)
-                            .utc(false)
-                            .valueOf()
-                        : null
-
+                    if (val) {
+                        let d = dayjs.tz(val.slice(0,10), 'YYYY-MM-DD', 'UTC')
+                        val = Number(d.format('YYYYMMDD'))
+                    } else
+                        val = null
+                } else if (field.type === 'time') {
+                    if (val) {
+                        let s = val.split(':')
+                        val = s.length === 3 ? Number(s[0]) * 60 * 60 + Number(s[1]) * 60 + Number(s[2]) : null
+                    }
                 } else if (field.type === 'number') {
-                    val = Number(val)
+                    val = val ? Number(val) : null
                 } else if (field.type === 'string' ) {
                     val = val !== undefined && val !== null ? String(val) : ""
                 }

Diff for: src/data-indexer/internal.adapter.ts

@@ -52,16 +52,14 @@ export class InternalAdapter extends IndexerDataAdapter {
                 val = val ? dayjs(val).utc(true).valueOf() : null
             } else if (field.type === 'date') {
                 console.log(val)
-                val = val ? dayjs(val)
-                        .set('hour', 0)
-                        .set('minute', 0)
-                        .set('second', 0)
-                        .set('millisecond', 0)
-                        .utc()
-                        .valueOf()
-                     : null
 
-                console.log(val, new Date(val))
+                if (val) {
+                    let d = dayjs.tz(val.slice(0,10), 'YYYY-MM-DD', 'UTC')
+                    val = Number(d.format('YYYYMMDD'))
+                } else
+                    val = null
+
+                console.log(val)
 
             }
             if (field.type === 'number') {

Diff for: src/datasources/datasourceV2.service.ts

@@ -47,6 +47,7 @@ export class DataSourceV2Service {
         this.indexer = new DataIndexer(configService, datasource)
         this.timezone = configService.get<string>('DEFAULT_TIMEZONE') || 'Europe/Moscow'
         this.indexer.setTimezone(this.timezone)
+        console.log("timezone", this.timezone)
     }
 
     private readonly logger = new Logger(DataSourceV2Service.name);