fix: check service import in order-in-models rule

Author: bmish

lib/rules/order-in-models.js

@@ -2,6 +2,7 @@
 
 const ember = require('../utils/ember');
 const propOrder = require('../utils/property-order');
+const { getImportIdentifier } = require('../utils/import');
 
 const reportUnorderedProperties = propOrder.reportUnorderedProperties;
 const addBackwardsPosition = propOrder.addBackwardsPosition;
@@ -52,13 +53,32 @@ module.exports = {
       : ORDER;
     const filePath = context.getFilename();
 
+    let importedInjectName;
+    let importedEmberName;
+
     return {
+      ImportDeclaration(node) {
+        if (node.source.value === 'ember') {
+          importedEmberName = importedEmberName || getImportIdentifier(node, 'ember');
+        }
+        if (node.source.value === '@ember/service') {
+          importedInjectName =
+            importedInjectName || getImportIdentifier(node, '@ember/service', 'inject');
+        }
+      },
       CallExpression(node) {
         if (!ember.isDSModel(node, filePath)) {
           return;
         }
 
-        reportUnorderedProperties(node, context, 'model', order);
+        reportUnorderedProperties(
+          node,
+          context,
+          'model',
+          order,
+          importedEmberName,
+          importedInjectName
+        );
       },
     };
   },

tests/lib/rules/order-in-models.js

@@ -90,6 +90,18 @@ eslintTester.run('order-in-models', rule, {
         },
       ],
     },
+    {
+      code: `import {inject as service} from '@ember/service';
+        export default DS.Model.extend({
+          foo: service(),
+          a: attr('string'),
+          convertA(paramA) {
+          },
+          customProp: { a: 1 }
+        });`,
+      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
+      options: [{ order: ['service', 'attribute', 'method'] }],
+    },
   ],
   invalid: [
     {