-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of github.com-nossas:nossas/bonde-microservice…
…s into release/v0.2.2
- Loading branch information
Showing
22 changed files
with
3,685 additions
and
4,392 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
|
|
||
| import getSolidarityTickets from './hasura/getSolidarityTickets' | ||
| import getSolidarityUsers from './hasura/getSolidarityUsers' | ||
| import { fuseTicketsAndUsers } from './utils' | ||
|
|
||
| const main = async (req, res, next) => { | ||
|
|
||
| const allUsers = await getSolidarityUsers({ | ||
| query: `query { | ||
| solidarity_users( | ||
| where: { | ||
| longitude: {_is_null: false}, | ||
| latitude: {_is_null: false}, | ||
| organization_id: {_is_null: false} | ||
| } | ||
| ) { | ||
| address | ||
| organization_id | ||
| user_id | ||
| atendimentos_concludos_calculado_ | ||
| atendimentos_em_andamento_calculado_ | ||
| disponibilidade_de_atendimentos | ||
| latitude | ||
| longitude | ||
| encaminhamentos | ||
| encaminhamentos_realizados_calculado_ | ||
| name | ||
| phone | ||
| registration_number | ||
| occupation_area | ||
| data_de_inscricao_no_bonde | ||
| condition | ||
| tipo_de_acolhimento | ||
| } | ||
| }` | ||
| }) | ||
|
|
||
| const allTickets = await getSolidarityTickets({ | ||
| query: `query { | ||
| solidarity_tickets( | ||
| where: { | ||
| status: {_neq: "deleted"} | ||
| } | ||
| ) { | ||
| requester_id | ||
| status_inscricao | ||
| status_acolhimento | ||
| ticket_id | ||
| created_at | ||
| status | ||
| subject | ||
| } | ||
| }` | ||
| }) | ||
|
|
||
| const ticketsWithUser = fuseTicketsAndUsers(allUsers, allTickets) | ||
|
|
||
| res.json(ticketsWithUser) | ||
| } | ||
|
|
||
| export default main |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
|
|
||
| import getSolidarityUsers from './hasura/getSolidarityUsers' | ||
| import getSolidarityTickets from './hasura/getSolidarityTickets' | ||
| import { zendeskOrganizations } from './parse/index' | ||
| import { fuseTicketsAndUsers } from './utils' | ||
|
|
||
| const INDIVIDUAL = zendeskOrganizations.individual | ||
|
|
||
| const main = async (req, res, next) => { | ||
| const individualUsers = await getSolidarityUsers({ | ||
| query: `query ($individual_id: bigint!){ | ||
| solidarity_users( | ||
| where: { | ||
| longitude: {_is_null: false}, | ||
| latitude: {_is_null: false}, | ||
| organization_id: {_eq: $individual_id} | ||
| } | ||
| ) | ||
| { | ||
| organization_id | ||
| user_id | ||
| latitude | ||
| longitude | ||
| name | ||
| phone | ||
| data_de_inscricao_no_bonde | ||
| tipo_de_acolhimento | ||
| address | ||
| } | ||
| }`, | ||
| variables: { | ||
| individual_id: INDIVIDUAL | ||
| } | ||
| }) | ||
|
|
||
| const individualTickets = await getSolidarityTickets({ | ||
| query: `query { | ||
| solidarity_tickets( | ||
| where: { | ||
| _or: [ | ||
| {status: {_eq: "open"}}, | ||
| {status: {_eq: "new"}} | ||
| ], | ||
| status_acolhimento: {_eq: "solicitação_recebida"}, | ||
| status: {_neq: "deleted"} | ||
| } | ||
| ) { | ||
| status_acolhimento | ||
| status | ||
| subject | ||
| ticket_id | ||
| requester_id | ||
| created_at | ||
| } | ||
| }` | ||
| }) | ||
|
|
||
| const ticketsWithUser = fuseTicketsAndUsers(individualUsers, individualTickets) | ||
|
|
||
| res.json(ticketsWithUser) | ||
| } | ||
|
|
||
| export default main |
47 changes: 0 additions & 47 deletions
47
packages/solidarity-client/server/users/allTicketsAndUsers.ts
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.