Skip to content

Commit

Permalink
Merge pull request #3 from goto/fix-docker-image
Browse files Browse the repository at this point in the history
fix: import reference
  • Loading branch information
StewartJingga authored Apr 12, 2023
2 parents edd174d + b1a8ea2 commit e839742
Show file tree
Hide file tree
Showing 22 changed files with 39 additions and 35 deletions.
2 changes: 1 addition & 1 deletion src/app/connection-fields/fields.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IFieldsMap } from 'src/types';
import { IFieldsMap } from '../../types';

const fieldsMap: IFieldsMap = {
postgres: {
Expand Down
2 changes: 1 addition & 1 deletion src/app/connection-fields/resource.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IFieldsListItem, SupportedDBType } from 'src/types';
import { IFieldsListItem, SupportedDBType } from '../../types';
import Fields from './fields';

export const getFields = async (): Promise<IFieldsListItem[]> => {
Expand Down
2 changes: 1 addition & 1 deletion src/app/connection-fields/schema.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as Joi from 'joi';
import { SupportedDBs } from 'src/config/constants';
import { SupportedDBs } from '../../config/constants';

export const getFieldsResponse = Joi.object({
data: Joi.array().items(
Expand Down
2 changes: 1 addition & 1 deletion src/app/connection/handler.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Hapi from '@hapi/hapi';
import Boom from '@hapi/boom';
import { ICreateConnectionPayload } from 'src/types';
import { ICreateConnectionPayload } from '../../types';
import * as Schema from './schema';
import * as Resource from './resource';

Expand Down
10 changes: 5 additions & 5 deletions src/app/connection/resource.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import Connection from 'src/models/connection';
import Cube from 'src/models/cube';
import * as CubeTransformer from 'src/app/cube/transformer';
import Connection from '../../models/connection';
import Cube from '../../models/cube';
import * as CubeTransformer from '../../app/cube/transformer';

import {
ICreateConnectionPayload,
IConnectionResponse,
IPGTablesDetails,
ITableListItem,
ICubeDocument
} from 'src/types';
import ConnectionProvider from 'src/providers/connection';
} from '../../types';
import ConnectionProvider from '../../providers/connection';
import * as Transformer from './transformer';

export const list = async (): Promise<IConnectionResponse[]> => {
Expand Down
2 changes: 1 addition & 1 deletion src/app/connection/schema.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as Joi from 'joi';
import { SupportedDBs } from 'src/config/constants';
import { SupportedDBs } from '../../config/constants';

const suppotedTypeValidation = Joi.string()
.valid(...SupportedDBs)
Expand Down
4 changes: 2 additions & 2 deletions src/app/connection/transformer.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import * as Adapter from 'src/lib/adapter';
import * as Adapter from '../../lib/adapter';
import {
ICreateConnectionPayload,
ICreateConnectionTransformedPayload,
IConnectionResponse,
IConnection
} from 'src/types';
} from '../../types';

export async function create(
data: ICreateConnectionPayload
Expand Down
2 changes: 1 addition & 1 deletion src/app/cube/handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
ICreateCubePayload,
ICubeListQuery,
IUpdateCubePayload
} from 'src/types';
} from '../../types';
import * as Resource from './resource';
import * as Schema from './schema';

Expand Down
4 changes: 2 additions & 2 deletions src/app/cube/resource.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import Cube from 'src/models/cube';
import Cube from '../../models/cube';
import {
ICubeDocument,
ICreateCubePayload,
ICubeListQuery,
IUpdateCubePayload
} from 'src/types';
} from '../../types';
import * as Transformer from './transformer';

export const list = async (
Expand Down
4 changes: 2 additions & 2 deletions src/app/cube/transformer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as Adapter from 'src/lib/adapter';
import { ICreateCubePayload, ICreateCubeTransformedPayload } from 'src/types';
import * as Adapter from '../../lib/adapter';
import { ICreateCubePayload, ICreateCubeTransformedPayload } from '../../types';

export async function create(
data: ICreateCubePayload
Expand Down
4 changes: 2 additions & 2 deletions src/app/meta/resource.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Cube from 'src/models/cube';
import { ICubesStats } from 'src/types';
import Cube from '../../models/cube';
import { ICubesStats } from '../../types';

export const cubesStats = async (): Promise<ICubesStats | undefined> => {
const [stats] = await Cube.getStats();
Expand Down
2 changes: 1 addition & 1 deletion src/app/metric/handler.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Hapi from '@hapi/hapi';
import Boom from '@hapi/boom';
import { ICreateMetricPayload, IUpdateMetricPayload } from 'src/types';
import { ICreateMetricPayload, IUpdateMetricPayload } from '../../types';
import * as Resource from './resource';
import * as Schema from './schema';

Expand Down
2 changes: 1 addition & 1 deletion src/app/metric/meta/resource.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as Boom from '@hapi/boom';
import Metric from 'src/models/metric';
import Metric from '../../../models/metric';

type MetaFields = Map<string, string>;

Expand Down
8 changes: 6 additions & 2 deletions src/app/metric/resource.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import Metric from 'src/models/metric';
import { ICreateMetricPayload, IMetric, IUpdateMetricPayload } from 'src/types';
import Metric from '../../models/metric';
import {
ICreateMetricPayload,
IMetric,
IUpdateMetricPayload
} from '../../types';
import * as Transformer from './transformer';

export const list = async (
Expand Down
4 changes: 2 additions & 2 deletions src/app/metric/transformer.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as Adapter from 'src/lib/adapter';
import * as Adapter from '../../lib/adapter';
import {
ICreateMetricPayload,
ICreateMetricTransformedPayload
} from 'src/types';
} from '../../types';

export async function create(
data: ICreateMetricPayload
Expand Down
2 changes: 1 addition & 1 deletion src/config/constants.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SupportedDBType } from 'src/types';
import { SupportedDBType } from '../types';

export const SupportedDBs: Array<SupportedDBType> = [
'postgres',
Expand Down
4 changes: 2 additions & 2 deletions src/lib/adapter.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { v1 as uuidv1 } from 'uuid';
import { encrypt, decrypt } from 'src/lib/utils';
import { ICreateConnectionPayload } from 'src/types';
import { encrypt, decrypt } from './utils';
import { ICreateConnectionPayload } from '../types';

export function urn<T>(data: T): T & { urn: string } {
const uuid = uuidv1();
Expand Down
2 changes: 1 addition & 1 deletion src/lib/utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import crypto from 'crypto';
import * as Config from 'src/config/config';
import * as Config from '../config/config';

const algorithm = 'aes-256-ctr';
const secretKey = Config.get<string>('/encryption_secrect_key');
Expand Down
2 changes: 1 addition & 1 deletion src/models/connection.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import mongoose, { Schema, Model } from 'mongoose';
import { IConnectionDocument, ICreateConnectionPayload } from 'src/types';
import { IConnectionDocument, ICreateConnectionPayload } from '../types';

export interface IConnectionModel extends Model<IConnectionDocument> {
list(): Promise<Array<IConnectionDocument>>;
Expand Down
2 changes: 1 addition & 1 deletion src/models/cube.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
ICubeDocument,
ICubeListQuery,
ICubesStats
} from 'src/types';
} from '../types';

export interface ICubeModel extends Model<ICubeDocument> {
list(query: ICubeListQuery): Promise<Array<ICubeDocument>>;
Expand Down
2 changes: 1 addition & 1 deletion src/models/metric.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import mongoose, { Schema, Model } from 'mongoose';
import { IMetricDocument, IUpdateMetricPayload } from 'src/types';
import { IMetricDocument, IUpdateMetricPayload } from '../types';

export interface IMetricModel extends Model<IMetricDocument> {
findByUrn(urn: string): Promise<IMetricDocument | null>;
Expand Down
6 changes: 3 additions & 3 deletions src/providers/connection.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { CubejsServerCore } from '@cubejs-backend/server-core';
import { BaseDriver } from '@cubejs-backend/query-orchestrator';
import { ScaffoldingTemplate } from '@cubejs-backend/schema-compiler/dist/src/scaffolding/ScaffoldingTemplate';
import { ScaffoldingSchema } from '@cubejs-backend/schema-compiler/dist/src/scaffolding/ScaffoldingSchema';
import {
SupportedDBType,
IPGTablesDetails,
ITableListItem,
IPGTablesResult
} from 'src/types';
import { ScaffoldingTemplate } from '@cubejs-backend/schema-compiler/dist/src/scaffolding/ScaffoldingTemplate';
import { ScaffoldingSchema } from '@cubejs-backend/schema-compiler/dist/src/scaffolding/ScaffoldingSchema';
} from '../types';

const PG_TABLE_QUERY = `SELECT table_name, table_schema FROM information_schema.tables WHERE table_type='BASE TABLE' AND table_schema='public';`;
const PG_DESCRIBE_TABLE_QUERY = `SELECT table_catalog, table_name, column_name, data_type FROM information_schema.columns WHERE table_name=$1;`;
Expand Down

0 comments on commit e839742

Please sign in to comment.