Feat(crisalid) add structure

src/analytics/location.analytic.ts

@@ -1,15 +1,11 @@
 import analytics from '@/analytics/index'
-import { LocationType } from '@/models/types'
+import { ProjectLocationForm } from '@/models/location.model'
 
 export interface LocationAnalytic {
   project: {
     id: string
   }
-  location: {
-    lat: number
-    lng: number
-    type: LocationType
-  }
+  location: ProjectLocationForm
 }
 
 export default {

src/api/crisalid.service.ts

@@ -0,0 +1,66 @@
+import {
+  Document,
+  DocumentType,
+  Researcher,
+  ResearcherDocumentAnalytics,
+} from '@/interfaces/researcher'
+import { PeopleGroupModel } from '@/models/invitation.model'
+
+export async function getOwnResearchDocument(
+  organisationCode: string,
+  researchId: Researcher['id'],
+  documentType: DocumentType,
+  config = {}
+) {
+  return await useAPI<PaginationResult<Document>>(
+    `crisalid/organization/${organisationCode}/researcher/${researchId}/${documentType}/`,
+    config
+  )
+}
+
+export async function getGroupResearchDocument(
+  organisationCode: string,
+  groupId: PeopleGroupModel['id'],
+  documentType: DocumentType,
+  config = {}
+) {
+  return await useAPI<PaginationResult<Document>>(
+    `crisalid/organization/${organisationCode}/people-group/${groupId}/${documentType}/`,
+    config
+  )
+}
+
+export async function getOwnResearchDocumentAnalytics(
+  organisationCode: string,
+  researchId: Researcher['id'],
+  documentType: DocumentType,
+  config = {}
+) {
+  return await useAPI<ResearcherDocumentAnalytics>(
+    `crisalid/organization/${organisationCode}/researcher/${researchId}/${documentType}/analytics/`,
+    config
+  )
+}
+
+export async function getGroupResearchDocumentAnalytics(
+  organisationCode: string,
+  groupId: PeopleGroupModel['id'],
+  documentType: DocumentType,
+  config = {}
+) {
+  return await useAPI<ResearcherDocumentAnalytics>(
+    `crisalid/organization/${organisationCode}/people-group/${groupId}/${documentType}/analytics/`,
+    config
+  )
+}
+
+export async function getResearchDocumentSimilars(
+  organisationCode: string,
+  documentId: Document['id'],
+  config = {}
+) {
+  return await useAPI<PaginationResult<Document>>(
+    `crisalid/organization/${organisationCode}/document/${documentId}/similars/`,
+    config
+  )
+}

src/api/follows.service.ts

@@ -1,6 +1,7 @@
 import type {
   AddManyFollowedProject,
   FollowInput,
+  FollowProjectOutput,
   // FollowOutput,
   // FollowOutputList,
 } from '@/models/follow.model'
@@ -16,7 +17,10 @@ export async function getUserFollows(body: FollowInput, params) {
 }
 
 export async function postFollow(follow: FollowInput) {
-  return await useAPI(`project/${follow.project_id}/follow/`, { body: follow, method: 'POST' })
+  return await useAPI<FollowProjectOutput>(`project/${follow.project_id}/follow/`, {
+    body: follow,
+    method: 'POST',
+  })
   //.data.value
 }
 

src/api/groups.service.ts

@@ -1,112 +1,121 @@
 import type {
-  // GroupModel,
-  // GroupOuput,
   PostGroupData,
   AddGroupMembers,
   RemoveGroupMember,
   PostGroupProjects,
   AddParentGroupModelInput,
+  GroupMember,
+  HierarchyGroupModel,
 } from '@/models/group.model'
-// import type { HierarchyGroupModel } from '@/models/group.model'
-// import type { APIResponseList } from '@/api/types'
 import { _adaptParamsToGetQuery } from '@/api/utils.service'
 import useAPI from '@/composables/useAPI'
+import { ProjectModel } from '@/models/project.model'
+import { PeopleGroupModel } from '@/models/invitation.model'
+import { LocationModel } from '@/models/location.model'
+import { ImageModel } from '@/models/image.model'
 
 // HIERARCHY
-
-export async function getHierarchyGroups(org: string) {
-  return await useAPI(`organization/${org}/people-groups-hierarchy/`, {}) //.data.value
+export async function getHierarchyGroups(organizationCode: string, config = {}) {
+  return await useAPI<PaginationResult<HierarchyGroupModel>>(
+    `organization/${organizationCode}/people-groups-hierarchy/`,
+    config
+  )
 }
 
 export async function getPeopleGroupsHierarchy(org_code, params) {
   return await useAPI(`organization/${org_code}/people-groups-hierarchy/`, {
     ..._adaptParamsToGetQuery(params),
-  }) //.data.value
+  })
 }
 
 export async function getGroups(org_id) {
-  return await useAPI(`organization/${org_id}/people-group/`, {}) //.data.value
+  return await useAPI(`organization/${org_id}/people-group/`, {})
 }
 
 // ALL GROUPS
 
 export async function getPeopleGroups(org_code, params) {
   return await useAPI(`organization/${org_code}/people-group/`, {
     ..._adaptParamsToGetQuery(params),
-  }) //.data.value
+  })
 }
 
 export async function postGroup(org: string, groupData: PostGroupData) {
   return await useAPI(`organization/${org}/people-group/`, { body: groupData, method: 'POST' })
-  //.data.value
 }
 
 // GROUP
 
 export async function addParentGroup(
   orgId: string,
-  groupId: string,
+  groupId: number,
   body: AddParentGroupModelInput
 ) {
-  return await useAPI(`organization/${orgId}/people-group/${groupId}/`, { body, method: 'PATCH' }) //.data.value
+  return await useAPI(`organization/${orgId}/people-group/${groupId}/`, { body, method: 'PATCH' })
 }
 
