fix imports for use with latest lb-next

strongloop · Jun 15, 2017 · cdb602c · cdb602c
1 parent 82ae79b
commit cdb602c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/services/accountsanjuggler/controllers/AccountController.ts b/services/accountsanjuggler/controllers/AccountController.ts
@@ -1,13 +1,12 @@
 import { api } from 'loopback-next/packages/core';
 import { def } from './AccountController.api';
-import {Model} from 'loopback-next/packages/juggler/src/model';
 import { AccountRepository } from '../repositories/account';
 import { Account } from '../repositories/account/models/Account';
-import { repository } from "loopback-next/packages/juggler/src/decorator";
-import { Filter, Order } from "loopback-next/packages/juggler/src/query";
+import { repository } from "loopback-next/packages/repository/src/decorators/repository";
+import { Filter, Order } from "loopback-next/packages/repository/src/query";
 
 @api(def)
-@repository('AccountRepository')
+//@repository('AccountRepository')
 export class AccountController {
   repository: AccountRepository;
 

diff --git a/services/accountsanjuggler/index.ts b/services/accountsanjuggler/index.ts
@@ -14,7 +14,7 @@ class AccountMicroservice extends Application {
 
   async start() {
     this._startTime = new Date();
-    const server = new Server({ port: 3001 });
+    const server = new Server(this, { port: 3001 });
     server.bind('applications.accounts').to(this);
     return server.start();
   }

diff --git a/services/accountsanjuggler/repositories/account/index.ts b/services/accountsanjuggler/repositories/account/index.ts
@@ -1,12 +1,10 @@
-import {Class, ObjectType, AnyObject, Options} from 'loopback-next/packages/juggler/src/common';
-import {Model} from 'loopback-next/packages/juggler/src/model';
-import {Filter, Where, Operators, Condition, Order, Inclusion} from 'loopback-next/packages/juggler/src/query';
-import {EntityCrudRepository, CrudRepository} from 'loopback-next/packages/juggler/src/repository';
+import {Class, ObjectType, AnyObject, Options} from 'loopback-next/packages/repository/src/common-types';
+import {Filter, Where, Operators, Condition, Order, Inclusion} from 'loopback-next/packages/repository/src/query';
+import {EntityCrudRepository, CrudRepository} from 'loopback-next/packages/repository/src/repository';
 import {Account} from './models/Account';
 const modelDefinition = require('./models/account/model-definition');
 const mysqlDriver = require('mysql');
 let conn = mysqlDriver.createConnection(require('./datasources/mysql.json'));
-let _ = require('lodash');
 
 export class AccountRepository implements EntityCrudRepository<Account, string> {
 
@@ -59,7 +57,7 @@ export class AccountRepository implements EntityCrudRepository<Account, string>
     return new Promise<Account>(function(resolve, reject) {
               conn.query(sqlStmt, function(err, count, fields) {
                   if (err !== null) return reject(err);
-                  resolve({"count": count} as Account);
+                  resolve(count.affectedRows);
               });
           });
   }
@@ -88,7 +86,6 @@ export class AccountRepository implements EntityCrudRepository<Account, string>
     throw new Error("Method not implemented.");
   }
   find(filter?: Filter, options?: AnyObject): Promise<Account[]> {
-    //console.log ('model inside find ', this.model);
     let sqlStmt = 'SELECT * FROM ' + Account.name;
     if(filter.where) {
       let sql = '?? = ?';

diff --git a/services/accountsanjuggler/repositories/account/models/Account.ts b/services/accountsanjuggler/repositories/account/models/Account.ts
@@ -1,5 +1,5 @@
-import {model} from 'loopback-next/packages/juggler/src/decorator';
-import {Entity, ModelProperty} from 'loopback-next/packages/juggler/src/model';
+import {model} from 'loopback-next/packages/repository/src/decorators/model';
+import {Entity} from 'loopback-next/packages/repository/src/model';
 
 @model(require('./account/model-definition'))
 export class Account extends Entity {