code cleanup

Author: SteRiccio

src/api/userGroup/common.ts

@@ -0,0 +1,13 @@
+import { ServiceRegistry, ServiceType, SurveyService } from '@openforis/arena-core'
+
+import { ServerServiceType } from '../../server/arenaServer/serverServiceType'
+import { UserGroupService } from '../../service'
+
+export const getUserGroupService = (): UserGroupService =>
+  ServiceRegistry.getInstance().getService(ServerServiceType.userGroup) as UserGroupService
+
+export const getSurveyUuid = async (surveyId: number): Promise<string> => {
+  const surveyService = ServiceRegistry.getInstance().getService(ServiceType.survey) as SurveyService
+  const survey = await surveyService.get({ surveyId })
+  return survey.uuid
+}

src/api/userGroup/create.ts

@@ -1,26 +1,14 @@
 import { Express } from 'express'
 
-import { ServiceRegistry, ServiceType, SurveyService } from '@openforis/arena-core'
-
 import { ExpressInitializer } from '../../server'
-import { ServerServiceType } from '../../server/arenaServer/serverServiceType'
-import { UserGroupService } from '../../service'
 import { Requests } from '../../utils'
 
 import { ApiEndpoint } from '../endpoint'
 import { ApiAuthMiddleware } from '../middleware'
+import { getSurveyUuid, getUserGroupService } from './common'
 
 const { requireUserGroupManagePermission } = ApiAuthMiddleware
 
-const getUserGroupService = (): UserGroupService =>
-  ServiceRegistry.getInstance().getService(ServerServiceType.userGroup) as UserGroupService
-
-const getSurveyUuid = async (surveyId: number): Promise<string> => {
-  const surveyService = ServiceRegistry.getInstance().getService(ServiceType.survey) as SurveyService
-  const survey = await surveyService.get({ surveyId })
-  return survey.uuid
-}
-
 export const UserGroupCreate: ExpressInitializer = {
   init: (express: Express): void => {
     express.post(

src/api/userGroup/delete.ts

@@ -1,20 +1,14 @@
 import { Express } from 'express'
 
-import { ServiceRegistry } from '@openforis/arena-core'
-
 import { ExpressInitializer } from '../../server'
-import { ServerServiceType } from '../../server/arenaServer/serverServiceType'
-import { UserGroupService } from '../../service'
 import { Requests } from '../../utils'
 
 import { ApiEndpoint } from '../endpoint'
 import { ApiAuthMiddleware } from '../middleware'
+import { getUserGroupService } from './common'
 
 const { requireUserGroupManagePermission } = ApiAuthMiddleware
 
-const getUserGroupService = (): UserGroupService =>
-  ServiceRegistry.getInstance().getService(ServerServiceType.userGroup) as UserGroupService
-
 export const UserGroupDelete: ExpressInitializer = {
   init: (express: Express): void => {
     express.delete(

src/api/userGroup/read.ts

@@ -1,26 +1,14 @@
 import { Express } from 'express'
 
-import { ServiceRegistry, ServiceType, SurveyService } from '@openforis/arena-core'
-
 import { ExpressInitializer } from '../../server'
-import { ServerServiceType } from '../../server/arenaServer/serverServiceType'
-import { UserGroupService } from '../../service'
 import { Requests } from '../../utils'
 
 import { ApiEndpoint } from '../endpoint'
 import { ApiAuthMiddleware } from '../middleware'
+import { getSurveyUuid, getUserGroupService } from './common'
 
 const { requireSurveyViewPermission } = ApiAuthMiddleware
 
-const getUserGroupService = (): UserGroupService =>
-  ServiceRegistry.getInstance().getService(ServerServiceType.userGroup) as UserGroupService
-
-const getSurveyUuid = async (surveyId: number): Promise<string> => {
-  const surveyService = ServiceRegistry.getInstance().getService(ServiceType.survey) as SurveyService
-  const survey = await surveyService.get({ surveyId })
-  return survey.uuid
-}
-
 export const UserGroupRead: ExpressInitializer = {
   init: (express: Express): void => {
     express.get(

src/api/userGroup/update.ts

@@ -1,20 +1,14 @@
 import { Express } from 'express'
 
-import { ServiceRegistry } from '@openforis/arena-core'
-
 import { ExpressInitializer } from '../../server'
-import { ServerServiceType } from '../../server/arenaServer/serverServiceType'
-import { UserGroupService } from '../../service'
 import { Requests } from '../../utils'
 
 import { ApiEndpoint } from '../endpoint'
 import { ApiAuthMiddleware } from '../middleware'
+import { getUserGroupService } from './common'
 
 const { requireUserGroupManagePermission } = ApiAuthMiddleware
 
-const getUserGroupService = (): UserGroupService =>
-  ServiceRegistry.getInstance().getService(ServerServiceType.userGroup) as UserGroupService
-
 export const UserGroupUpdate: ExpressInitializer = {
   init: (express: Express): void => {
     express.put(