-export async function getGroup(org: string, groupId: string, noError: boolean = false) {
-  return await useAPI(
-    `/organization/${org}/people-group/${groupId}/`,
-    { noError: noError } // TODO nuxt check error silenced
-  ) //.data.value
+export function getGroup(organizationCode: string, groupId: number, config = {}) {
+  return useAPI<PeopleGroupModel>(
+    `organization/${organizationCode}/people-group/${groupId}/`,
+    config
+  )
 }
 
-export async function patchGroup(org: string, group_id: number, groupData: Partial<PostGroupData>) {
-  return await useAPI(`organization/${org}/people-group/${group_id}/`, {
+export async function patchGroup(
+  organizationCode: string,
+  groupName: number,
+  groupData: Partial<PostGroupData>
+) {
+  return await useAPI(`organization/${organizationCode}/people-group/${groupName}/`, {
     body: groupData,
     method: 'PATCH',
-  }) //.data.value
+  })
 }
 
-export async function deleteGroup(org_code, group_id) {
-  return await useAPI(`organization/${org_code}/people-group/${group_id}/`, { method: 'DELETE' }) //.data.value
+export async function deleteGroup(organizationCode: string, groupName: string) {
+  return await useAPI(`organization/${organizationCode}/people-group/${groupName}/`, {
+    method: 'DELETE',
+  })
 }
 
 // GROUP MEMBERS
 
-export async function getGroupMember(org: string, groupId: string, noError: boolean = false) {
-  return (
-    // TODO nuxt check error silenced
-    await useAPI(`organization/${org}/people-group/${groupId}/member/`, { noError: noError })
-    //.data.value
+export async function getGroupMember(organizationCode: string, groupId: number, config = {}) {
+  return await useAPI<PaginationResult<GroupMember>>(
+    `organization/${organizationCode}/people-group/${groupId}/member/`,
+    config
   )
 }
 
 export async function postGroupMembers(
-  org: string,
-  group_id: number,
+  organizationCode: string,
+  groupId: number,
   membersData: AddGroupMembers
 ) {
-  return await useAPI(`organization/${org}/people-group/${group_id}/member/add/`, {
+  return await useAPI(`organization/${organizationCode}/people-group/${groupId}/member/add/`, {
     body: membersData,
     method: 'POST',
-  }) //.data.value
+  })
 }
 
 export async function removeGroupMember(
-  org: string,
-  group_id: number,
+  organizationCode: string,
+  groupId: number,
   membersData: RemoveGroupMember
 ) {
-  return await useAPI(`organization/${org}/people-group/${group_id}/member/remove/`, {
+  return await useAPI(`organization/${organizationCode}/people-group/${groupId}/member/remove/`, {
     body: membersData,
     method: 'POST',
-  }) //.data.value
+  })
 }
 
 // GROUP PROJECTS
 
-export async function getGroupProject(org: string, groupId: string, noError: boolean = false) {
-  return await useAPI(`organization/${org}/people-group/${groupId}/project/`, {
-    noError: noError,
-  }) //.data.value
+export async function getGroupProject(organizationCode: string, groupId: number, config = {}) {
+  return await useAPI<PaginationResult<ProjectModel>>(
+    `organization/${organizationCode}/people-group/${groupId}/project/`,
+    config
+  )
 }
 
 export async function postGroupProjects(
@@ -117,14 +126,18 @@ export async function postGroupProjects(
   return await useAPI(`organization/${org}/people-group/${group_id}/project/add/`, {
     body: projectsData,
     method: 'POST',
-  }) //.data.value
+  })
 }
 
-export async function removeGroupProject(org: string, group_id: number, projectsData: any) {
+export async function removeGroupProject(
+  org: string,
+  group_id: number,
+  projectsData: PostGroupProjects
+) {
   return await useAPI(`organization/${org}/people-group/${group_id}/project/remove/`, {
     body: projectsData,
     method: 'POST',
-  }) //.data.value
+  })
 }
 
 // GROUP HEADER
@@ -133,12 +146,70 @@ export async function postGroupHeader(org: string, group_id: number, headerData:
   return await useAPI(`organization/${org}/people-group/${group_id}/header/`, {
     body: headerData,
     method: 'POST',
-  }) //.data.value
+  })
 }
 
 export async function patchGroupHeader(org: string, group_id: number, headerData: FormData) {
   return await useAPI(`organization/${org}/people-group/${group_id}/header/`, {
     body: headerData,
     method: 'PATCH',
-  }) //.data.value
+  })
+}
+
+export async function getGroupSimilar(organizationCode: string, groupId: number, config = {}) {
+  return await useAPI<PaginationResult<PeopleGroupModel>>(
+    `organization/${organizationCode}/people-group/${groupId}/similars/`,
+    config
+  )
+}
+
+export async function getSubGroup(organizationCode: string, groupId: number, config = {}) {
+  return await useAPI<PaginationResult<PeopleGroupModel>>(
+    `organization/${organizationCode}/people-group/${groupId}/subgroups/`,
+    config
+  )
+}
+
+export async function getGroupLocation(organizationCode: string, groupId: number, config = {}) {
+  return await useAPI<PaginationResult<LocationModel>>(
+    `organization/${organizationCode}/people-group/${groupId}/locations/`,
+    config
+  )
+}
+
+export function getGroupGallery(organizationCode: string, groupId: number, config = {}) {
+  return useAPI<PaginationResult<ImageModel>>(
+    `organization/${organizationCode}/people-group/${groupId}/gallery/`,
+    {
+      ...config,
+    }
+  )
+}
+
+export function deleteGroupGallery(
+  organizationCode: string,
+  groupId: number,
+  imageId: number,
+  config = {}
+) {
+  return useAPI<ImageModel>(
+    `organization/${organizationCode}/people-group/${groupId}/gallery/${imageId}/`,
+    {
+      ...config,
+      method: 'DELETE',
+    }
+  )
+}
+
+export function postGroupGallery(
+  organizationCode: string,
+  groupId: number,
+  body: FormData,
+  config = {}
+) {
+  return useAPI<ImageModel>(`organization/${organizationCode}/people-group/${groupId}/gallery/`, {
+    ...config,
+    body,
+    method: 'POST',
+  })
 }

src/api/locations.services.ts

@@ -1,6 +1,5 @@
 import type { LocationModel, ProjectLocationForm } from '@/models/location.model'
 import useAPI from '@/composables/useAPI'
-import utils from '@/functs/functions'
 import { Locations } from '@/interfaces/maps'
 
 export async function getProjectLocations(projectId: number) {
@@ -11,13 +10,8 @@ export async function getProjectLocation(projectId: string, locationId: number)
   return await useAPI<LocationModel>(`project/${projectId}/location/${locationId}/`)
 }
 
-export async function getLocations(params, next) {
-  if (next) {
-    // TODO: nuxt check next works
-    return await useAPI<Locations>(next, {}) //.data.value
-  }
-
-  return await useAPI<Locations>(`location/`, { ...utils.adaptParam(params) }) //.data.value
+export async function getLocations(organizationCode: string, config = {}) {
+  return await useAPI<Locations>(`organization/${organizationCode}/location/`, config)
 }
 
 export async function postLocations(projectId: string, body: ProjectLocationForm) {