Skip to content

Commit 8581fa3

Browse files
authored
NRPT-156: Add collection model, change mine -> minebcmi (#462)
* NRPT-156: Add collection model, change mine -> minebcmi * Fix for linting errors. * BCMICollection -> CollectionBCMI
1 parent b188360 commit 8581fa3

File tree

20 files changed

+94
-105
lines changed

20 files changed

+94
-105
lines changed

angular/projects/admin-nrpti/src/app/mines/mines-list-resolver.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ describe('MinesListResolver', () => {
7474
});
7575

7676
it('calls factoryService.getRecords', () => {
77-
expect(factoryServiceSpy.getRecords).toHaveBeenCalledWith('', ['Mine'], [], 1, 25, '+name', {}, false, {}, []);
77+
expect(factoryServiceSpy.getRecords)
78+
.toHaveBeenCalledWith('', ['MineBCMI'], [], 1, 25, '+name', {}, false, {}, []);
7879
});
7980
});
8081
});

angular/projects/admin-nrpti/src/app/mines/mines-list-resolver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export class MinesListResolver implements Resolve<Observable<object>> {
1818

1919
return this.factoryService.getRecords(
2020
keywords,
21-
['Mine'],
21+
['MineBCMI'],
2222
[],
2323
tableObject.currentPage,
2424
tableObject.pageSize,

angular/projects/admin-nrpti/src/app/mines/mines-resolver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ export class MinesResolver implements Resolve<Observable<SearchResults[]>> {
1010

1111
resolve(route: ActivatedRouteSnapshot): Observable<SearchResults[]> {
1212
const mineId = route.paramMap.get('mineId');
13-
return this.factoryService.getRecord(mineId, 'Mine');
13+
return this.factoryService.getRecord(mineId, 'MineBCMI');
1414
}
1515
}

angular/projects/admin-nrpti/src/app/mines/mines-rows/mines-table-row.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ export class MinesTableRowComponent extends TableRowComponent implements OnInit
3131
}
3232

3333
@HostListener('click') onItemClicked() {
34-
if (this.rowData._schemaName === 'Mine') {
34+
if (this.rowData._schemaName === 'MineBCMI') {
3535
this.router.navigate(['mines', this.rowData._id, 'detail']);
3636
}
3737
}
3838

3939
edit(event: Event) {
4040
event.stopPropagation();
4141

42-
if (this.rowData._schemaName === 'Mine') {
42+
if (this.rowData._schemaName === 'MineBCMI') {
4343
this.router.navigate(['mines', this.rowData._id, 'edit']);
4444
}
4545
}

angular/projects/common/src/app/models/bcmi/mine.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export class Mine {
5555

5656
constructor(obj?: any) {
5757
this._id = (obj && obj._id) || null;
58-
this._schemaName = (obj && obj._schemaName) || 'Mine';
58+
this._schemaName = (obj && obj._schemaName) || 'MineBCMI';
5959
this._sourceRefId = (obj && obj._sourceRefId) || '';
6060
this.read = (obj && obj.read) || null;
6161
this.write = (obj && obj.write) || null;

api/migrations/20200603153526-bcmiDataLoad.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ exports._meta = {
8181
};
8282

8383
async function updateMine(mineData, nrpti) {
84-
let nrptiMines = await nrpti.find({ _schemaName: 'Mine', name: mineData.name}).toArray();
84+
let nrptiMines = await nrpti.find({ _schemaName: 'MineBCMI', name: mineData.name}).toArray();
8585
// should have 1 result returned. Any more or less, just ignore this update
8686
if (nrptiMines.length === 1) {
8787
let externalLinks = [];

api/src/controllers/post/mine.js renamed to api/src/controllers/post/mine-bcmi.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ exports.createRecord = async function (args, res, next, incomingObj) {
2929
* @returns created master Mine record
3030
*/
3131
exports.createMaster = function (args, res, next, incomingObj, flavourIds) {
32-
let Mine = mongoose.model('Mine');
33-
let mine = new Mine();
32+
let MineBCMI = mongoose.model('MineBCMI');
33+
let mine = new MineBCMI();
3434

35-
mine._schemaName = 'Mine';
35+
mine._schemaName = 'MineBCMI';
3636

3737
// set permissions
3838
mine.read = ROLES.ADMIN_ROLES;

api/src/controllers/put/mine.js renamed to api/src/controllers/put/mine-bcmi.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const mongoose = require('mongoose');
2-
const MinePost = require('../post/mine');
2+
const MinePost = require('../post/mine-bcmi');
33
const PutUtils = require('../../utils/put-utils');
44
const RECORD_TYPE = require('../../utils/constants/record-type-enum');
55

@@ -20,7 +20,7 @@ exports.editRecord = async function(args, res, next, incomingObj) {
2020
incomingObj,
2121
this.editMaster,
2222
MinePost,
23-
RECORD_TYPE.Mine._schemaName,
23+
RECORD_TYPE.MineBCMI._schemaName,
2424
{}
2525
);
2626
};
@@ -42,9 +42,9 @@ exports.editMaster = function(args, res, next, incomingObj) {
4242
delete incomingObj.read;
4343
delete incomingObj.write;
4444

45-
const Mine = mongoose.model(RECORD_TYPE.Mine._schemaName);
45+
const MineBCMI = mongoose.model(RECORD_TYPE.MineBCMI._schemaName);
4646

47-
const sanitizedObj = PutUtils.validateObjectAgainstModel(Mine, incomingObj);
47+
const sanitizedObj = PutUtils.validateObjectAgainstModel(MineBCMI, incomingObj);
4848

4949
if (!sanitizedObj || sanitizedObj === {}) {
5050
// skip, as there are no changes to master record

api/src/controllers/record-controller.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ let AddConstructionPlan = require('./post/construction-plan');
1919
let AddManagementPlan = require('./post/management-plan');
2020
let AddCourtConviction = require('./post/court-conviction');
2121
let AddNewsItem = require('./post/news-item');
22-
let AddMine = require('./post/mine');
22+
let AddMine = require('./post/mine-bcmi');
2323

2424
let EditOrder = require('./put/order');
2525
let EditInspection = require('./put/inspection');
@@ -36,7 +36,7 @@ let EditConstructionPlan = require('./put/construction-plan');
3636
let EditManagementPlan = require('./put/management-plan');
3737
let EditCourtConviction = require('./put/court-conviction');
3838
let EditNewsItem = require('./put/news-item');
39-
let EditMine = require('./put/mine');
39+
let EditMine = require('./put/mine-bcmi');
4040

4141
// let allowedFields = ['_createdBy', 'createdDate', 'description', 'publishDate', 'type'];
4242

api/src/controllers/search.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ let searchCollection = async function (
208208
if (keywords) {
209209
// for now, limit fuzzy search to the mine search only. We can expand to all searches
210210
// later if desired
211-
if (schemaName === 'Mine') {
211+
if (schemaName === 'MineBCMI') {
212212
keywords = keywords && keywords.length > 1 ? fuzzySearch.createFuzzySearchString(keywords, 4, caseSensitive) : keywords;
213213
}
214214
searchProperties = { $text: { $search: keywords, $caseSensitive: caseSensitive } };

0 commit comments

Comments
 (0)