Merge pull request #45 from icefoganalytics/caleb/dev

ytgov#165 - Fix dup `yHSIId` bug and allow administrators to edit `yHSIId` of a place(site)

Author: burkkyy

api/routes/place-router.ts

@@ -268,6 +268,7 @@ placeRouter.patch(
 	authorize([UserRoles.SITE_ADMIN, UserRoles.ADMINISTRATOR]),
 	[
 		param('id').isInt({ gt: 0 }),
+		body('yHSIId').isString().optional({ nullable: true }),
 		body('associations').isArray().optional({ nullable: true }),
 		body('block').isString().optional({ nullable: true }),
 		body('bordenNumber').isString().optional({ nullable: true }),
@@ -343,6 +344,16 @@ placeRouter.patch(
 			locations: ['body'],
 		});
 
+		// Should be using BaseController and loading currentUser into req here
+		const user = req.user as User;
+		if (isNil(user) || isNil(user.roles)) {
+			return res.status(401).json({ message: 'Unauthorized' });
+		}
+
+		if (!user.roles.includes(UserRoles.ADMINISTRATOR)) {
+			attributes.yHSIId = undefined;
+		}
+
 		return placeService
 			.update(id, attributes)
 			.then((data) => {

api/services/place-service.ts

@@ -1,7 +1,7 @@
 import knex, { Knex } from 'knex';
 import moment from 'moment';
-import { get, isEmpty, isNil, isNull, uniq } from 'lodash';
-import { COORDINATE_DETERMINATION_TYPES, SITE_STATUS_TYPES } from '../models';
+import { get, isEmpty, isNull, isUndefined, uniq } from 'lodash';
+import { COORDINATE_DETERMINATION_TYPES } from '../models';
 
 import {
 	AssociationService,
@@ -302,27 +302,26 @@ export class PlaceService {
 	}
 
 	async generateIdFor(nTSMapSheet: string): Promise<string> {
-		let placeIndex = 0;
-
 		const places = await this.db('place')
 			.whereILike('YHSIId', `${nTSMapSheet}/%`)
 			.select('YHSIId')
 			.orderBy('yHSIId');
 
-		for (const place of places) {
-			placeIndex++;
-
-			const testValue = `${nTSMapSheet}/${placeIndex.toString().padStart(3, '0')}`;
-
-			const isMatch = place.YHSIId == testValue;
+		// Note: The following loop runs in O(999 * n) (or O(n) where n is the number of places)
+		// If performance becomes an issue as number of places grows, consider using a Set
+		let placeIndex = 1;
+		for (; placeIndex <= 999; placeIndex++) {
+			const candidateYHSIId = `${nTSMapSheet}/${placeIndex.toString().padStart(3, '0')}`;
+			const isMatch = places.find((place) => place.YHSIId == candidateYHSIId);
 
-			if (!isMatch) {
-				break;
+			if (isUndefined(isMatch)) {
+				return `${nTSMapSheet}/${placeIndex.toString().padStart(3, '0')}`;
 			}
 		}
 
-		placeIndex++;
-		return `${nTSMapSheet}/${placeIndex.toString().padStart(3, '0')}`;
+		throw new Error(
+			`Unable to generate YHSIId: ${nTSMapSheet}/001 to ${nTSMapSheet}/999 are currently in use`
+		);
 	}
 
 	async doSearch(

web/src/components/Sites/site-forms/Summary.vue

@@ -20,8 +20,8 @@
 						outlined
 						label="YHSI ID"
 						required
-						append-icon="mdi-lock"
-						:readonly="!isEditing"
+						:append-icon="isSystemAdmin ? '' : 'mdi-lock'"
+						:readonly="!isSystemAdmin || !isEditing"
 					/>
 
 					<v-text-field
@@ -237,6 +237,7 @@ export default {
 	computed: {
 		...mapGetters({
 			place: 'places/place',
+			isSystemAdmin: 'users/isSystemAdmin',
 		}),
 		isEditing() {
 			return this.$route.path.includes('/edit');

web/src/store/users.js

@@ -1,4 +1,5 @@
 import axios from "axios";
+import { UserRoles } from '@/authorization';
 import { COMMUNITY_URL, FIRST_NATION_URL, USER_URL } from "../urls";
 
 const state = {
@@ -10,6 +11,7 @@ const getters = {
     roles: state => state.roles,
     communities: state => state.communities,
     firstNations: state => state.firstNations,
+    isSystemAdmin: state => state.roles.includes(UserRoles.ADMINISTRATOR),
 };
 const mutations = {
     setRoles(state, value) {
@@ -91,4 +93,4 @@ export default {
     getters,
     mutations,
     actions
-};
+};