+erxes is a free and open fair-code licensed all-in-one growth marketing & management software. We offer an all-in-one solution for sales, marketing, and customer service teams, with a focus on the entire customer experience. Replace Hubspot with the mission and community-driven ecosystem. +Live demo | Join our community + +  [](https://coveralls.io/github/erxes/erxes-widgets-api?branch=master) [](https://snyk.io/test/github/erxes/erxes-api) -## Running the server +
+
+## Features
+
+
+
+erxes helps you attract and engage more customers while giving you high lead conversion. With erxes, all your marketing, sales and customer service tools are merged into one platform for greater output.
-#### 1. Node (version >= 4) and NPM need to be installed.
+* **Growth Hacking:** Managing your entire growth operation made easy. From ideas to actual performance, making sure everything recorded, prioritized and centralized in the single platform to get tested with pool of analysis and learnings, which made the growing as pleasure.
+* **Email & SMS Marketing:** Reach your customer with personalized messaging. Keeping your customers hooked is definitely a challenge. Start converting your prospects into potential customers through email, SMS, Live chat, and In-app-messaging or more interactions to drive them to a successful close. You can connect to your customers in a whole new way with Erxes!
+* **Pop-ups & Forms:** Create Stylish Pop-ups and Forms that Bring Leads. Turn regular visitors into qualified leads by capturing them with a customizable pop-ups, forms, and embedded placements. Erxes helps you to create stylish and contextual pop-ups, banners and bars fit all your marketing needs.
+* **Sales Pipeline:** Track your entire sales pipeline from one dashboard. All your customer information and sales process in one board to follow up flawlessly. Have your sales managers to know everything needed to deliver increased levels of personalization before they contact customers.
+* **Contact Management:** Manage Visitors, Customers, and Companies. Access our all-in-one CRM system in one go so that it’s easier to coordinate and manage your contacts and interactions with your customers. Erxes Contacts provides whole segmentation tools for you to work more effiecently.
+* **Lead Scoring:** Identify and Target Sales-Ready Leads.
+* **Shared Team Inbox:** Communicate faster and easier with your customers via one truly omnichannel platform. Combine real-time client and team communication with in-app messaging, live chat, email and form, so your customers can reach you however and wherever they want.
+* **Messenger:** Talk to Your Customers in Continuous Omnichannel Conversations. Enable businesses to capture every single customer feedback and communicate in real time. You can educate your customers through knowledge-base from the erxes Messenger.
+* **Knowledge base:** Create Help Articles for Customer Self-service. Educate both your customers and staff by creating a help center related to your brands, products and services to reach higher level of satisfactions.
+* **Task Management:** Work More Collaboratively and Get More Done. Save time, manage your projects, monitor your team and increase your productivity in just a few clicks. Erxes helps to turn chaos into clarity and make everything perfect.
+## Documentation
+ * Install erxes + * erxes documentation
+ * Contributing to erxes
-Make sure your MongoDB and Redis server is running. +## Deployment -#### 2. Clone and install dependencies. +### Ubuntu 16.04/18.04 LTS +Follow these deployment instructions. -```Shell -git clone https://github.com/erxes/erxes-api.git -cd erxes-api -yarn install -``` +[](https://docs.erxes.io/installation/ubuntu) -#### 3. Create configuration from sample file. We use [dotenv](https://github.com/motdotla/dotenv) for this. +### Debian 10 +Follow these deployment instructions. -```Shell -cp .env.sample .env -``` +[](https://docs.erxes.io/installation/debian10) -.env file description +### CentOS 8 +Follow these deployment instructions. -```.env -NODE_ENV=development (Node environment: development | production) -PORT=3300 (Server port) +[](https://docs.erxes.io/installation/centos8) -MONGO_URL=mongodb://localhost/erxes (MongoDB url) -TEST_MONGO_URL=mongodb://localhost/test +### Docker +Follow these deployment instructions. -REDIS_HOST=localhost (Redis server url) -REDIS_PORT=6379 (Redis server port) +[](https://docs.erxes.io/installation/docker) -MAIN_APP_DOMAIN=http://localhost:3000 (erxes project url) -DOMAIN='http://localhost:3300' (erxes-api project url) -``` +### Heroku +Host your own erxes server with One-Click Deploy. -#### 4. Start the server. +[](https://heroku.com/deploy?template=https://github.com/erxes/erxes/tree/develop) -For development: +### AWS Marketplace +Launch an EC2 instance using erxes in the AWS Marketplace. -```Shell -yarn dev -``` +[](https://aws.amazon.com/marketplace/pp/B086MZ9FVS/) -For production: +### DigitalOcean Droplet +Deploy to a DigitalOcean droplet with our one-click install listing from the DigitalOcean Marketplace. -```Shell -yarn build -yarn start -``` +[](https://marketplace.digitalocean.com/apps/erxes) -#### 5. Running servers -- GraphQL server: [http://localhost:3300/graphql](http://localhost:3300/graphql) -- Websocket subscriptions server: [ws://localhost:3300/subscriptions](ws://localhost:3300/subscriptions) ## Contributors @@ -77,7 +85,6 @@ Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com
-
## Sponsors
Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/erxes#sponsor)]
@@ -87,11 +94,8 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
-
-
-
## In-kind sponsors
@@ -101,5 +105,12 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
-## Copyright & License
-Copyright (c) 2018 erxes Inc - Released under the [MIT license.](https://github.com/erxes/erxes/blob/develop/LICENSE.md)
+## Which license does erxes use?
+erxes is a free and open fair-code licensed under GNU General Public License v3.0 with Commons Clause.
+
+## Is erxes open-source?
+No. The Commons Clause that is attached to the GNU General Public License v3.0 license takes away some rights. Hence, according to the definition of the Open Source Initiative (OSI), erxes is not open-source. Nonetheless, the source code is open and everyone (individuals and companies) can use it for free. However, it is not allowed to make money directly with erxes.
+For instance, one cannot charge others to host or support erxes. However, to make things simpler, we grant everyone (individuals and companies) the right to offer consulting or support without prior permission as long as it is less than 30,000 USD ($30k) per annum. If your revenue from services based on erxes is greater than $30k per annum, we'd invite you to become a partner agency and apply for a license. If you have any questions about this, feel free to reach out to us at info@erxes.io
+
+## Why is erxes not open-source but fair-code licensed instead?
+We love open-source and the idea that everybody can freely use and extend what we wrote. Our community is at the heart of everything that we do and we understand that people who contribute to a project are the main drivers that push a project forward. So to make sure that the project continues to evolve and stay alive in the longer run, we decided to attach the Commons Clause. This ensures that no other person or company can make money directly with erxes. Especially if it competes with how we plan to finance our further development. For the greater majority of the people, it will not make any difference at all. At the same time, it protects the project. As erxes itself depends on and uses a lot of other open-source projects, it is only fair that we support them back. That is why we have planned to contribute a certain percentage of revenue/profit every month to these projects.
diff --git a/Dockerfile b/api.Dockerfile
similarity index 84%
rename from Dockerfile
rename to api.Dockerfile
index 15bc787f8..49467c98f 100644
--- a/Dockerfile
+++ b/api.Dockerfile
@@ -1,4 +1,5 @@
-FROM erxes/runner:latest
+ARG BASE_IMAGE
+FROM $BASE_IMAGE
WORKDIR /erxes-api/
RUN chown -R node:node /erxes-api
COPY --chown=node:node . /erxes-api
diff --git a/api.Dockerfile.dockerignore b/api.Dockerfile.dockerignore
new file mode 100644
index 000000000..725160722
--- /dev/null
+++ b/api.Dockerfile.dockerignore
@@ -0,0 +1,17 @@
+*.md
+*.yml
+*.yaml
+.env*
+.git*
+.prettierrc
+.snyk
+Dockerfile*
+google_cred.json.sample
+scripts
+*.tar.gz
+automations
+elkSyncer
+email-verifier
+logger
+engages-email-sender
+dashboard
diff --git a/app.json b/app.json
new file mode 100644
index 000000000..391328bd4
--- /dev/null
+++ b/app.json
@@ -0,0 +1,92 @@
+{
+ "name": "Erxes API on Heroku",
+ "description": "GraphQL API for erxes main project",
+ "keywords": [
+ "Marketing",
+ "sales",
+ "customer engagement",
+ "customer support",
+ "CRM",
+ "node",
+ "express",
+ "graphql",
+ "apollo"
+ ],
+ "website": "https://erxes.io",
+ "repository": "https://github.com/batnasan/erxes-api",
+ "logo": "https://raw.githubusercontent.com/erxes/erxes/master/ui/public/images/logo-dark.png",
+ "success_url": "/",
+ "env": {
+ "PORT": {
+ "description": "A port number that erxes api will be running on",
+ "value": "3300"
+ },
+ "PORT_CRONS": {
+ "description": "A port number that erxes api crons will be running on",
+ "value": "3600"
+ },
+ "PORT_WORKERS": {
+ "description": "A port number that erxes api workers will be running on",
+ "value": "3700"
+ },
+ "MAIN_APP_DOMAIN": {
+ "description": "Erxes URL",
+ "value": "https://erxes.herokuapp.com"
+ },
+ "MONGO_URL": {
+ "description": "MONGO_URL",
+ "value": "MONGO_URL"
+ },
+ "REDIS_HOST": {
+ "description": "REDIS_HOST",
+ "value": "REDIS_HOST"
+ },
+ "REDIS_PORT": {
+ "description": "REDIS_PORT",
+ "value": "28229"
+ },
+ "REDIS_PASSWORD": {
+ "description": "REDIS_PASSWORD",
+ "value": "REDIS_PASSWORD"
+ },
+ "RABBITMQ_HOST": {
+ "description": "RABBITMQ_HOST",
+ "value": "amqp://localhost"
+ },
+ "JWT_TOKEN_SECRET": {
+ "description": "JWT TOKEN SECRET",
+ "value": "replace it with your token"
+ },
+ "LOGS_API_DOMAIN": {
+ "description": "LOGS_API_DOMAIN",
+ "value": "https://LOGS_API_DOMAIN.herokuapp.com"
+ },
+ "INTEGRATIONS_API_DOMAIN": {
+ "description": "INTEGRATIONS_API_DOMAIN",
+ "value": "https://INTEGRATIONS_API_DOMAIN.herokuapp.com"
+ }
+ },
+ "addons": [
+ {
+ "plan": "mongolab:sandbox",
+ "as": "MONGO"
+ },
+ {
+ "plan": "heroku-redis:hobby-dev",
+ "as": "REDIS"
+ },
+ {
+ "plan": "cloudamqp:lemur",
+ "as": "RABBITMQ"
+ },
+ {
+ "plan": "bonsai:sandbox-6",
+ "as": "ELASTICSEARCH"
+ }
+ ],
+ "buildpacks": [
+ {
+ "url": "https://github.com/batnasan/heroku-buildpack-subdir"
+ }
+ ]
+}
diff --git a/base.Dockerfile b/base.Dockerfile
new file mode 100644
index 000000000..41c6f7b83
--- /dev/null
+++ b/base.Dockerfile
@@ -0,0 +1,10 @@
+ARG BASE_IMAGE
+ARG DEBIAN_FRONTEND=noninteractive
+FROM $BASE_IMAGE
+RUN apt-get update && \
+ apt-get install --no-install-recommends -yq gnupg2 wget ca-certificates python build-essential && \
+ wget -qO - https://www.mongodb.org/static/pgp/server-3.6.asc | apt-key add - && \
+ echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/3.6 main" | tee /etc/apt/sources.list.d/mongodb-org-3.6.list && \
+ apt-get update && \
+ apt-get install --no-install-recommends -yq mongodb-org-shell=3.6.18 mongodb-org-tools=3.6.18 && \
+ rm -rf /var/lib/apt/lists/*
diff --git a/base.Dockerfile.dockerignore b/base.Dockerfile.dockerignore
new file mode 100644
index 000000000..1d085cacc
--- /dev/null
+++ b/base.Dockerfile.dockerignore
@@ -0,0 +1 @@
+**
diff --git a/db-migrate-store.js b/db-migrate-store.js
index 061f20639..6edbad3f3 100644
--- a/db-migrate-store.js
+++ b/db-migrate-store.js
@@ -63,4 +63,5 @@ class dbStore {
}
}
-module.exports = dbStore
\ No newline at end of file
+module.exports = dbStore
+
diff --git a/.dockerignore b/elkSyncer/.dockerignore
similarity index 100%
rename from .dockerignore
rename to elkSyncer/.dockerignore
diff --git a/elkSyncer/.env.sample b/elkSyncer/.env.sample
new file mode 100644
index 000000000..8b28c36ff
--- /dev/null
+++ b/elkSyncer/.env.sample
@@ -0,0 +1,2 @@
+MONGO_URL=mongodb://localhost/erxes
+ELASTICSEARCH_URL=http://localhost:9200
\ No newline at end of file
diff --git a/elkSyncer/Dockerfile b/elkSyncer/Dockerfile
new file mode 100644
index 000000000..f02b9caba
--- /dev/null
+++ b/elkSyncer/Dockerfile
@@ -0,0 +1,14 @@
+FROM python:3.7.6-slim
+
+WORKDIR /elkSyncer/
+
+RUN pip install mongo-connector==3.1.1 \
+ && pip install elasticsearch==7.5.1 \
+ && pip install elastic2-doc-manager==1.0.0 \
+ && pip install python-dotenv==0.11.0 \
+ && pip install certifi==0.0.8
+
+COPY mongo-connector-config.json .
+COPY main.py .
+
+CMD ["python", "main.py"]
\ No newline at end of file
diff --git a/elkSyncer/main.py b/elkSyncer/main.py
new file mode 100644
index 000000000..5e71260a7
--- /dev/null
+++ b/elkSyncer/main.py
@@ -0,0 +1,170 @@
+#!/usr/bin/python
+
+import os
+import subprocess
+
+import pymongo
+from dotenv import load_dotenv
+from elasticsearch import Elasticsearch
+
+load_dotenv()
+
+MONGO_URL = os.getenv('MONGO_URL')
+ELASTICSEARCH_URL = os.getenv('ELASTICSEARCH_URL')
+
+client = Elasticsearch([ELASTICSEARCH_URL])
+
+nestedType = {
+ "type" : "nested",
+ "properties" : {
+ "field" : { "type" : "keyword"},
+ "value" : { "type" : "text" },
+ "stringValue" : { "type" : "text" },
+ "numberValue" : { "type" : "float" },
+ "dateValue" : { "type" : "date" }
+ }
+}
+
+customer_mapping = {
+ 'state': {
+ 'type': 'keyword',
+ },
+ 'primaryEmail': {
+ 'type': 'text',
+ 'analyzer': 'uax_url_email_analyzer',
+ },
+ 'integrationId': {
+ 'type': 'keyword',
+ },
+ 'relatedIntegrationIds': {
+ 'type': 'keyword',
+ },
+ 'scopeBrandIds': {
+ 'type': 'keyword',
+ },
+ 'ownerId': {
+ 'type': 'keyword',
+ },
+ 'position': {
+ 'type': 'keyword',
+ },
+ 'leadStatus': {
+ 'type': 'keyword',
+ },
+ 'tagIds': {
+ 'type': 'keyword',
+ },
+ 'companyIds': {
+ 'type': 'keyword',
+ },
+ 'mergedIds': {
+ 'type': 'keyword',
+ },
+ 'status': {
+ 'type': 'keyword',
+ },
+ 'emailValidationStatus': {
+ 'type': 'keyword',
+ },
+ "customFieldsData" : nestedType,
+ "trackedData" : nestedType,
+}
+
+company_mapping = {
+ 'primaryEmail': {
+ 'type': 'text',
+ 'analyzer': 'uax_url_email_analyzer',
+ },
+ 'scopeBrandIds': {
+ 'type': 'keyword',
+ },
+ 'plan': {
+ 'type': 'keyword',
+ },
+ 'industry': {
+ 'type': 'keyword',
+ },
+ 'parentCompanyId': {
+ 'type': 'keyword',
+ },
+ 'ownerId': {
+ 'type': 'keyword',
+ },
+ 'tagIds': {
+ 'type': 'keyword',
+ },
+ 'mergedIds': {
+ 'type': 'keyword',
+ },
+ 'status': {
+ 'type': 'keyword',
+ },
+ 'businessType': {
+ 'type': 'keyword',
+ },
+ "customFieldsData" : nestedType
+}
+
+event_mapping = {
+ 'type': {
+ 'type': 'keyword',
+ },
+ 'name': {
+ 'type': 'keyword',
+ },
+ 'customerId': {
+ 'type': 'keyword',
+ },
+ "attributes" : nestedType
+}
+
+analysis = {
+ 'analyzer': {
+ 'uax_url_email_analyzer': {
+ 'tokenizer': 'uax_url_email_tokenizer',
+ },
+ },
+ 'tokenizer': {
+ 'uax_url_email_tokenizer': {
+ 'type': 'uax_url_email',
+ },
+ },
+}
+
+def put_mappings(index, mapping):
+ """
+ Create mappings
+ """
+
+ response = client.indices.exists(index=index)
+
+ print('Create index for %s' % index, response)
+
+ if not response:
+ response = client.indices.create(index=index, body={'settings': {'analysis': analysis}})
+
+ print('Response', response)
+
+ try:
+ response = client.indices.put_mapping(index=index, body = {'properties': mapping})
+
+ print(response)
+ except Exception as e:
+ print(e)
+
+
+db_name = pymongo.uri_parser.parse_uri(MONGO_URL)['database']
+
+put_mappings('%s__customers' % db_name, customer_mapping)
+put_mappings('%s__companies' % db_name, company_mapping)
+put_mappings('%s__events' % db_name, event_mapping)
+
+command = 'mongo-connector -m "%s" -c mongo-connector-config.json --target-url %s' % (MONGO_URL, ELASTICSEARCH_URL)
+
+print('Starting connector ....', command)
+
+process = subprocess.Popen(command, shell=True)
+
+process.wait()
+
+print('End connector')
diff --git a/elkSyncer/mongo-connector-config.json b/elkSyncer/mongo-connector-config.json
new file mode 100644
index 000000000..cfb4c11d6
--- /dev/null
+++ b/elkSyncer/mongo-connector-config.json
@@ -0,0 +1,31 @@
+{
+ "oplogFile": "oplog.timestamp",
+ "noDump": false,
+ "batchSize": 5000,
+ "verbosity": 3,
+ "continueOnError": true,
+ "logging": {
+ "type": "stream"
+ },
+ "namespaces": {
+ "erxes*.customers": {
+ "rename": "erxes*__customers._doc",
+ "excludeFields": ["urlVisits", "messengerData"]
+ },
+ "erxes*.companies": {
+ "rename": "erxes*__companies._doc"
+ }
+ },
+ "docManagers": [
+ {
+ "docManager": "elastic2_doc_manager",
+ "bulkSize": 10,
+ "uniqueKey": "_id",
+ "args": {
+ "clientOptions": {
+ "timeout": 5000
+ }
+ }
+ }
+ ]
+}
diff --git a/elkSyncer/requirements.txt b/elkSyncer/requirements.txt
new file mode 100644
index 000000000..75853c001
--- /dev/null
+++ b/elkSyncer/requirements.txt
@@ -0,0 +1,5 @@
+mongo-connector==3.1.1
+elasticsearch==7.5.1
+elastic2-doc-manager==1.0.0
+python-dotenv==0.11.0
+certifi==0.0.8
\ No newline at end of file
diff --git a/elkSyncer/runtime.txt b/elkSyncer/runtime.txt
new file mode 100644
index 000000000..257b314f5
--- /dev/null
+++ b/elkSyncer/runtime.txt
@@ -0,0 +1 @@
+python-3.7.6
\ No newline at end of file
diff --git a/elkSyncer/wait-for.sh b/elkSyncer/wait-for.sh
new file mode 100755
index 000000000..92cbdbb3c
--- /dev/null
+++ b/elkSyncer/wait-for.sh
@@ -0,0 +1,182 @@
+#!/usr/bin/env bash
+# Use this script to test if a given TCP host/port are available
+
+WAITFORIT_cmdname=${0##*/}
+
+echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
+
+usage()
+{
+ cat << USAGE >&2
+Usage:
+ $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
+ -h HOST | --host=HOST Host or IP under test
+ -p PORT | --port=PORT TCP port under test
+ Alternatively, you specify the host and port as host:port
+ -s | --strict Only execute subcommand if the test succeeds
+ -q | --quiet Don't output any status messages
+ -t TIMEOUT | --timeout=TIMEOUT
+ Timeout in seconds, zero for no timeout
+ -- COMMAND ARGS Execute command with args after the test finishes
+USAGE
+ exit 1
+}
+
+wait_for()
+{
+ if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+ echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+ else
+ echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout"
+ fi
+ WAITFORIT_start_ts=$(date +%s)
+ while :
+ do
+ if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then
+ nc -z $WAITFORIT_HOST $WAITFORIT_PORT
+ WAITFORIT_result=$?
+ else
+ (echo > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1
+ WAITFORIT_result=$?
+ fi
+ if [[ $WAITFORIT_result -eq 0 ]]; then
+ WAITFORIT_end_ts=$(date +%s)
+ echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
+ break
+ fi
+ sleep 1
+ done
+ return $WAITFORIT_result
+}
+
+wait_for_wrapper()
+{
+ # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
+ if [[ $WAITFORIT_QUIET -eq 1 ]]; then
+ timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+ else
+ timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+ fi
+ WAITFORIT_PID=$!
+ trap "kill -INT -$WAITFORIT_PID" INT
+ wait $WAITFORIT_PID
+ WAITFORIT_RESULT=$?
+ if [[ $WAITFORIT_RESULT -ne 0 ]]; then
+ echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+ fi
+ return $WAITFORIT_RESULT
+}
+
+# process arguments
+while [[ $# -gt 0 ]]
+do
+ case "$1" in
+ *:* )
+ WAITFORIT_hostport=(${1//:/ })
+ WAITFORIT_HOST=${WAITFORIT_hostport[0]}
+ WAITFORIT_PORT=${WAITFORIT_hostport[1]}
+ shift 1
+ ;;
+ --child)
+ WAITFORIT_CHILD=1
+ shift 1
+ ;;
+ -q | --quiet)
+ WAITFORIT_QUIET=1
+ shift 1
+ ;;
+ -s | --strict)
+ WAITFORIT_STRICT=1
+ shift 1
+ ;;
+ -h)
+ WAITFORIT_HOST="$2"
+ if [[ $WAITFORIT_HOST == "" ]]; then break; fi
+ shift 2
+ ;;
+ --host=*)
+ WAITFORIT_HOST="${1#*=}"
+ shift 1
+ ;;
+ -p)
+ WAITFORIT_PORT="$2"
+ if [[ $WAITFORIT_PORT == "" ]]; then break; fi
+ shift 2
+ ;;
+ --port=*)
+ WAITFORIT_PORT="${1#*=}"
+ shift 1
+ ;;
+ -t)
+ WAITFORIT_TIMEOUT="$2"
+ if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi
+ shift 2
+ ;;
+ --timeout=*)
+ WAITFORIT_TIMEOUT="${1#*=}"
+ shift 1
+ ;;
+ --)
+ shift
+ WAITFORIT_CLI=("$@")
+ break
+ ;;
+ --help)
+ usage
+ ;;
+ *)
+ echoerr "Unknown argument: $1"
+ usage
+ ;;
+ esac
+done
+
+if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
+ echoerr "Error: you need to provide a host and port to test."
+ usage
+fi
+
+WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
+WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
+WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
+WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
+
+# Check to see if timeout is from busybox?
+WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
+WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
+
+WAITFORIT_BUSYTIMEFLAG=""
+if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
+ WAITFORIT_ISBUSY=1
+ # Check if busybox timeout uses -t flag
+ # (recent Alpine versions don't support -t anymore)
+ if timeout &>/dev/stdout | grep -q -e '-t '; then
+ WAITFORIT_BUSYTIMEFLAG="-t"
+ fi
+else
+ WAITFORIT_ISBUSY=0
+fi
+
+if [[ $WAITFORIT_CHILD -gt 0 ]]; then
+ wait_for
+ WAITFORIT_RESULT=$?
+ exit $WAITFORIT_RESULT
+else
+ if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+ wait_for_wrapper
+ WAITFORIT_RESULT=$?
+ else
+ wait_for
+ WAITFORIT_RESULT=$?
+ fi
+fi
+
+if [[ $WAITFORIT_CLI != "" ]]; then
+ if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then
+ echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess"
+ exit $WAITFORIT_RESULT
+ fi
+ exec "${WAITFORIT_CLI[@]}"
+else
+ exit $WAITFORIT_RESULT
+fi
\ No newline at end of file
diff --git a/email-verifier/.env.sample b/email-verifier/.env.sample
new file mode 100644
index 000000000..8e713b499
--- /dev/null
+++ b/email-verifier/.env.sample
@@ -0,0 +1,11 @@
+# general
+NODE_ENV=development
+PORT=4100
+
+# MongoDB
+MONGO_URL=mongodb://localhost/erxes-email-verifier
+
+TRUE_MAIL_API_KEY=
+
+CLEAR_OUT_PHONE_API_KEY=
+
diff --git a/email-verifier/Dockerfile b/email-verifier/Dockerfile
new file mode 100644
index 000000000..8df46edda
--- /dev/null
+++ b/email-verifier/Dockerfile
@@ -0,0 +1,7 @@
+FROM node:12.18-slim
+WORKDIR /erxes-email-verifier
+RUN chown -R node:node /erxes-email-verifier
+COPY --chown=node:node . /erxes-email-verifier
+USER node
+EXPOSE 4100
+ENTRYPOINT ["node", "--max_old_space_size=8192", "dist"]
diff --git a/email-verifier/package.json b/email-verifier/package.json
new file mode 100644
index 000000000..1294bab8a
--- /dev/null
+++ b/email-verifier/package.json
@@ -0,0 +1,38 @@
+{
+ "name": "erxes-email-verifier",
+ "private": true,
+ "scripts": {
+ "start": "node dist",
+ "dev": "NODE_ENV=development DEBUG=erxes-email-verifier:* node_modules/.bin/ts-node-dev --experimental-worker --respawn src",
+ "build": "tsc -p tsconfig.prod.json"
+ },
+ "dependencies": {
+ "body-parser": "^1.19.0",
+ "csv-writer": "^1.6.0",
+ "debug": "^4.1.1",
+ "dotenv": "^4.0.0",
+ "email-deep-validator": "^3.3.0",
+ "express": "^4.16.4",
+ "mongoose": "5.7.5",
+ "node-schedule": "^1.3.2",
+ "redis": "^3.0.2",
+ "request": "^2.88.2",
+ "request-promise": "^4.2.5",
+ "requestify": "^0.2.5",
+ "xss": "^1.0.6"
+ },
+ "peerOptionalDependencies": {
+ "kerberos": "^1.0.0"
+ },
+ "devDependencies": {
+ "@types/dotenv": "^4.0.3",
+ "@types/express": "^4.16.0",
+ "@types/mongodb": "^3.1.2",
+ "@types/mongoose": "^5.2.1",
+ "@types/node": "^10.12.18",
+ "@types/q": "^1.5.0",
+ "ts-node": "8.0.3",
+ "ts-node-dev": "^1.0.0-pre.32",
+ "typescript": "^3.7.2"
+ }
+}
diff --git a/email-verifier/src/api.ts b/email-verifier/src/api.ts
new file mode 100644
index 000000000..a080f4e02
--- /dev/null
+++ b/email-verifier/src/api.ts
@@ -0,0 +1,242 @@
+import * as EmailValidator from 'email-deep-validator';
+import { EMAIL_VALIDATION_SOURCES, EMAIL_VALIDATION_STATUSES, Emails } from './models';
+import { getArray, setArray } from './redisClient';
+import { debugBase, sendRequest } from './utils';
+
+const { TRUE_MAIL_API_KEY, EMAIL_VERIFICATION_TYPE = 'truemail' } = process.env;
+
+const singleTrueMail = async (email: string) => {
+ try {
+ const url = `https://truemail.io/api/v1/verify/single?access_token=${TRUE_MAIL_API_KEY}&email=${email}`;
+
+ const response = await sendRequest({
+ url,
+ method: 'GET',
+ });
+
+ if (typeof response === 'string') {
+ return JSON.parse(response);
+ }
+
+ return response;
+ } catch (e) {
+ debugBase(`Error occured during single true mail validation ${e.message}`);
+ throw e;
+ }
+};
+
+const bulkTrueMail = async (unverifiedEmails: string[], hostname: string) => {
+ const url = `https://truemail.io/api/v1/tasks/bulk?access_token=${TRUE_MAIL_API_KEY}`;
+
+ try {
+ const result = await sendRequest({
+ url,
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ method: 'POST',
+ body: {
+ file: unverifiedEmails.map(e => ({ email: e })),
+ },
+ });
+
+ let data;
+ let error;
+
+ if (typeof result === 'string') {
+ data = JSON.parse(result).data;
+ error = JSON.parse(result).error;
+ } else {
+ data = result.data;
+ error = result.error;
+ }
+
+ if (data) {
+ const taskIds = await getArray('erxes_email_verifier_task_ids');
+
+ taskIds.push({ taskId: data.task_id, hostname });
+
+ setArray('erxes_email_verifier_task_ids', taskIds);
+ } else if (error) {
+ throw new Error(error.message);
+ }
+ } catch (e) {
+ // request may fail
+ throw e;
+ }
+};
+
+export const single = async (email: string, hostname: string) => {
+ const emailOnDb = await Emails.findOne({ email });
+
+ if (emailOnDb) {
+ debugBase(`This email is already verified`);
+
+ return sendRequest({
+ url: `${hostname}/verifier/webhook`,
+ method: 'POST',
+ body: {
+ email: { email, status: emailOnDb.status },
+ source: EMAIL_VALIDATION_SOURCES.ERXES,
+ },
+ });
+ }
+
+ const emailValidator = new EmailValidator();
+ const { validDomain, validMailbox } = await emailValidator.verify(email);
+
+ if (validDomain && validMailbox) {
+ return sendRequest({
+ url: `${hostname}/verifier/webhook`,
+ method: 'POST',
+ body: {
+ email: { email, status: EMAIL_VALIDATION_STATUSES.VALID },
+ source: EMAIL_VALIDATION_SOURCES.ERXES,
+ },
+ });
+ }
+
+ let response: { status?: string; result?: string } = {};
+
+ if (EMAIL_VERIFICATION_TYPE === 'truemail') {
+ try {
+ debugBase(`Email is not found on verifier DB. Sending request to truemail`);
+ response = await singleTrueMail(email);
+
+ debugBase(`Received single email validation status`);
+ } catch (e) {
+ // request may fail
+ throw e;
+ }
+ }
+
+ if (response.status === 'success') {
+ const doc = { email, status: response.result };
+
+ if (doc.status === EMAIL_VALIDATION_STATUSES.VALID || doc.status === EMAIL_VALIDATION_STATUSES.INVALID) {
+ await Emails.createEmail(doc);
+ }
+
+ debugBase(`Sending single email validation status to erxes-api`);
+
+ return sendRequest({
+ url: `${hostname}/verifier/webhook`,
+ method: 'POST',
+ body: {
+ email: doc,
+ source: EMAIL_VALIDATION_SOURCES.TRUEMAIL,
+ },
+ });
+ }
+
+ // if status is not success
+ return sendRequest({
+ url: `${hostname}/verifier/webhook`,
+ method: 'POST',
+ body: {
+ email: { email, status: EMAIL_VALIDATION_STATUSES.UNKNOWN },
+ source: EMAIL_VALIDATION_SOURCES.TRUEMAIL,
+ },
+ });
+};
+
+export const bulk = async (emails: string[], hostname: string) => {
+ const emailsOnDb = await Emails.find({ email: { $in: emails } });
+
+ const emailsMap: Array<{ email: string; status: string }> = emailsOnDb.map(({ email, status }) => ({
+ email,
+ status,
+ }));
+
+ const verifiedEmails = emailsMap.map(verified => ({ email: verified.email, status: verified.status }));
+
+ const unverifiedEmails = emails.filter(email => !verifiedEmails.some(e => e.email === email));
+
+ if (verifiedEmails.length > 0) {
+ try {
+ debugBase(`Sending already verified emails to erxes-api`);
+
+ await sendRequest({
+ url: `${hostname}/verifier/webhook`,
+ method: 'POST',
+ body: {
+ emails: verifiedEmails,
+ source: EMAIL_VALIDATION_SOURCES.ERXES,
+ },
+ });
+ } catch (e) {
+ // request may fail
+ throw e;
+ }
+ }
+
+ if (unverifiedEmails.length > 0) {
+ debugBase(`Sending unverified email to truemail`);
+
+ return bulkTrueMail(unverifiedEmails, hostname);
+ }
+};
+
+export const checkTask = async (taskId: string) => {
+ const url = `https://truemail.io/api/v1/tasks/${taskId}/status?access_token=${TRUE_MAIL_API_KEY}`;
+
+ const response = await sendRequest({
+ url,
+ method: 'GET',
+ });
+
+ return JSON.parse(response).data;
+};
+
+export const getTrueMailBulk = async (taskId: string, hostname: string) => {
+ debugBase(`Downloading bulk email validation result`);
+
+ const url = `https://truemail.io/api/v1/tasks/${taskId}/download?access_token=${TRUE_MAIL_API_KEY}&timeout=30000`;
+
+ const response = await sendRequest({
+ url,
+ method: 'GET',
+ });
+
+ const rows = response.split('\n');
+ const emails: Array<{ email: string; status: string }> = [];
+
+ for (const row of rows) {
+ const rowArray = row.split(',');
+
+ if (rowArray.length > 2) {
+ const email = rowArray[0];
+ const status = rowArray[2];
+
+ emails.push({
+ email,
+ status,
+ });
+
+ if (status === EMAIL_VALIDATION_STATUSES.VALID || status === EMAIL_VALIDATION_STATUSES.INVALID) {
+ const found = await Emails.findOne({ email });
+
+ if (!found) {
+ const doc = {
+ email,
+ status,
+ created: new Date(),
+ };
+
+ await Emails.createEmail(doc);
+ }
+ }
+ }
+ }
+
+ debugBase(`Sending bulk email validation result to erxes-api`);
+
+ await sendRequest({
+ url: `${hostname}/verifier/webhook`,
+ method: 'POST',
+ body: {
+ emails,
+ source: EMAIL_VALIDATION_SOURCES.TRUEMAIL,
+ },
+ });
+};
diff --git a/email-verifier/src/apiPhoneVerifier.ts b/email-verifier/src/apiPhoneVerifier.ts
new file mode 100644
index 000000000..a2f19a3fc
--- /dev/null
+++ b/email-verifier/src/apiPhoneVerifier.ts
@@ -0,0 +1,327 @@
+import * as csv from 'csv-writer';
+import * as dotenv from 'dotenv';
+import * as fs from 'fs';
+import * as request from 'request-promise';
+import { PHONE_VALIDATION_STATUSES, Phones } from './models';
+import { getArray, setArray } from './redisClient';
+import { debugBase, getEnv, sendRequest } from './utils';
+
+dotenv.config();
+
+const CLEAR_OUT_PHONE_API_KEY = getEnv({ name: 'CLEAR_OUT_PHONE_API_KEY' });
+
+const savePhone = async (doc: {
+ phone: string;
+ status: string;
+ lineType?: string;
+ carrier?: string;
+ internationalFormat?: string;
+ localFormat?: string;
+}) => {
+ if (doc.lineType === 'mobile') {
+ doc.status = PHONE_VALIDATION_STATUSES.RECEIVES_SMS;
+ }
+ await Phones.createPhone(doc);
+};
+
+const singleClearOut = async (phone: string): PromiseIf you want to use service like this click here to read more. Also you can opt out from our email subscription here.
© 2020 erxes inc Growth Marketing Platform
`;
+
+ try {
+ await transporter.sendMail({
+ from: `${sender || ''} <${fromEmail}>`,
+ to: customer.primaryEmail,
+ replyTo,
+ subject,
+ attachments: mailAttachment,
+ html: replacedContent,
+ headers: {
+ 'X-SES-CONFIGURATION-SET': 'erxes',
+ EngageMessageId: engageMessageId,
+ CustomerId: customer._id,
+ MailMessageId: mailMessageId,
+ },
+ });
+ const msg = `Sent email to: ${customer.primaryEmail}`;
+ debugEngages(msg);
+ await Logs.createLog(engageMessageId, 'success', msg);
+ } catch (e) {
+ debugEngages(e.message);
+ await Logs.createLog(
+ engageMessageId,
+ 'failure',
+ `Error occurred while sending email to ${customer.primaryEmail}: ${e.message}`,
+ );
+ }
+
+ await Stats.updateOne({ engageMessageId }, { $inc: { total: 1 } });
+ };
+
+ const configs = await getConfigs();
+ const unverifiedEmailsLimit = parseInt(configs.unverifiedEmailsLimit || '100', 10);
+
+ let filteredCustomers = [];
+ let emails = [];
+
+ if (customers.length > unverifiedEmailsLimit) {
+ await Logs.createLog(
+ engageMessageId,
+ 'regular',
+ `Unverified emails limit exceeced ${unverifiedEmailsLimit}. Customers who have unverified emails will be eliminated.`,
+ );
+
+ for (const customer of customers) {
+ if (customer.emailValidationStatus === 'valid') {
+ filteredCustomers.push(customer);
+
+ emails.push(customer.primaryEmail);
+ }
+ }
+ } else {
+ filteredCustomers = customers;
+ emails = customers.map(customer => customer.primaryEmail);
+ }
+
+ if (emails.length > 0) {
+ await Logs.createLog(engageMessageId, 'regular', `Preparing to send emails to ${emails.length}: ${emails}`);
+ }
+
+ for (const customer of filteredCustomers) {
+ await new Promise(resolve => {
+ setTimeout(resolve, 1000);
+ });
+
+ await sendEmail(customer);
+ }
+
+ return true;
+};
+
+// sends bulk sms via engage message
+export const sendBulkSms = async (data: {
+ engageMessageId: string;
+ shortMessage: IShortMessage;
+ customers: ICustomer[];
+}) => {
+ const { customers, engageMessageId, shortMessage } = data;
+
+ const telnyxInfo = await getTelnyxInfo();
+
+ const filteredCustomers = customers.filter(c => c.primaryPhone && c.phoneValidationStatus === 'valid');
+
+ await Logs.createLog(engageMessageId, 'regular', `Preparing to send SMS to "${filteredCustomers.length}" customers`);
+
+ for (const customer of filteredCustomers) {
+ await new Promise(resolve => {
+ setTimeout(resolve, 1000);
+ });
+
+ const msg = await prepareMessage({
+ shortMessage,
+ to: customer.primaryPhone,
+ integrations: telnyxInfo.integrations,
+ });
+
+ try {
+ await telnyxInfo.instance.messages.create(msg, async (err: any, res: any) => {
+ await handleMessageCallback(err, res, { engageMessageId, msg });
+ }); // end sms creation
+ } catch (e) {
+ await Logs.createLog(engageMessageId, 'failure', `${e.message} while sending to "${msg.to}"`);
+ }
+ } // end customers loop
+}; // end sendBuklSms()
diff --git a/engages-email-sender/src/telnyxUtils.ts b/engages-email-sender/src/telnyxUtils.ts
new file mode 100644
index 000000000..a88f0b27d
--- /dev/null
+++ b/engages-email-sender/src/telnyxUtils.ts
@@ -0,0 +1,66 @@
+import * as Telnyx from 'telnyx';
+import { SMS_DELIVERY_STATUSES } from './constants';
+import { sendRPCMessage } from './messageBroker';
+import SmsRequests from './models/SmsRequests';
+
+// fetches telnyx config & integrations from erxes-integrations
+export const getTelnyxInfo = async () => {
+ const response = await sendRPCMessage({ action: 'getTelnyxInfo' });
+
+ const { telnyxApiKey, integrations = [] } = response;
+
+ if (!telnyxApiKey) {
+ throw new Error('Telnyx API key is not configured');
+ }
+
+ if (integrations.length < 1) {
+ throw new Error('No telnyx integrations configured');
+ }
+
+ return {
+ telnyxApiKey,
+ instance: new Telnyx(telnyxApiKey),
+ integrations,
+ };
+};
+
+export const saveTelnyxHookData = async (data: any) => {
+ if (data && data.payload) {
+ const { to = [], id } = data.payload;
+
+ const initialRequest = await SmsRequests.findOne({ telnyxId: id });
+
+ if (initialRequest) {
+ const receiver = to.find(item => item.phone_number === initialRequest.to);
+
+ // prevent updates since sms is delivered
+ if (receiver && receiver.status !== SMS_DELIVERY_STATUSES.DELIVERED) {
+ const statuses = initialRequest.statusUpdates || [];
+
+ statuses.push({ date: new Date(), status: receiver.status });
+
+ await SmsRequests.updateRequest(initialRequest._id, {
+ status: receiver.status,
+ responseData: JSON.stringify(data.payload),
+ statusUpdates: statuses,
+ });
+ }
+ }
+ }
+};
+
+export const prepareSmsStats = async (engageMessageId: string) => {
+ const stats = await SmsRequests.aggregate([
+ { $match: { engageMessageId } },
+ { $group: { _id: '$status', count: { $sum: 1 } } },
+ ]);
+
+ const result: any = { total: 0 };
+
+ for (const s of stats) {
+ result[s._id] = s.count || 0;
+ result.total += s.count || 0;
+ }
+
+ return result;
+};
diff --git a/engages-email-sender/src/trackers/engageTracker.ts b/engages-email-sender/src/trackers/engageTracker.ts
new file mode 100644
index 000000000..1852b7f9a
--- /dev/null
+++ b/engages-email-sender/src/trackers/engageTracker.ts
@@ -0,0 +1,152 @@
+import * as AWS from 'aws-sdk';
+import { debugBase } from '../debuggers';
+import messageBroker from '../messageBroker';
+import { Configs, DeliveryReports, Stats } from '../models';
+import { ISESConfig } from '../models/Configs';
+
+export const getApi = async (type: string): Promise© 2020 erxes inc Growth Marketing Platform
${faker.lorem.sentences()}
\n`, + }); + + const segment = await Segments.createSegment({ + name: 'Happy customers', + description: faker.lorem.sentence(), + contentType: 'customer', + color: faker.internet.color(), + subOf: '', + conditions: [], + }); + + const docAutoMessage = { + kind: 'visitorAuto', + title: 'Visitor auto message', + fromUserId: randomUser[0]._id, + segmentIds: [segment._id], + brandIds: [brand._id], + tagIds: [], + isLive: false, + isDraft: true, + }; + + const docAutoEmail = { + kind: 'auto', + title: 'Auto email every friday', + fromUserId: randomUser[0]._id, + segmentIds: [segment._id], + brandIds: [brand._id], + tagIds: [], + isLive: false, + isDraft: true, + email: { + subject: faker.lorem.sentence(), + sender: faker.internet.email(), + replyTo: faker.internet.email(), + content: faker.lorem.paragraphs(), + attachments: [], + templateId: template._id, + }, + scheduleDate: { + type: '5', + month: '', + day: '', + }, + method: 'email', + }; + + await EngageMessages.createEngageMessage(docAutoMessage); + await EngageMessages.createEngageMessage(docAutoEmail); + + console.log('Finished: Engages'); + + // Growth Hack + + console.log('Creating: Growth Hack'); + + const growthForm = await createForms('growthHack', admin); + const growthBoard = await Boards.createBoard({ name: faker.random.word(), type: 'growthHack', userId: admin._id }); + + const pipelineTemplate = await PipelineTemplates.createPipelineTemplate( + { + name: faker.random.word(), + description: faker.lorem.sentence(), + type: 'growthHack', + }, + [ + { + _id: faker.unique, + name: faker.random.word(), + formId: growthForm._id, + }, + ], + ); + + const growthHackDock = { + name: faker.random.word(), + startDate: faker.date.past(), + endDate: faker.date.future(), + visibility: 'public', + type: 'growthHack', + boardId: growthBoard._id, + memberIds: [], + bgColor: faker.internet.color(), + templateId: pipelineTemplate._id, + hackScoringType: 'rice', + metric: 'monthly-active-users', + }; + await Pipelines.createPipeline(growthHackDock); + + console.log('Finished: Growth Hack'); + + await disconnect(); + + console.log('admin email: admin@erxes.io'); + console.log('admin password: ', newPwd); + + process.exit(); +}; + +const createXlsStream = async (fileName: string): Promise<{ fieldNames: string[]; datas: any[] }> => { + return new Promise(async (resolve, reject) => { + let rowCount = 0; + + const usedSheets: any[] = []; + + const xlsxReader = XlsxStreamReader(); + + try { + const stream = fs.createReadStream(`./src/initialData/xls/${fileName}`); + + stream.pipe(xlsxReader); + + xlsxReader.on('worksheet', workSheetReader => { + if (workSheetReader > 1) { + return workSheetReader.skip(); + } + + workSheetReader.on('row', row => { + if (rowCount > 100000) { + return reject(new Error('You can only import 100000 rows one at a time')); + } + + if (row.values.length > 0) { + usedSheets.push(row.values); + rowCount++; + } + }); + + workSheetReader.process(); + }); + + xlsxReader.on('end', () => { + const compactedRows: any = []; + + for (const row of usedSheets) { + if (row.length > 0) { + row.shift(); + + compactedRows.push(row); + } + } + + const fieldNames = usedSheets[0]; + + // Removing column + compactedRows.shift(); + + return resolve({ fieldNames, datas: compactedRows }); + }); + + xlsxReader.on('error', error => { + return reject(error); + }); + } catch (e) { + reject(e); + } + }); +}; + +const readXlsFile = async (fileName: string, type: string, user: any) => { + try { + let fieldNames: string[] = []; + let datas: any[] = []; + let result: any = {}; + + result = await createXlsStream(fileName); + + fieldNames = result.fieldNames; + datas = result.datas; + + if (datas.length === 0) { + throw new Error('Please import at least one row of data'); + } + + const properties = await checkFieldNames(type, fieldNames); + + const importHistoryId = await ImportHistory.create({ + contentType: type, + total: datas.length, + userId: user._id, + date: Date.now(), + }); + + return { properties, result: datas, type, importHistoryId }; + } catch (e) { + debugWorkers(e.message); + throw e; + } +}; + +const insertToDB = async xlsData => { + const { user, scopeBrandIds, result, contentType, properties, importHistoryId } = xlsData; + let create: any = null; + let model: any = null; + + const isBoardItem = (): boolean => contentType === 'deal' || contentType === 'task' || contentType === 'ticket'; + + switch (contentType) { + case 'company': + create = Companies.createCompany; + model = Companies; + break; + case 'customer': + create = Customers.createCustomer; + model = Customers; + break; + case 'lead': + create = Customers.createCustomer; + model = Customers; + break; + case 'product': + create = Products.createProduct; + model = Products; + break; + case 'deal': + create = Deals.createDeal; + break; + case 'task': + create = Tasks.createTask; + break; + case 'ticket': + create = Tickets.createTicket; + break; + default: + break; + } + + for (const fieldValue of result) { + // Import history result statistics + const inc: { success: number; failed: number; percentage: number } = { + success: 0, + failed: 0, + percentage: 100, + }; + + // Collecting errors + const errorMsgs: string[] = []; + + const doc: any = { + scopeBrandIds, + customFieldsData: [], + }; + + let colIndex: number = 0; + let boardName: string = ''; + let pipelineName: string = ''; + let stageName: string = ''; + + // Iterating through detailed properties + for (const property of properties) { + const value = (fieldValue[colIndex] || '').toString(); + + switch (property.type) { + case 'customProperty': + { + doc.customFieldsData.push({ + field: property.id, + value: fieldValue[colIndex], + }); + } + break; + + case 'customData': + { + doc[property.name] = value; + } + break; + + case 'ownerEmail': + { + const userEmail = value; + + const owner = await Users.findOne({ email: userEmail }).lean(); + + doc[property.name] = owner ? owner._id : ''; + } + break; + + case 'pronoun': + { + doc.sex = generatePronoun(value); + } + break; + + case 'companiesPrimaryNames': + { + doc.companiesPrimaryNames = value.split(','); + } + break; + + case 'customersPrimaryEmails': + doc.customersPrimaryEmails = value.split(','); + break; + + case 'state': + doc.state = value; + break; + + case 'boardName': + boardName = value; + break; + + case 'pipelineName': + pipelineName = value; + break; + + case 'stageName': + stageName = value; + break; + + case 'tag': + { + const tagName = value; + + const tag = await Tags.findOne({ name: new RegExp(`.*${tagName}.*`, 'i') }).lean(); + + doc[property.name] = tag ? [tag._id] : []; + } + break; + + case 'basic': + { + doc[property.name] = value; + + if (property.name === 'primaryName' && value) { + doc.names = [value]; + } + + if (property.name === 'primaryEmail' && value) { + doc.emails = [value]; + } + + if (property.name === 'primaryPhone' && value) { + doc.phones = [value]; + } + + if (property.name === 'phones' && value) { + doc.phones = value.split(','); + } + + if (property.name === 'emails' && value) { + doc.emails = value.split(','); + } + + if (property.name === 'names' && value) { + doc.names = value.split(','); + } + + if (property.name === 'isComplete') { + doc.isComplete = Boolean(value); + } + } + break; + } // end property.type switch + + colIndex++; + } // end properties for loop + + if ((contentType === 'customer' || contentType === 'lead') && !doc.emailValidationStatus) { + doc.emailValidationStatus = 'unknown'; + } + + if ((contentType === 'customer' || contentType === 'lead') && !doc.phoneValidationStatus) { + doc.phoneValidationStatus = 'unknown'; + } + + // set board item created user + if (isBoardItem()) { + doc.userId = user._id; + + if (boardName && pipelineName && stageName) { + const board = await Boards.findOne({ name: boardName, type: contentType }); + const pipeline = await Pipelines.findOne({ boardId: board && board._id, name: pipelineName }); + const stage = await Stages.findOne({ pipelineId: pipeline && pipeline._id, name: stageName }); + + doc.stageId = stage && stage._id; + } + } + + await create(doc, user) + .then(async cocObj => { + if (doc.companiesPrimaryNames && doc.companiesPrimaryNames.length > 0 && contentType !== 'company') { + const companyIds: string[] = []; + + for (const primaryName of doc.companiesPrimaryNames) { + let company = await Companies.findOne({ primaryName }).lean(); + + if (company) { + companyIds.push(company._id); + } else { + company = await Companies.createCompany({ primaryName }); + companyIds.push(company._id); + } + } + + for (const _id of companyIds) { + await Conformities.addConformity({ + mainType: contentType === 'lead' ? 'customer' : contentType, + mainTypeId: cocObj._id, + relType: 'company', + relTypeId: _id, + }); + } + } + + if (doc.customersPrimaryEmails && doc.customersPrimaryEmails.length > 0 && contentType !== 'customer') { + const customers = await Customers.find({ primaryEmail: { $in: doc.customersPrimaryEmails } }, { _id: 1 }); + const customerIds = customers.map(customer => customer._id); + + for (const _id of customerIds) { + await Conformities.addConformity({ + mainType: contentType === 'lead' ? 'customer' : contentType, + mainTypeId: cocObj._id, + relType: 'customer', + relTypeId: _id, + }); + } + } + + await ImportHistory.updateOne({ _id: importHistoryId }, { $push: { ids: [cocObj._id] } }); + + // Increasing success count + inc.success++; + }) + .catch(async (e: Error) => { + const updatedDoc = clearEmptyValues(doc); + + // Increasing failed count and pushing into error message + + switch (e.message) { + case 'Duplicated email': + inc.success++; + await updateDuplicatedValue(model, 'primaryEmail', updatedDoc); + break; + case 'Duplicated phone': + inc.success++; + await updateDuplicatedValue(model, 'primaryPhone', updatedDoc); + break; + case 'Duplicated name': + inc.success++; + await updateDuplicatedValue(model, 'primaryName', updatedDoc); + break; + default: + inc.failed++; + errorMsgs.push(e.message); + break; + } + }); + + await ImportHistory.updateOne({ _id: importHistoryId }, { $inc: inc, $push: { errorMsgs } }); + + let importHistory = await ImportHistory.findOne({ _id: importHistoryId }); + + if (!importHistory) { + throw new Error('Could not find import history'); + } + + if (importHistory.failed + importHistory.success === importHistory.total) { + await ImportHistory.updateOne({ _id: importHistoryId }, { $set: { status: 'Done', percentage: 100 } }); + + importHistory = await ImportHistory.findOne({ _id: importHistoryId }); + } + + if (!importHistory) { + throw new Error('Could not find import history'); + } + } +}; + +const populateStages = async type => { + const stages: IPipelineStage[] = []; + + for (let i = 0; i < 5; i++) { + const stage: IPipelineStage = { _id: faker.unique, name: faker.random.word(), type, pipelineId: '' }; + stages.push(stage); + } + return stages; +}; + +const createForms = async (type: string, user: any) => { + const form = await Forms.createForm( + { + title: faker.random.word(), + description: faker.lorem.sentence(), + buttonText: faker.random.word(), + type, + }, + user._id, + ); + + const validations = ['datetime', 'date', 'email', 'number', 'phone']; + + let order = 0; + + for (const validation of validations) { + let text = faker.random.word(); + + if (validation === 'email') { + text = 'email'; + } else if (validation === 'phone') { + text = 'phone number'; + } + + await Fields.createField({ + contentTypeId: form._id, + contentType: 'form', + type: 'input', + validation, + text, + description: faker.random.word(), + order, + }); + order++; + } + + return form; +}; + +main(); diff --git a/src/commands/runEsCommand.ts b/src/commands/runEsCommand.ts new file mode 100644 index 000000000..056ed2591 --- /dev/null +++ b/src/commands/runEsCommand.ts @@ -0,0 +1,33 @@ +import { client, getMappings } from '../elasticsearch'; + +const argv = process.argv; + +/* + * yarn run runEsCommand deleteByQuery '{"index":"erxes_office__events","body":{"query":{"match":{"customerId":"CX2BFBGDEHFehNT8y"}}}}' + */ +const main = async () => { + if (argv.length === 4) { + const body = argv.pop() || '{}'; + const action = argv.pop(); + + try { + if (action === 'getMapping') { + const mappingResponse = await getMappings(JSON.parse(body).index); + return console.log(JSON.stringify(mappingResponse)); + } + + const response = await client[action](JSON.parse(body)); + console.log(JSON.stringify(response)); + } catch (e) { + console.log(e); + } + } +}; + +main() + .then(() => { + console.log('done ...'); + }) + .catch(e => { + console.log(e.message); + }); diff --git a/src/commands/trackTelemetry.ts b/src/commands/trackTelemetry.ts new file mode 100644 index 000000000..3265d8295 --- /dev/null +++ b/src/commands/trackTelemetry.ts @@ -0,0 +1,12 @@ +import * as telemetry from 'erxes-telemetry'; + +const command = async () => { + const argv = process.argv; + const message = argv.pop(); + + telemetry.trackCli('installation_status', { message }); + + process.exit(); +}; + +command(); diff --git a/src/cronJobs/activityLogs.ts b/src/cronJobs/activityLogs.ts index 87f98ae34..0c7576b50 100644 --- a/src/cronJobs/activityLogs.ts +++ b/src/cronJobs/activityLogs.ts @@ -1,20 +1,30 @@ +import * as dotenv from 'dotenv'; import * as schedule from 'node-schedule'; -import QueryBuilder from '../data/modules/segments/queryBuilder'; -import { ActivityLogs, Customers, Segments } from '../db/models'; +import { fetchBySegments } from '../data/modules/segments/queryBuilder'; +import { connect } from '../db/connection'; +import { ActivityLogs, Companies, Customers, Segments } from '../db/models'; /** * Send conversation messages to customer */ +dotenv.config(); + export const createActivityLogsFromSegments = async () => { + await connect(); const segments = await Segments.find({}); for (const segment of segments) { - const selector = await QueryBuilder.segments(segment); - const customers = await Customers.find(selector); + const ids = await fetchBySegments(segment); + + const customers = await Customers.find({ _id: { $in: ids } }, { _id: 1 }); + const customerIds = customers.map(c => c._id); + + const companies = await Companies.find({ _id: { $in: ids } }, { _id: 1 }); + const companyIds = companies.map(c => c._id); + + await ActivityLogs.createSegmentLog(segment, customerIds, 'customer'); - for (const customer of customers) { - await ActivityLogs.createSegmentLog(segment, customer); - } + await ActivityLogs.createSegmentLog(segment, companyIds, 'company'); } }; diff --git a/src/cronJobs/conversations.ts b/src/cronJobs/conversations.ts index 1fe446af2..887523ecb 100644 --- a/src/cronJobs/conversations.ts +++ b/src/cronJobs/conversations.ts @@ -1,9 +1,10 @@ import * as moment from 'moment'; import * as schedule from 'node-schedule'; import * as _ from 'underscore'; -import utils from '../data/utils'; +import utils, { IEmailParams } from '../data/utils'; import { Brands, ConversationMessages, Conversations, Customers, Integrations, Users } from '../db/models'; import { IMessageDocument } from '../db/models/definitions/conversationMessages'; +import { debugCrons } from '../debuggers'; /** * Send conversation messages to customer @@ -12,84 +13,116 @@ export const sendMessageEmail = async () => { // new or open conversations const conversations = await Conversations.newOrOpenConversation(); + debugCrons(`Found ${conversations.length} conversations`); + for (const conversation of conversations) { - const customer = await Customers.findOne({ _id: conversation.customerId }); + const customer = await Customers.findOne({ _id: conversation.customerId }).lean(); + const integration = await Integrations.findOne({ _id: conversation.integrationId, }); if (!integration) { - return; + continue; } - const brand = await Brands.findOne({ _id: integration.brandId }); - - if (!customer || !customer.primaryEmail) { - return; + if (!customer || !(customer.emails && customer.emails.length > 0)) { + continue; } + const brand = await Brands.findOne({ _id: integration.brandId }).lean(); + if (!brand) { - return; + continue; } // user's last non answered question - const question: IMessageDocument | any = (await ConversationMessages.getNonAsnweredMessage(conversation._id)) || {}; + const question: IMessageDocument = await ConversationMessages.getNonAsnweredMessage(conversation._id); + + const adminMessages = await ConversationMessages.getAdminMessages(conversation._id); + + if (adminMessages.length < 1) { + continue; + } // generate admin unread answers const answers: any = []; - const adminMessages = await ConversationMessages.getAdminMessages(conversation._id); - for (const message of adminMessages) { - const answer = message; + const answer = { + ...message.toJSON(), + createdAt: new Date(moment(message.createdAt).format('DD MMM YY, HH:mm')), + }; + + const usr = await Users.findOne({ _id: message.userId }).lean(); + + if (usr) { + answer.user = usr; + answer.user.avatar = usr.details.avatar; + answer.user.fullName = usr.details.fullName; + } + + if (message.attachments.length !== 0) { + for (const attachment of message.attachments) { + answer.content = answer.content.concat(`If you want to use service like this click here to read more. Also you can opt out from our email subscription here.
© 2019 erxes inc Growth Marketing Platform
`;
+ const customerInfos: Array<{
+ _id: string;
+ primaryEmail?: string;
+ emailValidationStatus?: string;
+ phoneValidationStatus?: string;
+ primaryPhone?: string;
+ replacers: Array<{ key: string; value: string }>;
+ }> = [];
+ const emailConf = engageMessage.email ? engageMessage.email : { content: '' };
+ const emailContent = emailConf.content || '';
+
+ const { customerFields } = await replaceEditorAttributes({
+ content: emailContent,
+ });
- const mailMessageId = Random.id();
+ const onFinishPiping = async () => {
+ if (engageMessage.kind === MESSAGE_KINDS.MANUAL && customerInfos.length === 0) {
+ await EngageMessages.deleteOne({ _id: engageMessage._id });
+ throw new Error('No customers found');
+ }
+
+ // save matched customers count
+ await EngageMessages.setCustomersCount(engageMessage._id, 'totalCustomersCount', customerInfos.length);
+
+ await sendQueueMessage({
+ action: 'writeLog',
+ data: {
+ engageMessageId,
+ msg: `Matched ${customerInfos.length} customers`,
+ },
+ });
- // add new delivery report
- EngageMessages.addNewDeliveryReport(message._id, mailMessageId, customer._id);
+ await EngageMessages.setCustomersCount(engageMessage._id, 'validCustomersCount', customerInfos.length);
- // send email =========
- utils.executeSendViaEmail(
- userEmail,
- attachments,
- customer,
- subject,
- replacedContent,
- AWS_SES_CONFIG_SET,
- message._id,
- mailMessageId,
- );
+ if (customerInfos.length > 0) {
+ const data: any = {
+ customers: [],
+ fromEmail: user.email,
+ engageMessageId,
+ shortMessage: engageMessage.shortMessage || {},
+ };
+
+ if (engageMessage.method === METHODS.EMAIL && engageMessage.email) {
+ const { replacedContent } = await replaceEditorAttributes({
+ customerFields,
+ content: emailContent,
+ user,
+ });
+
+ engageMessage.email.content = replacedContent;
+
+ data.email = engageMessage.email;
+ }
+
+ const chunks = chunkArray(customerInfos, 3000);
+
+ for (const chunk of chunks) {
+ data.customers = chunk;
+
+ await sendQueueMessage({ action, data });
+ }
+ }
+ };
+
+ const customerTransformerStream = new Transform({
+ objectMode: true,
+
+ async transform(customer: ICustomerDocument, _encoding, callback) {
+ const { replacers } = await replaceEditorAttributes({
+ content: emailContent,
+ customer,
+ customerFields,
+ });
+
+ customerInfos.push({
+ _id: customer._id,
+ primaryEmail: customer.primaryEmail,
+ emailValidationStatus: customer.emailValidationStatus,
+ phoneValidationStatus: customer.phoneValidationStatus,
+ primaryPhone: customer.primaryPhone,
+ replacers,
+ });
+
+ // signal upstream that we are ready to take more data
+ callback();
+ },
+ });
+
+ // generate fields option =======
+ const fieldsOption = {
+ primaryEmail: 1,
+ emailValidationStatus: 1,
+ phoneValidationStatus: 1,
+ primaryPhone: 1,
+ };
+
+ for (const field of customerFields || []) {
+ fieldsOption[field] = 1;
}
+
+ const customersStream = (Customers.find(customersSelector, fieldsOption) as any).stream();
+
+ return new Promise((resolve, reject) => {
+ const pipe = customersStream.pipe(customerTransformerStream);
+
+ pipe.on('finish', async () => {
+ try {
+ await onFinishPiping();
+ } catch (e) {
+ return reject(e);
+ }
+
+ resolve('done');
+ });
+ });
};
/**
* Send via messenger
*/
-const sendViaMessenger = async (message: IEngageMessageDocument) => {
- const { fromUserId, tagIds, brandIds, segmentIds, customerIds = [] } = message;
+const sendViaMessenger = async ({ engageMessage, customersSelector, user }: IEngageParams) => {
+ const { fromUserId, messenger, _id } = engageMessage;
- if (!message.messenger) {
+ if (!messenger) {
return;
}
- const { brandId, content = '' } = message.messenger;
-
- const user = await Users.findOne({ _id: fromUserId });
-
- if (!user) {
- throw new Error('User not found');
- }
+ const { brandId, content } = messenger;
// find integration
const integration = await Integrations.findOne({
brandId,
- kind: INTEGRATION_KIND_CHOICES.MESSENGER,
+ kind: KIND_CHOICES.MESSENGER,
});
if (integration === null) {
throw new Error('Integration not found');
}
- // find matched customers
- const customers = await findCustomers({ customerIds, segmentIds, tagIds, brandIds });
+ const bulkSize = 1000;
+
+ let iteratorCounter = 0;
+ let conversationsBulk = Conversations.collection.initializeOrderedBulkOp();
+ let conversationMessagesBulk = ConversationMessages.collection.initializeOrderedBulkOp();
+
+ const customerFields = { firstName: 1, lastName: 1, primaryEmail: 1 };
+ const customersStream = (Customers.find(customersSelector, customerFields) as any).stream();
- // save matched customer ids
- EngageMessages.setCustomerIds(message._id, customers);
+ const executeBulks = () => {
+ return new Promise((resolve, reject) => {
+ /* istanbul ignore next */
+ conversationsBulk.execute(err => {
+ if (err) {
+ if (err.message === 'Invalid Operation, no operations specified') {
+ debugBase(`Error during execute bulk ${err.message}`);
+ return resolve('done');
+ }
+
+ return reject(err);
+ }
+
+ conversationMessagesBulk.execute(msgErr => {
+ if (msgErr) {
+ return reject(msgErr);
+ }
+
+ conversationsBulk = Conversations.collection.initializeOrderedBulkOp();
+ conversationMessagesBulk = ConversationMessages.collection.initializeOrderedBulkOp();
+
+ resolve('done');
+ });
+ });
+ });
+ };
+
+ const createConversations = async (customer: ICustomerDocument) => {
+ iteratorCounter++;
- for (const customer of customers) {
// replace keys in content
- const replacedContent = replaceKeys({ content, customer, user });
+ const { replacedContent } = await replaceEditorAttributes({ content, customer, user });
+
+ const now = new Date();
+ const conversationId = Random.id();
+
// create conversation
- const conversation = await Conversations.createConversation({
+ conversationsBulk.insert({
+ _id: conversationId,
+ status: CONVERSATION_STATUSES.NEW,
+ createdAt: now,
+ updatedAt: now,
userId: fromUserId,
customerId: customer._id,
integrationId: integration._id,
content: replacedContent,
+ messageCount: 1,
});
// create message
- await ConversationMessages.createMessage({
+ conversationMessagesBulk.insert({
engageData: {
- messageId: message._id,
+ engageKind: 'auto',
+ messageId: _id,
fromUserId,
- ...message.messenger.toJSON(),
+ ...(messenger ? messenger.toJSON() : {}),
},
- conversationId: conversation._id,
+ internal: false,
+ conversationId,
userId: fromUserId,
customerId: customer._id,
content: replacedContent,
});
- }
-};
-/*
- * Send engage messages
- */
-export const send = (message: IEngageMessageDocument) => {
- const { method, kind } = message;
+ /* istanbul ignore next */
+ if (iteratorCounter % bulkSize === 0) {
+ customersStream.pause();
- if (method === METHODS.EMAIL) {
- return sendViaEmail(message);
- }
+ await executeBulks();
- // when kind is visitor auto, do not do anything
- if (method === METHODS.MESSENGER && kind !== MESSAGE_KINDS.VISITOR_AUTO) {
- return sendViaMessenger(message);
- }
-};
+ customersStream.resume();
+ }
+ };
-/*
- * Handle engage unsubscribe request
- */
-export const handleEngageUnSubscribe = (query: { cid: string }) =>
- Customers.updateOne({ _id: query.cid }, { $set: { doNotDisturb: 'Yes' } });
+ const streamConversationWriter = new Writable({
+ objectMode: true,
-export const utils = {
- executeSendViaEmail,
-};
+ async write(data, _encoding, callback) {
+ await createConversations(data);
-export default {
- replaceKeys,
- send,
-};
+ callback();
+ },
+ });
+
+ return new Promise(resolve => {
+ const pipe = customersStream.pipe(streamConversationWriter);
+
+ pipe.on('finish', async () => {
+ // save matched customers count
+ await EngageMessages.setCustomersCount(_id, 'totalCustomersCount', iteratorCounter);
+
+ if (iteratorCounter % bulkSize !== 0) {
+ await executeBulks();
+ }
+
+ resolve('done');
+ });
+ });
+}; // end sendViaMessenger()
diff --git a/src/data/resolvers/mutations/engages.ts b/src/data/resolvers/mutations/engages.ts
index 13e5e08a7..8a30fa0de 100644
--- a/src/data/resolvers/mutations/engages.ts
+++ b/src/data/resolvers/mutations/engages.ts
@@ -1,57 +1,61 @@
-import { EngageMessages, Users } from '../../../db/models';
+import * as _ from 'underscore';
+import { EngageMessages } from '../../../db/models';
import { METHODS } from '../../../db/models/definitions/constants';
import { IEngageMessage } from '../../../db/models/definitions/engages';
-import { IUserDocument } from '../../../db/models/definitions/users';
-import { awsRequests } from '../../../trackers/engageTracker';
-import { MESSAGE_KINDS } from '../../constants';
+import { MESSAGE_KINDS, MODULE_NAMES } from '../../constants';
+import { putCreateLog, putDeleteLog, putUpdateLog } from '../../logUtils';
import { checkPermission } from '../../permissions/wrappers';
-import { fetchCronsApi, getEnv, putCreateLog, putDeleteLog, putUpdateLog } from '../../utils';
+import { IContext } from '../../types';
+import { registerOnboardHistory, sendToWebhook } from '../../utils';
import { send } from './engageUtils';
interface IEngageMessageEdit extends IEngageMessage {
_id: string;
}
+/**
+ * These fields contain too much data & it's inappropriate
+ * to save such data in each log row
+ */
+const emptyCustomers = {
+ customerIds: [],
+ messengerReceivedCustomerIds: [],
+};
+
const engageMutations = {
/**
* Create new message
*/
- async engageMessageAdd(_root, doc: IEngageMessage, { user }: { user: IUserDocument }) {
- const { method, fromUserId } = doc;
-
- if (method === METHODS.EMAIL) {
- // Checking if configs exist
- getEnv({ name: 'AWS_SES_CONFIG_SET' });
- getEnv({ name: 'AWS_ENDPOINT' });
-
- const fromUser = await Users.findOne({ _id: fromUserId });
-
- const { VerifiedEmailAddresses = [] } = await awsRequests.getVerifiedEmails();
+ async engageMessageAdd(_root, doc: IEngageMessage, { user, docModifier }: IContext) {
+ if (doc.kind !== MESSAGE_KINDS.MANUAL && doc.method === METHODS.SMS) {
+ throw new Error(`SMS engage message of kind ${doc.kind} is not supported`);
+ }
- // If verified creates engagemessage
- if (fromUser && !VerifiedEmailAddresses.includes(fromUser.email)) {
- throw new Error('Email not verified');
- }
+ // fromUserId is not required in sms engage, so set it here
+ if (!doc.fromUserId) {
+ doc.fromUserId = user._id;
}
- const engageMessage = await EngageMessages.createEngageMessage(doc);
+ const engageMessage = await EngageMessages.createEngageMessage(docModifier(doc));
- // if manual and live then send immediately
- if (doc.kind === MESSAGE_KINDS.MANUAL && doc.isLive) {
- await send(engageMessage);
- }
+ await sendToWebhook('create', 'engageMessages', engageMessage);
+
+ await send(engageMessage);
- if (engageMessage) {
- await putCreateLog(
- {
- type: 'engage',
- newData: JSON.stringify(doc),
- object: engageMessage,
- description: `${engageMessage.title} has been created`,
+ await putCreateLog(
+ {
+ type: MODULE_NAMES.ENGAGE,
+ newData: {
+ ...doc,
+ ...emptyCustomers,
},
- user,
- );
- }
+ object: {
+ ...engageMessage.toObject(),
+ ...emptyCustomers,
+ },
+ },
+ user,
+ );
return engageMessage;
},
@@ -59,23 +63,19 @@ const engageMutations = {
/**
* Edit message
*/
- async engageMessageEdit(_root, { _id, ...doc }: IEngageMessageEdit, { user }: { user: IUserDocument }) {
- const engageMessage = await EngageMessages.findOne({ _id });
+ async engageMessageEdit(_root, { _id, ...doc }: IEngageMessageEdit, { user }: IContext) {
+ const engageMessage = await EngageMessages.getEngageMessage(_id);
const updated = await EngageMessages.updateEngageMessage(_id, doc);
- await fetchCronsApi({ path: '/update-or-remove-schedule', method: 'POST', body: { _id, update: 'true' } });
-
- if (engageMessage) {
- await putUpdateLog(
- {
- type: 'engage',
- object: engageMessage,
- newData: JSON.stringify(updated),
- description: `${engageMessage.title} has been edited`,
- },
- user,
- );
- }
+ await putUpdateLog(
+ {
+ type: MODULE_NAMES.ENGAGE,
+ object: { ...engageMessage.toObject(), ...emptyCustomers },
+ newData: { ...updated.toObject(), ...emptyCustomers },
+ updatedDocument: updated,
+ },
+ user,
+ );
return EngageMessages.findOne({ _id });
},
@@ -83,23 +83,18 @@ const engageMutations = {
/**
* Remove message
*/
- async engageMessageRemove(_root, { _id }: { _id: string }, { user }: { user: IUserDocument }) {
- const engageMessage = await EngageMessages.findOne({ _id });
-
- await fetchCronsApi({ path: '/update-or-remove-schedule', method: 'POST', body: { _id } });
+ async engageMessageRemove(_root, { _id }: { _id: string }, { user }: IContext) {
+ const engageMessage = await EngageMessages.getEngageMessage(_id);
const removed = await EngageMessages.removeEngageMessage(_id);
- if (engageMessage) {
- await putDeleteLog(
- {
- type: 'engage',
- object: engageMessage,
- description: `${engageMessage.title} has been removed`,
- },
- user,
- );
- }
+ await putDeleteLog(
+ {
+ type: MODULE_NAMES.ENGAGE,
+ object: { ...engageMessage.toObject(), ...emptyCustomers },
+ },
+ user,
+ );
return removed;
},
@@ -107,20 +102,8 @@ const engageMutations = {
/**
* Engage message set live
*/
- async engageMessageSetLive(_root, { _id }: { _id: string }) {
- const engageMessage = await EngageMessages.engageMessageSetLive(_id);
-
- const { kind } = engageMessage;
-
- if (kind === MESSAGE_KINDS.AUTO || kind === MESSAGE_KINDS.VISITOR_AUTO) {
- await fetchCronsApi({
- path: '/create-schedule',
- method: 'POST',
- body: { message: JSON.stringify(engageMessage) },
- });
- }
-
- return engageMessage;
+ engageMessageSetLive(_root, { _id }: { _id: string }) {
+ return EngageMessages.engageMessageSetLive(_id);
},
/**
@@ -133,12 +116,34 @@ const engageMutations = {
/**
* Engage message set live manual
*/
- async engageMessageSetLiveManual(_root, { _id }: { _id: string }) {
- const engageMessage = await EngageMessages.engageMessageSetLive(_id);
+ engageMessageSetLiveManual(_root, { _id }: { _id: string }) {
+ return EngageMessages.engageMessageSetLive(_id);
+ },
- await send(engageMessage);
+ engagesUpdateConfigs(_root, configsMap, { dataSources }: IContext) {
+ return dataSources.EngagesAPI.engagesUpdateConfigs(configsMap);
+ },
- return engageMessage;
+ /**
+ * Engage message verify email
+ */
+ async engageMessageVerifyEmail(_root, { email }: { email: string }, { dataSources, user }: IContext) {
+ await registerOnboardHistory({ type: 'engageVerifyEmail', user });
+
+ return dataSources.EngagesAPI.engagesVerifyEmail({ email });
+ },
+
+ /**
+ * Engage message remove verified email
+ */
+ engageMessageRemoveVerifiedEmail(_root, { email }: { email: string }, { dataSources }: IContext) {
+ return dataSources.EngagesAPI.engagesRemoveVerifiedEmail({ email });
+ },
+
+ async engageMessageSendTestEmail(_root, args, { dataSources, user }: IContext) {
+ await registerOnboardHistory({ type: 'engageSendTestEmail', user });
+
+ return dataSources.EngagesAPI.engagesSendTestEmail(args);
},
};
@@ -148,5 +153,8 @@ checkPermission(engageMutations, 'engageMessageRemove', 'engageMessageRemove');
checkPermission(engageMutations, 'engageMessageSetLive', 'engageMessageSetLive');
checkPermission(engageMutations, 'engageMessageSetPause', 'engageMessageSetPause');
checkPermission(engageMutations, 'engageMessageSetLiveManual', 'engageMessageSetLiveManual');
+checkPermission(engageMutations, 'engageMessageVerifyEmail', 'engageMessageRemove');
+checkPermission(engageMutations, 'engageMessageRemoveVerifiedEmail', 'engageMessageRemove');
+checkPermission(engageMutations, 'engageMessageSendTestEmail', 'engageMessageRemove');
export default engageMutations;
diff --git a/src/data/resolvers/mutations/fields.ts b/src/data/resolvers/mutations/fields.ts
index dcb2c3c67..fee9c1353 100644
--- a/src/data/resolvers/mutations/fields.ts
+++ b/src/data/resolvers/mutations/fields.ts
@@ -1,8 +1,10 @@
import { Fields, FieldsGroups } from '../../../db/models';
import { IField, IFieldGroup } from '../../../db/models/definitions/fields';
-import { IUserDocument } from '../../../db/models/definitions/users';
import { IOrderInput } from '../../../db/models/Fields';
+import { MODULE_NAMES } from '../../constants';
+import { putCreateLog } from '../../logUtils';
import { moduleCheckPermission } from '../../permissions/wrappers';
+import { IContext } from '../../types';
interface IFieldsEdit extends IField {
_id: string;
@@ -16,14 +18,25 @@ const fieldMutations = {
/**
* Adds field object
*/
- fieldsAdd(_root, args: IField, { user }: { user: IUserDocument }) {
- return Fields.createField({ ...args, lastUpdatedUserId: user._id });
+ async fieldsAdd(_root, args: IField, { user }: IContext) {
+ const field = await Fields.createField({ ...args, lastUpdatedUserId: user._id });
+
+ await putCreateLog(
+ {
+ type: MODULE_NAMES.FIELD,
+ newData: args,
+ object: field,
+ },
+ user,
+ );
+
+ return field;
},
/**
* Updates field object
*/
- fieldsEdit(_root, { _id, ...doc }: IFieldsEdit, { user }: { user: IUserDocument }) {
+ fieldsEdit(_root, { _id, ...doc }: IFieldsEdit, { user }: IContext) {
return Fields.updateField(_id, { ...doc, lastUpdatedUserId: user._id });
},
@@ -44,11 +57,7 @@ const fieldMutations = {
/**
* Update field's visible
*/
- fieldsUpdateVisible(
- _root,
- { _id, isVisible }: { _id: string; isVisible: boolean },
- { user }: { user: IUserDocument },
- ) {
+ fieldsUpdateVisible(_root, { _id, isVisible }: { _id: string; isVisible: boolean }, { user }: IContext) {
return Fields.updateFieldsVisible(_id, isVisible, user._id);
},
};
@@ -57,14 +66,14 @@ const fieldsGroupsMutations = {
/**
* Create a new group for fields
*/
- fieldsGroupsAdd(_root, doc: IFieldGroup, { user }: { user: IUserDocument }) {
- return FieldsGroups.createGroup({ ...doc, lastUpdatedUserId: user._id });
+ fieldsGroupsAdd(_root, doc: IFieldGroup, { user, docModifier }: IContext) {
+ return FieldsGroups.createGroup(docModifier({ ...doc, lastUpdatedUserId: user._id }));
},
/**
* Update group for fields
*/
- fieldsGroupsEdit(_root, { _id, ...doc }: IFieldsGroupsEdit, { user }: { user: IUserDocument }) {
+ fieldsGroupsEdit(_root, { _id, ...doc }: IFieldsGroupsEdit, { user }: IContext) {
return FieldsGroups.updateGroup(_id, {
...doc,
lastUpdatedUserId: user._id,
@@ -81,16 +90,12 @@ const fieldsGroupsMutations = {
/**
* Update field group's visible
*/
- fieldsGroupsUpdateVisible(
- _root,
- { _id, isVisible }: { _id: string; isVisible: boolean },
- { user }: { user: IUserDocument },
- ) {
+ fieldsGroupsUpdateVisible(_root, { _id, isVisible }: { _id: string; isVisible: boolean }, { user }: IContext) {
return FieldsGroups.updateGroupVisible(_id, isVisible, user._id);
},
};
-moduleCheckPermission(fieldMutations, 'manageFields');
-moduleCheckPermission(fieldsGroupsMutations, 'manageFieldsGroups');
+moduleCheckPermission(fieldMutations, 'manageForms');
+moduleCheckPermission(fieldsGroupsMutations, 'manageForms');
export { fieldsGroupsMutations, fieldMutations };
diff --git a/src/data/resolvers/mutations/forms.ts b/src/data/resolvers/mutations/forms.ts
index aaf003495..41eaeb7a1 100644
--- a/src/data/resolvers/mutations/forms.ts
+++ b/src/data/resolvers/mutations/forms.ts
@@ -1,26 +1,62 @@
-import { Forms } from '../../../db/models';
+import { Fields, Forms, FormSubmissions } from '../../../db/models';
import { IForm } from '../../../db/models/definitions/forms';
-import { IUserDocument } from '../../../db/models/definitions/users';
import { moduleCheckPermission } from '../../permissions/wrappers';
+import { IContext } from '../../types';
interface IFormsEdit extends IForm {
_id: string;
}
+interface IFormSubmission {
+ contentType: string;
+ contentTypeId: string;
+ formSubmissions: { [key: string]: JSON };
+ formId: string;
+}
+
const formMutations = {
/**
* Create a new form
*/
- formsAdd(_root, doc: IForm, { user }: { user: IUserDocument }) {
- return Forms.createForm(doc, user._id);
+ formsAdd(_root, doc: IForm, { user, docModifier }: IContext) {
+ return Forms.createForm(docModifier(doc), user._id);
},
/**
- * Update form data
+ * Update a form data
*/
formsEdit(_root, { _id, ...doc }: IFormsEdit) {
return Forms.updateForm(_id, doc);
},
+
+ /**
+ * Create a form submission data
+ */
+ async formSubmissionsSave(_root, { formId, contentTypeId, contentType, formSubmissions }: IFormSubmission) {
+ const cleanedFormSubmissions = await Fields.cleanMulti(formSubmissions || {});
+
+ for (const formFieldId of Object.keys(cleanedFormSubmissions)) {
+ const formSubmission = await FormSubmissions.findOne({ contentTypeId, contentType, formFieldId });
+
+ if (formSubmission) {
+ formSubmission.value = cleanedFormSubmissions[formFieldId];
+
+ formSubmission.save();
+ } else {
+ const doc = {
+ contentTypeId,
+ contentType,
+ formFieldId,
+ formId,
+ value: formSubmissions[formFieldId],
+ };
+
+ FormSubmissions.createFormSubmission(doc);
+ }
+ }
+
+ return true;
+ },
};
moduleCheckPermission(formMutations, 'manageForms');
diff --git a/src/data/resolvers/mutations/growthHacks.ts b/src/data/resolvers/mutations/growthHacks.ts
new file mode 100644
index 000000000..1280a9016
--- /dev/null
+++ b/src/data/resolvers/mutations/growthHacks.ts
@@ -0,0 +1,83 @@
+import { GrowthHacks } from '../../../db/models';
+import { IItemDragCommonFields } from '../../../db/models/definitions/boards';
+import { IGrowthHack } from '../../../db/models/definitions/growthHacks';
+import { IUserDocument } from '../../../db/models/definitions/users';
+import { checkPermission } from '../../permissions/wrappers';
+import { IContext } from '../../types';
+import { itemsAdd, itemsArchive, itemsChange, itemsCopy, itemsEdit, itemsRemove } from './boardUtils';
+
+interface IGrowthHacksEdit extends IGrowthHack {
+ _id: string;
+}
+
+const growthHackMutations = {
+ /**
+ * Create new growth hack
+ */
+ async growthHacksAdd(
+ _root,
+ doc: IGrowthHack & { proccessId: string; aboveItemId: string },
+ { user, docModifier }: IContext,
+ ) {
+ return itemsAdd(doc, 'growthHack', user, docModifier, GrowthHacks.createGrowthHack);
+ },
+
+ /**
+ * Edit a growth hack
+ */
+ async growthHacksEdit(_root, { _id, proccessId, ...doc }: IGrowthHacksEdit & { proccessId: string }, { user }) {
+ const oldGrowthHack = await GrowthHacks.getGrowthHack(_id);
+
+ return itemsEdit(_id, 'growthHack', oldGrowthHack, doc, proccessId, user, GrowthHacks.updateGrowthHack);
+ },
+
+ /**
+ * Change a growth hack
+ */
+ async growthHacksChange(_root, doc: IItemDragCommonFields, { user }: IContext) {
+ return itemsChange(doc, 'growthHack', user, GrowthHacks.updateGrowthHack);
+ },
+
+ /**
+ * Remove a growth hack
+ */
+ async growthHacksRemove(_root, { _id }: { _id: string }, { user }: { user: IUserDocument }) {
+ return itemsRemove(_id, 'growthHack', user);
+ },
+
+ /**
+ * Watch a growth hack
+ */
+ growthHacksWatch(_root, { _id, isAdd }: { _id: string; isAdd: boolean }, { user }: { user: IUserDocument }) {
+ return GrowthHacks.watchGrowthHack(_id, isAdd, user._id);
+ },
+
+ /**
+ * Vote a growth hack
+ */
+ growthHacksVote(_root, { _id, isVote }: { _id: string; isVote: boolean }, { user }: { user: IUserDocument }) {
+ return GrowthHacks.voteGrowthHack(_id, isVote, user._id);
+ },
+
+ async growthHacksCopy(_root, { _id, proccessId }: { _id: string; proccessId: string }, { user }: IContext) {
+ const extraDocs = ['votedUserIds', 'voteCount', 'hackStages', 'reach', 'impact', 'confidence', 'ease'];
+
+ return itemsCopy(_id, proccessId, 'growthHack', user, extraDocs, GrowthHacks.createGrowthHack);
+ },
+
+ async growthHacksArchive(
+ _root,
+ { stageId, proccessId }: { stageId: string; proccessId: string },
+ { user }: IContext,
+ ) {
+ return itemsArchive(stageId, 'growthHack', proccessId, user);
+ },
+};
+
+checkPermission(growthHackMutations, 'growthHacksAdd', 'growthHacksAdd');
+checkPermission(growthHackMutations, 'growthHacksEdit', 'growthHacksEdit');
+checkPermission(growthHackMutations, 'growthHacksRemove', 'growthHacksRemove');
+checkPermission(growthHackMutations, 'growthHacksWatch', 'growthHacksWatch');
+checkPermission(growthHackMutations, 'growthHacksArchive', 'growthHacksArchive');
+
+export default growthHackMutations;
diff --git a/src/data/resolvers/mutations/importHistory.ts b/src/data/resolvers/mutations/importHistory.ts
index ec664bbd9..b1a189ff3 100644
--- a/src/data/resolvers/mutations/importHistory.ts
+++ b/src/data/resolvers/mutations/importHistory.ts
@@ -1,40 +1,31 @@
import { ImportHistory } from '../../../db/models';
-import { IUserDocument } from '../../../db/models/definitions/users';
+import messageBroker from '../../../messageBroker';
+import { MODULE_NAMES, RABBITMQ_QUEUES } from '../../constants';
+import { putDeleteLog } from '../../logUtils';
import { checkPermission } from '../../permissions/wrappers';
-import { fetchWorkersApi, putDeleteLog } from '../../utils';
+import { IContext } from '../../types';
const importHistoryMutations = {
/**
* Removes a history
* @param {string} param1._id ImportHistory id
*/
- async importHistoriesRemove(_root, { _id }: { _id: string }, { user }: { user: IUserDocument }) {
- const importHistory = await ImportHistory.findOne({ _id });
-
- if (!importHistory) {
- throw new Error('History not found');
- }
+ async importHistoriesRemove(_root, { _id }: { _id: string }, { user }: IContext) {
+ const importHistory = await ImportHistory.getImportHistory(_id);
await ImportHistory.updateOne({ _id: importHistory._id }, { $set: { status: 'Removing' } });
- await fetchWorkersApi({
- path: '/import-remove',
- method: 'POST',
- body: {
- targetIds: JSON.stringify(importHistory.ids || []),
- contentType: importHistory.contentType,
- importHistoryId: importHistory._id,
- },
+ const response = await messageBroker().sendRPCMessage(RABBITMQ_QUEUES.RPC_API_TO_WORKERS, {
+ action: 'removeImport',
+ contentType: importHistory.contentType,
+ importHistoryId: importHistory._id,
});
- await putDeleteLog(
- {
- type: 'importHistory',
- object: importHistory,
- description: `${importHistory._id}-${importHistory.date} has been removed`,
- },
- user,
- );
+ if (response.status === 'ok') {
+ await putDeleteLog({ type: MODULE_NAMES.IMPORT_HISTORY, object: importHistory }, user);
+ } else {
+ throw new Error(response.message);
+ }
return ImportHistory.findOne({ _id: importHistory._id });
},
@@ -42,14 +33,10 @@ const importHistoryMutations = {
/**
* Cancel uploading process
*/
- async importHistoriesCancel(_root, { _id }: { _id: string }) {
- const importHistory = await ImportHistory.findOne({ _id });
-
- if (!importHistory) {
- throw new Error('History not found');
- }
-
- await fetchWorkersApi({ path: '/import-cancel', method: 'POST' });
+ async importHistoriesCancel(_root) {
+ await messageBroker().sendMessage(RABBITMQ_QUEUES.WORKERS, {
+ type: 'cancelImport',
+ });
return true;
},
diff --git a/src/data/resolvers/mutations/index.ts b/src/data/resolvers/mutations/index.ts
index 544e2e44d..81d02ede3 100644
--- a/src/data/resolvers/mutations/index.ts
+++ b/src/data/resolvers/mutations/index.ts
@@ -1,8 +1,10 @@
import boards from './boards';
import brands from './brands';
import channels from './channels';
+import checklists from './checklists';
import companies from './companies';
import configs from './configs';
+import conformity from './conformities';
import conversations from './conversations';
import customers from './customers';
import deals from './deals';
@@ -10,6 +12,7 @@ import emailTemplates from './emailTemplates';
import engages from './engages';
import { fieldMutations as fields, fieldsGroupsMutations as fieldsgroups } from './fields';
import forms from './forms';
+import growthHacks from './growthHacks';
import importHistory from './importHistory';
import integrations from './integrations';
import internalNotes from './internalNotes';
@@ -17,14 +20,19 @@ import knowledgeBase from './knowledgeBase';
import messengerApps from './messengerApps';
import notifications from './notifications';
import { permissionMutations as permissions, usersGroupMutations as usersGroups } from './permissions';
+import pipelineLabels from './pipelineLabels';
+import pipelineTemplates from './pipelineTemplates';
import products from './products';
import responseTemplates from './responseTemplates';
+import robot from './robot';
import scripts from './scripts';
import segments from './segments';
import tags from './tags';
import tasks from './tasks';
import tickets from './tickets';
import users from './users';
+import webhooks from './webhooks';
+import widgets from './widgets';
export default {
...users,
@@ -49,6 +57,7 @@ export default {
...boards,
...products,
...configs,
+ ...conformity,
...fieldsgroups,
...importHistory,
...messengerApps,
@@ -56,4 +65,11 @@ export default {
...usersGroups,
...tickets,
...tasks,
+ ...growthHacks,
+ ...pipelineLabels,
+ ...pipelineTemplates,
+ ...checklists,
+ ...robot,
+ ...widgets,
+ ...webhooks,
};
diff --git a/src/data/resolvers/mutations/integrations.ts b/src/data/resolvers/mutations/integrations.ts
index ab5e28903..40ceac4c2 100644
--- a/src/data/resolvers/mutations/integrations.ts
+++ b/src/data/resolvers/mutations/integrations.ts
@@ -1,63 +1,82 @@
-import { Integrations } from '../../../db/models';
+import * as telemetry from 'erxes-telemetry';
+import { getUniqueValue } from '../../../db/factories';
+import { Channels, Customers, EmailDeliveries, Integrations } from '../../../db/models';
+import { KIND_CHOICES } from '../../../db/models/definitions/constants';
import { IIntegration, IMessengerData, IUiOptions } from '../../../db/models/definitions/integrations';
-import { IUserDocument } from '../../../db/models/definitions/users';
-import { IExternalIntegrationParams, IMessengerIntegration } from '../../../db/models/Integrations';
+import { IExternalIntegrationParams } from '../../../db/models/Integrations';
+import { debugExternalApi } from '../../../debuggers';
+import messageBroker from '../../../messageBroker';
+import { MODULE_NAMES, RABBITMQ_QUEUES } from '../../constants';
+import { putCreateLog, putDeleteLog, putUpdateLog } from '../../logUtils';
import { checkPermission } from '../../permissions/wrappers';
-import { fetchIntegrationApi, putCreateLog, putDeleteLog, putUpdateLog } from '../../utils';
+import { IContext } from '../../types';
+import { registerOnboardHistory, replaceEditorAttributes } from '../../utils';
-interface IEditMessengerIntegration extends IMessengerIntegration {
+interface IEditIntegration extends IIntegration {
_id: string;
}
-interface IEditFormIntegration extends IIntegration {
+interface IArchiveParams {
_id: string;
+ status: boolean;
+}
+
+interface ISmsParams {
+ integrationId: string;
+ content: string;
+ to: string;
}
const integrationMutations = {
/**
- * Create a new messenger integration
+ * Creates a new messenger integration
*/
- async integrationsCreateMessengerIntegration(_root, doc: IMessengerIntegration, { user }: { user: IUserDocument }) {
- const integration = await Integrations.createMessengerIntegration(doc);
+ async integrationsCreateMessengerIntegration(_root, doc: IIntegration, { user }: IContext) {
+ const integration = await Integrations.createMessengerIntegration(doc, user._id);
- if (integration) {
- await putCreateLog(
- {
- type: 'integration',
- newData: JSON.stringify(doc),
- object: integration,
- description: `${integration.name} has been created`,
- },
- user,
- );
+ if (doc.channelIds) {
+ await Channels.updateMany({ _id: { $in: doc.channelIds } }, { $push: { integrationIds: integration._id } });
}
+ await putCreateLog(
+ {
+ type: MODULE_NAMES.INTEGRATION,
+ newData: { ...doc, createdUserId: user._id, isActive: true },
+ object: integration,
+ },
+ user,
+ );
+
+ telemetry.trackCli('integration_created', { type: 'messenger' });
+
+ await registerOnboardHistory({ type: 'messengerIntegrationCreate', user });
+
return integration;
},
/**
- * Update messenger integration
+ * Updates a messenger integration
*/
- async integrationsEditMessengerIntegration(
- _root,
- { _id, ...fields }: IEditMessengerIntegration,
- { user }: { user: IUserDocument },
- ) {
- const integration = await Integrations.findOne({ _id });
+ async integrationsEditMessengerIntegration(_root, { _id, ...fields }: IEditIntegration, { user }: IContext) {
+ const integration = await Integrations.getIntegration(_id);
const updated = await Integrations.updateMessengerIntegration(_id, fields);
- if (integration) {
- await putUpdateLog(
- {
- type: 'integration',
- object: integration,
- newData: JSON.stringify(fields),
- description: `${integration.name} has been edited`,
- },
- user,
- );
+ await Channels.updateMany({ integrationIds: integration._id }, { $pull: { integrationIds: integration._id } });
+
+ if (fields.channelIds) {
+ await Channels.updateMany({ _id: { $in: fields.channelIds } }, { $push: { integrationIds: integration._id } });
}
+ await putUpdateLog(
+ {
+ type: MODULE_NAMES.INTEGRATION,
+ object: integration,
+ newData: fields,
+ updatedDocument: updated,
+ },
+ user,
+ );
+
return updated;
},
@@ -78,33 +97,91 @@ const integrationMutations = {
/**
* Create a new messenger integration
*/
- integrationsCreateFormIntegration(_root, doc: IIntegration) {
- return Integrations.createFormIntegration(doc);
+ async integrationsCreateLeadIntegration(_root, doc: IIntegration, { user }: IContext) {
+ const integration = await Integrations.createLeadIntegration(doc, user._id);
+
+ await putCreateLog(
+ {
+ type: MODULE_NAMES.INTEGRATION,
+ newData: { ...doc, createdUserId: user._id, isActive: true },
+ object: integration,
+ },
+ user,
+ );
+
+ telemetry.trackCli('integration_created', { type: 'lead' });
+
+ await registerOnboardHistory({ type: 'leadIntegrationCreate', user });
+
+ return integration;
},
/**
- * Edit a form integration
+ * Edit a lead integration
*/
- integrationsEditFormIntegration(_root, { _id, ...doc }: IEditFormIntegration) {
- return Integrations.updateFormIntegration(_id, doc);
+ integrationsEditLeadIntegration(_root, { _id, ...doc }: IEditIntegration) {
+ return Integrations.updateLeadIntegration(_id, doc);
},
- /*
+ /**
* Create external integrations like twitter, facebook, gmail etc ...
*/
- async integrationsCreateExternalIntegration(_root, { data, ...doc }: IExternalIntegrationParams & { data: object }) {
- const integration = await Integrations.createExternalIntegration(doc);
+ async integrationsCreateExternalIntegration(
+ _root,
+ { data, ...doc }: IExternalIntegrationParams & { data: object },
+ { user, dataSources }: IContext,
+ ) {
+ const modifiedDoc: any = { ...doc };
+
+ if (modifiedDoc.kind === KIND_CHOICES.WEBHOOK) {
+ modifiedDoc.webhookData = { ...data };
+ modifiedDoc.webhookData.token = await getUniqueValue(Integrations, 'token');
+ }
+
+ const integration = await Integrations.createExternalIntegration(modifiedDoc, user._id);
+
+ if (doc.channelIds) {
+ await Channels.updateMany({ _id: { $in: doc.channelIds } }, { $push: { integrationIds: integration._id } });
+ }
+
+ let kind = doc.kind;
+
+ if (kind.includes('nylas')) {
+ kind = 'nylas';
+ }
+
+ if (kind.includes('facebook')) {
+ kind = 'facebook';
+ }
+
+ if (kind === 'twitter-dm') {
+ kind = 'twitter';
+ }
+
+ if (kind.includes('smooch')) {
+ kind = 'smooch';
+ }
try {
- await fetchIntegrationApi({
- path: `/${doc.kind}/create-integration`,
- method: 'POST',
- body: {
+ if (KIND_CHOICES.WEBHOOK !== kind) {
+ await dataSources.IntegrationsAPI.createIntegration(kind, {
accountId: doc.accountId,
+ kind: doc.kind,
integrationId: integration._id,
data: data ? JSON.stringify(data) : '',
+ });
+ }
+
+ telemetry.trackCli('integration_created', { type: doc.kind });
+
+ await putCreateLog(
+ {
+ type: MODULE_NAMES.INTEGRATION,
+ newData: { ...doc, createdUserId: user._id, isActive: true },
+ object: integration,
},
- });
+ user,
+ );
} catch (e) {
await Integrations.remove({ _id: integration._id });
throw new Error(e);
@@ -113,41 +190,166 @@ const integrationMutations = {
return integration;
},
+ async integrationsEditCommonFields(_root, { _id, name, brandId, channelIds, data }, { user }) {
+ const integration = await Integrations.getIntegration(_id);
+
+ const doc: any = { name, brandId, data };
+
+ switch (integration.kind) {
+ case KIND_CHOICES.WEBHOOK: {
+ doc.webhookData = data;
+
+ break;
+ }
+ }
+
+ await Integrations.update({ _id }, { $set: doc });
+ const updated = await Integrations.getIntegration(_id);
+
+ await Channels.updateMany({ integrationIds: integration._id }, { $pull: { integrationIds: integration._id } });
+
+ if (channelIds) {
+ await Channels.updateMany({ _id: { $in: channelIds } }, { $push: { integrationIds: integration._id } });
+ }
+
+ await putUpdateLog(
+ {
+ type: MODULE_NAMES.INTEGRATION,
+ object: { name: integration.name, brandId: integration.brandId },
+ newData: { name, brandId },
+ updatedDocument: updated,
+ },
+ user,
+ );
+
+ return updated;
+ },
+
/**
- * Delete an integration
+ * Deletes an integration
*/
- async integrationsRemove(_root, { _id }: { _id: string }, { user }: { user: IUserDocument }) {
- const integration = await Integrations.findOne({ _id });
-
- if (integration) {
- if (integration.kind === 'facebook') {
- await fetchIntegrationApi({
- path: '/integrations/remove',
- method: 'POST',
- body: {
- integrationId: _id,
- },
- });
+ async integrationsRemove(_root, { _id }: { _id: string }, { user, dataSources }: IContext) {
+ const integration = await Integrations.getIntegration(_id);
+
+ try {
+ if (
+ [
+ 'facebook-messenger',
+ 'facebook-post',
+ 'gmail',
+ 'callpro',
+ 'nylas-gmail',
+ 'nylas-imap',
+ 'nylas-office365',
+ 'nylas-outlook',
+ 'nylas-exchange',
+ 'nylas-yahoo',
+ 'chatfuel',
+ 'twitter-dm',
+ 'smooch-viber',
+ 'smooch-telegram',
+ 'smooch-line',
+ 'smooch-twilio',
+ 'whatsapp',
+ 'telnyx',
+ ].includes(integration.kind)
+ ) {
+ await dataSources.IntegrationsAPI.removeIntegration({ integrationId: _id });
}
- await putDeleteLog(
- {
- type: 'integration',
- object: integration,
- description: `${integration.name} has been removed`,
- },
- user,
- );
- }
+ await putDeleteLog({ type: MODULE_NAMES.INTEGRATION, object: integration }, user);
- return Integrations.removeIntegration(_id);
+ return Integrations.removeIntegration(_id);
+ } catch (e) {
+ debugExternalApi(e);
+ throw e;
+ }
},
/**
* Delete an account
*/
async integrationsRemoveAccount(_root, { _id }: { _id: string }) {
- return fetchIntegrationApi({ path: '/accounts/remove', method: 'post', body: { _id } });
+ try {
+ const { erxesApiIds } = await messageBroker().sendRPCMessage(RABBITMQ_QUEUES.RPC_API_TO_INTEGRATIONS, {
+ action: 'remove-account',
+ data: { _id },
+ });
+
+ for (const id of erxesApiIds) {
+ await Integrations.removeIntegration(id);
+ }
+
+ return 'success';
+ } catch (e) {
+ debugExternalApi(e);
+ throw e;
+ }
+ },
+
+ /**
+ * Send mail
+ */
+ async integrationSendMail(_root, args: any, { dataSources, user }: IContext) {
+ const { erxesApiId, body, customerId, ...doc } = args;
+
+ let kind = doc.kind;
+
+ if (kind.includes('nylas')) {
+ kind = 'nylas';
+ }
+
+ const customer = customerId ? await Customers.findOne({ _id: customerId }) : undefined;
+ const { replacedContent } = await replaceEditorAttributes({ content: body, user, customer: customer || undefined });
+
+ doc.body = replacedContent || '';
+
+ try {
+ await dataSources.IntegrationsAPI.sendEmail(kind, {
+ erxesApiId,
+ data: JSON.stringify(doc),
+ });
+ } catch (e) {
+ debugExternalApi(e);
+ throw e;
+ }
+
+ const customerIds = await Customers.find({ primaryEmail: { $in: doc.to } }).distinct('_id');
+
+ doc.userId = user._id;
+
+ for (const customerId of customerIds) {
+ await EmailDeliveries.createEmailDelivery({ ...doc, customerId });
+ }
+
+ return;
+ },
+
+ async integrationsArchive(_root, { _id, status }: IArchiveParams, { user }: IContext) {
+ const integration = await Integrations.getIntegration(_id);
+
+ const updated = await Integrations.updateOne({ _id }, { $set: { isActive: !status } });
+
+ await putUpdateLog(
+ {
+ type: MODULE_NAMES.INTEGRATION,
+ object: integration,
+ newData: { isActive: !status },
+ description: `"${integration.name}" has been ${status === true ? 'archived' : 'unarchived'}.`,
+ updatedDocument: updated,
+ },
+ user,
+ );
+
+ return Integrations.findOne({ _id });
+ },
+
+ async integrationsUpdateConfigs(_root, { configsMap }, { dataSources }: IContext) {
+ return dataSources.IntegrationsAPI.updateConfigs(configsMap);
+ },
+
+ async integrationsSendSms(_root, args: ISmsParams, { dataSources }: IContext) {
+ return dataSources.IntegrationsAPI.sendSms(args);
},
};
@@ -162,8 +364,11 @@ checkPermission(
'integrationsSaveMessengerAppearanceData',
);
checkPermission(integrationMutations, 'integrationsSaveMessengerConfigs', 'integrationsSaveMessengerConfigs');
-checkPermission(integrationMutations, 'integrationsCreateFormIntegration', 'integrationsCreateFormIntegration');
-checkPermission(integrationMutations, 'integrationsEditFormIntegration', 'integrationsEditFormIntegration');
+checkPermission(integrationMutations, 'integrationsCreateLeadIntegration', 'integrationsCreateLeadIntegration');
+checkPermission(integrationMutations, 'integrationsEditLeadIntegration', 'integrationsEditLeadIntegration');
checkPermission(integrationMutations, 'integrationsRemove', 'integrationsRemove');
+checkPermission(integrationMutations, 'integrationsArchive', 'integrationsArchive');
+checkPermission(integrationMutations, 'integrationsEditCommonFields', 'integrationsEdit');
+checkPermission(integrationMutations, 'integrationsUpdateConfigs', 'integrationsEdit');
export default integrationMutations;
diff --git a/src/data/resolvers/mutations/internalNotes.ts b/src/data/resolvers/mutations/internalNotes.ts
index 3abdb5465..5351d2826 100644
--- a/src/data/resolvers/mutations/internalNotes.ts
+++ b/src/data/resolvers/mutations/internalNotes.ts
@@ -1,96 +1,205 @@
-import { Deals, InternalNotes, Pipelines, Stages } from '../../../db/models';
-import { NOTIFICATION_TYPES } from '../../../db/models/definitions/constants';
+import {
+ Companies,
+ Customers,
+ Deals,
+ GrowthHacks,
+ InternalNotes,
+ Pipelines,
+ Products,
+ Stages,
+ Tasks,
+ Tickets,
+ Users,
+} from '../../../db/models';
+import { BOARD_TYPES, NOTIFICATION_CONTENT_TYPES, NOTIFICATION_TYPES } from '../../../db/models/definitions/constants';
+import { IDealDocument } from '../../../db/models/definitions/deals';
import { IInternalNote } from '../../../db/models/definitions/internalNotes';
-import { IUserDocument } from '../../../db/models/definitions/users';
+import { ITaskDocument } from '../../../db/models/definitions/tasks';
+import { ITicketDocument } from '../../../db/models/definitions/tickets';
+import { graphqlPubsub } from '../../../pubsub';
+import { MODULE_NAMES } from '../../constants';
+import { putCreateLog, putDeleteLog, putUpdateLog } from '../../logUtils';
import { moduleRequireLogin } from '../../permissions/wrappers';
-import utils, { putCreateLog, putDeleteLog, putUpdateLog } from '../../utils';
+import { IContext } from '../../types';
+import utils, { ISendNotification } from '../../utils';
+import { notifiedUserIds } from '../boardUtils';
interface IInternalNotesEdit extends IInternalNote {
_id: string;
}
+const sendNotificationOfItems = async (
+ item: IDealDocument | ITicketDocument | ITaskDocument,
+ doc: ISendNotification,
+ contentType: string,
+ excludeUserIds: string[],
+) => {
+ const notifDocItems = { ...doc };
+ const relatedReceivers = await notifiedUserIds(item);
+ notifDocItems.action = `added note in ${contentType}`;
+
+ notifDocItems.receivers = relatedReceivers.filter(id => {
+ return excludeUserIds.indexOf(id) < 0;
+ });
+
+ utils.sendNotification(notifDocItems);
+
+ graphqlPubsub.publish('activityLogsChanged', {});
+};
+
const internalNoteMutations = {
/**
* Adds internalNote object and also adds an activity log
*/
- async internalNotesAdd(_root, args: IInternalNote, { user }: { user: IUserDocument }) {
- switch (args.contentType) {
- case 'deal': {
- const deal = await Deals.getDeal(args.contentTypeId);
- const stage = await Stages.getStage(deal.stageId || '');
- const pipeline = await Pipelines.getPipeline(stage.pipelineId || '');
-
- const title = `${user.details ? user.details.fullName : 'Someone'} mentioned you in "${deal.name}" deal`;
-
- utils.sendNotification({
- createdUser: user._id,
- notifType: NOTIFICATION_TYPES.DEAL_EDIT,
- title,
- content: title,
- link: `/deal/board?id=${pipeline.boardId}&pipelineId=${pipeline._id}`,
- receivers: args.mentionedUserIds || [],
- });
- }
-
- default:
- break;
+ async internalNotesAdd(_root, args: IInternalNote, { user }: IContext) {
+ const { contentType, contentTypeId } = args;
+ const mentionedUserIds = args.mentionedUserIds || [];
+
+ const notifDoc: ISendNotification = {
+ title: `${contentType.toUpperCase()} updated`,
+ createdUser: user,
+ action: `mentioned you in ${contentType}`,
+ receivers: mentionedUserIds,
+ content: '',
+ link: '',
+ notifType: '',
+ contentType: '',
+ contentTypeId: '',
+ };
+
+ if (contentType === MODULE_NAMES.DEAL) {
+ const deal = await Deals.getDeal(contentTypeId);
+ const stage = await Stages.getStage(deal.stageId);
+ const pipeline = await Pipelines.getPipeline(stage.pipelineId);
+
+ notifDoc.notifType = NOTIFICATION_TYPES.DEAL_EDIT;
+ notifDoc.content = `"${deal.name}"`;
+ notifDoc.link = `/deal/board?id=${pipeline.boardId}&pipelineId=${pipeline._id}&itemId=${deal._id}`;
+ notifDoc.contentTypeId = deal._id;
+ notifDoc.contentType = NOTIFICATION_CONTENT_TYPES.DEAL;
+
+ await sendNotificationOfItems(deal, notifDoc, contentType, [...mentionedUserIds, user._id]);
}
- const internalNote = await InternalNotes.createInternalNote(args, user);
+ if (contentType === MODULE_NAMES.CUSTOMER) {
+ const customer = await Customers.getCustomer(contentTypeId);
+
+ notifDoc.notifType = NOTIFICATION_TYPES.CUSTOMER_MENTION;
+ notifDoc.content = Customers.getCustomerName(customer);
+ notifDoc.link = `/contacts/details/${customer._id}`;
+ notifDoc.contentTypeId = customer._id;
+ notifDoc.contentType = NOTIFICATION_CONTENT_TYPES.CUSTOMER;
+ }
+
+ if (contentType === MODULE_NAMES.COMPANY) {
+ const company = await Companies.getCompany(contentTypeId);
+
+ notifDoc.notifType = NOTIFICATION_TYPES.CUSTOMER_MENTION;
+ notifDoc.content = Companies.getCompanyName(company);
+ notifDoc.link = `/companies/details/${company._id}`;
+ notifDoc.contentTypeId = company._id;
+ notifDoc.contentType = NOTIFICATION_CONTENT_TYPES.COMPANY;
+ }
+
+ if (contentType === MODULE_NAMES.TICKET) {
+ const ticket = await Tickets.getTicket(contentTypeId);
+ const stage = await Stages.getStage(ticket.stageId);
+ const pipeline = await Pipelines.getPipeline(stage.pipelineId);
+
+ notifDoc.notifType = NOTIFICATION_TYPES.TICKET_EDIT;
+ notifDoc.content = `"${ticket.name}"`;
+ notifDoc.link = `/inbox/ticket/board?id=${pipeline.boardId}&pipelineId=${pipeline._id}&itemId=${ticket._id}`;
+ notifDoc.contentTypeId = ticket._id;
+ notifDoc.contentType = NOTIFICATION_CONTENT_TYPES.TICKET;
+
+ await sendNotificationOfItems(ticket, notifDoc, contentType, [...mentionedUserIds, user._id]);
+ }
+
+ if (contentType === MODULE_NAMES.TASK) {
+ const task = await Tasks.getTask(contentTypeId);
+ const stage = await Stages.getStage(task.stageId);
+ const pipeline = await Pipelines.getPipeline(stage.pipelineId);
- if (internalNote) {
- await putCreateLog(
- {
- type: 'internalNote',
- newData: JSON.stringify(args),
- object: internalNote,
- description: `${internalNote.contentType} has been created`,
- },
- user,
- );
+ notifDoc.notifType = NOTIFICATION_TYPES.TASK_EDIT;
+ notifDoc.content = `"${task.name}"`;
+ notifDoc.link = `/task/board?id=${pipeline.boardId}&pipelineId=${pipeline._id}&itemId=${task._id}`;
+ notifDoc.contentTypeId = task._id;
+ notifDoc.contentType = NOTIFICATION_CONTENT_TYPES.TASK;
+
+ await sendNotificationOfItems(task, notifDoc, contentType, [...mentionedUserIds, user._id]);
+ }
+
+ if (contentType === MODULE_NAMES.GROWTH_HACK) {
+ const hack = await GrowthHacks.getGrowthHack(contentTypeId);
+
+ notifDoc.content = `${hack.name}`;
+ }
+
+ if (contentType === MODULE_NAMES.USER) {
+ const usr = await Users.getUser(contentTypeId);
+
+ notifDoc.content = `${usr.username || usr.email}`;
+ }
+
+ if (contentType === MODULE_NAMES.PRODUCT) {
+ const product = await Products.getProduct({ _id: contentTypeId });
+
+ notifDoc.content = product.name;
+ }
+
+ if (notifDoc.contentType) {
+ await utils.sendNotification(notifDoc);
}
+ const internalNote = await InternalNotes.createInternalNote(args, user);
+
+ await putCreateLog(
+ {
+ type: MODULE_NAMES.INTERNAL_NOTE,
+ newData: { ...args, createdUserId: user._id, createdAt: internalNote.createdAt },
+ object: internalNote,
+ description: `A note for ${internalNote.contentType} "${notifDoc.content}" has been created`,
+ },
+ user,
+ );
+
return internalNote;
},
/**
* Updates internalNote object
*/
- async internalNotesEdit(_root, { _id, ...doc }: IInternalNotesEdit, { user }: { user: IUserDocument }) {
- const internalNote = await InternalNotes.findOne({ _id });
+ async internalNotesEdit(_root, { _id, ...doc }: IInternalNotesEdit, { user }: IContext) {
+ const internalNote = await InternalNotes.getInternalNote(_id);
const updated = await InternalNotes.updateInternalNote(_id, doc);
- if (internalNote) {
- await putUpdateLog(
- {
- type: 'internalNote',
- object: internalNote,
- newData: JSON.stringify(doc),
- description: `${internalNote.contentType} written at ${internalNote.createdDate} has been edited`,
- },
- user,
- );
+ await putUpdateLog(
+ {
+ type: MODULE_NAMES.INTERNAL_NOTE,
+ object: internalNote,
+ newData: doc,
+ },
+ user,
+ );
+
+ if (BOARD_TYPES.ALL.includes(updated.contentType)) {
+ graphqlPubsub.publish('activityLogsChanged', {});
}
return updated;
},
/**
- * Remove a channel
+ * Removes an internal note
*/
- async internalNotesRemove(_root, { _id }: { _id: string }, { user }: { user: IUserDocument }) {
- const internalNote = await InternalNotes.findOne({ _id });
+ async internalNotesRemove(_root, { _id }: { _id: string }, { user }: IContext) {
+ const internalNote = await InternalNotes.getInternalNote(_id);
const removed = await InternalNotes.removeInternalNote(_id);
- if (internalNote) {
- await putDeleteLog(
- {
- type: 'internalNote',
- object: internalNote,
- description: `${internalNote.contentType} written at ${internalNote.createdDate} has been removed`,
- },
- user,
- );
+ await putDeleteLog({ type: MODULE_NAMES.INTERNAL_NOTE, object: internalNote }, user);
+
+ if (BOARD_TYPES.ALL.includes(internalNote.contentType)) {
+ graphqlPubsub.publish('activityLogsChanged', {});
}
return removed;
diff --git a/src/data/resolvers/mutations/knowledgeBase.ts b/src/data/resolvers/mutations/knowledgeBase.ts
index 46bb270a8..8eaec9ad6 100644
--- a/src/data/resolvers/mutations/knowledgeBase.ts
+++ b/src/data/resolvers/mutations/knowledgeBase.ts
@@ -1,51 +1,46 @@
import { KnowledgeBaseArticles, KnowledgeBaseCategories, KnowledgeBaseTopics } from '../../../db/models';
-
import { ITopic } from '../../../db/models/definitions/knowledgebase';
-import { IUserDocument } from '../../../db/models/definitions/users';
import { IArticleCreate, ICategoryCreate } from '../../../db/models/KnowledgeBase';
+import { MODULE_NAMES } from '../../constants';
+import { putCreateLog, putDeleteLog, putUpdateLog } from '../../logUtils';
import { moduleCheckPermission } from '../../permissions/wrappers';
-import { putCreateLog, putDeleteLog, putUpdateLog } from '../../utils';
+import { IContext } from '../../types';
const knowledgeBaseMutations = {
/**
- * Create topic document
+ * Creates a topic document
*/
- async knowledgeBaseTopicsAdd(_root, { doc }: { doc: ITopic }, { user }: { user: IUserDocument }) {
- const topic = await KnowledgeBaseTopics.createDoc(doc, user._id);
-
- if (topic) {
- await putCreateLog(
- {
- type: 'knowledgeBaseTopic',
- newData: JSON.stringify(doc),
- object: topic,
- description: `${topic.title} has been created`,
- },
- user,
- );
- }
+ async knowledgeBaseTopicsAdd(_root, { doc }: { doc: ITopic }, { user, docModifier }: IContext) {
+ const topic = await KnowledgeBaseTopics.createDoc(docModifier(doc), user._id);
+
+ await putCreateLog(
+ {
+ type: MODULE_NAMES.KB_TOPIC,
+ newData: { ...doc, createdBy: user._id, createdDate: topic.createdDate },
+ object: topic,
+ },
+ user,
+ );
return topic;
},
/**
- * Update topic document
+ * Updates a topic document
*/
- async knowledgeBaseTopicsEdit(_root, { _id, doc }: { _id: string; doc: ITopic }, { user }: { user: IUserDocument }) {
- const topic = await KnowledgeBaseTopics.findOne({ _id });
+ async knowledgeBaseTopicsEdit(_root, { _id, doc }: { _id: string; doc: ITopic }, { user }: IContext) {
+ const topic = await KnowledgeBaseTopics.getTopic(_id);
const updated = await KnowledgeBaseTopics.updateDoc(_id, doc, user._id);
- if (topic) {
- await putUpdateLog(
- {
- type: 'knowledgeBaseTopic',
- object: topic,
- newData: JSON.stringify(doc),
- description: `${topic.title} has been edited`,
- },
- user,
- );
- }
+ await putUpdateLog(
+ {
+ type: MODULE_NAMES.KB_TOPIC,
+ object: topic,
+ newData: { ...doc, modifiedBy: user._id, modifiedDate: updated.modifiedDate },
+ updatedDocument: updated,
+ },
+ user,
+ );
return updated;
},
@@ -53,20 +48,11 @@ const knowledgeBaseMutations = {
/**
* Remove topic document
*/
- async knowledgeBaseTopicsRemove(_root, { _id }: { _id: string }, { user }: { user: IUserDocument }) {
- const topic = await KnowledgeBaseTopics.findOne({ _id });
+ async knowledgeBaseTopicsRemove(_root, { _id }: { _id: string }, { user }: IContext) {
+ const topic = await KnowledgeBaseTopics.getTopic(_id);
const removed = await KnowledgeBaseTopics.removeDoc(_id);
- if (topic) {
- await putDeleteLog(
- {
- type: 'knowledgeBaseTopic',
- object: topic,
- description: `${topic.title} has been removed`,
- },
- user,
- );
- }
+ await putDeleteLog({ type: MODULE_NAMES.KB_TOPIC, object: topic }, user);
return removed;
},
@@ -74,14 +60,13 @@ const knowledgeBaseMutations = {
/**
* Create category document
*/
- async knowledgeBaseCategoriesAdd(_root, { doc }: { doc: ICategoryCreate }, { user }: { user: IUserDocument }) {
+ async knowledgeBaseCategoriesAdd(_root, { doc }: { doc: ICategoryCreate }, { user }: IContext) {
const kbCategory = await KnowledgeBaseCategories.createDoc(doc, user._id);
await putCreateLog(
{
- type: 'knowledgeBaseCategory',
- newData: JSON.stringify(doc),
- description: `${kbCategory.title} has been created`,
+ type: MODULE_NAMES.KB_CATEGORY,
+ newData: { ...doc, createdBy: user._id, createdDate: kbCategory.createdDate },
object: kbCategory,
},
user,
@@ -93,25 +78,19 @@ const knowledgeBaseMutations = {
/**
* Update category document
*/
- async knowledgeBaseCategoriesEdit(
- _root,
- { _id, doc }: { _id: string; doc: ICategoryCreate },
- { user }: { user: IUserDocument },
- ) {
- const kbCategory = await KnowledgeBaseCategories.findOne({ _id });
+ async knowledgeBaseCategoriesEdit(_root, { _id, doc }: { _id: string; doc: ICategoryCreate }, { user }: IContext) {
+ const kbCategory = await KnowledgeBaseCategories.getCategory(_id);
const updated = await KnowledgeBaseCategories.updateDoc(_id, doc, user._id);
- if (kbCategory) {
- await putUpdateLog(
- {
- type: 'knowledgeBaseCategory',
- object: kbCategory,
- newData: JSON.stringify(doc),
- description: `${kbCategory.title} has been edited`,
- },
- user,
- );
- }
+ await putUpdateLog(
+ {
+ type: MODULE_NAMES.KB_CATEGORY,
+ object: kbCategory,
+ newData: { ...doc, modifiedBy: user._id, modifiedDate: updated.modifiedDate },
+ updatedDocument: updated,
+ },
+ user,
+ );
return updated;
},
@@ -119,20 +98,12 @@ const knowledgeBaseMutations = {
/**
* Remove category document
*/
- async knowledgeBaseCategoriesRemove(_root, { _id }: { _id: string }, { user }: { user: IUserDocument }) {
- const kbCategory = await KnowledgeBaseCategories.findOne({ _id });
+ async knowledgeBaseCategoriesRemove(_root, { _id }: { _id: string }, { user }: IContext) {
+ const kbCategory = await KnowledgeBaseCategories.getCategory(_id);
+
const removed = await KnowledgeBaseCategories.removeDoc(_id);
- if (kbCategory) {
- await putDeleteLog(
- {
- type: 'knowledgeBaseCategory',
- object: kbCategory,
- description: `${kbCategory.title} has been removed`,
- },
- user,
- );
- }
+ await putDeleteLog({ type: MODULE_NAMES.KB_CATEGORY, object: kbCategory }, user);
return removed;
},
@@ -140,14 +111,13 @@ const knowledgeBaseMutations = {
/**
* Create article document
*/
- async knowledgeBaseArticlesAdd(_root, { doc }: { doc: IArticleCreate }, { user }: { user: IUserDocument }) {
+ async knowledgeBaseArticlesAdd(_root, { doc }: { doc: IArticleCreate }, { user }: IContext) {
const kbArticle = await KnowledgeBaseArticles.createDoc(doc, user._id);
await putCreateLog(
{
- type: 'knowledgeBaseArticle',
- newData: JSON.stringify(doc),
- description: `${kbArticle.title} has been created`,
+ type: MODULE_NAMES.KB_ARTICLE,
+ newData: { ...doc, createdBy: user._id, createdDate: kbArticle.createdDate },
object: kbArticle,
},
user,
@@ -159,25 +129,19 @@ const knowledgeBaseMutations = {
/**
* Update article document
*/
- async knowledgeBaseArticlesEdit(
- _root,
- { _id, doc }: { _id: string; doc: IArticleCreate },
- { user }: { user: IUserDocument },
- ) {
- const kbArticle = await KnowledgeBaseArticles.findOne({ _id });
+ async knowledgeBaseArticlesEdit(_root, { _id, doc }: { _id: string; doc: IArticleCreate }, { user }: IContext) {
+ const kbArticle = await KnowledgeBaseArticles.getArticle(_id);
const updated = await KnowledgeBaseArticles.updateDoc(_id, doc, user._id);
- if (kbArticle) {
- await putUpdateLog(
- {
- type: 'knowledgeBaseArticle',
- object: kbArticle,
- newData: JSON.stringify(doc),
- description: `${kbArticle.title} has been edited`,
- },
- user,
- );
- }
+ await putUpdateLog(
+ {
+ type: MODULE_NAMES.KB_ARTICLE,
+ object: kbArticle,
+ newData: { ...doc, modifiedBy: user._id, modifiedDate: updated.modifiedDate },
+ updatedDocument: updated,
+ },
+ user,
+ );
return updated;
},
@@ -185,20 +149,11 @@ const knowledgeBaseMutations = {
/**
* Remove article document
*/
- async knowledgeBaseArticlesRemove(_root, { _id }: { _id: string }, { user }: { user: IUserDocument }) {
- const kbArticle = await KnowledgeBaseArticles.findOne({ _id });
+ async knowledgeBaseArticlesRemove(_root, { _id }: { _id: string }, { user }: IContext) {
+ const kbArticle = await KnowledgeBaseArticles.getArticle(_id);
const removed = await KnowledgeBaseArticles.removeDoc(_id);
- if (kbArticle) {
- await putDeleteLog(
- {
- type: 'knowledgeBaseArticle',
- object: kbArticle,
- description: `${kbArticle.title} has been removed`,
- },
- user,
- );
- }
+ await putDeleteLog({ type: MODULE_NAMES.KB_ARTICLE, object: kbArticle }, user);
return removed;
},
diff --git a/src/data/resolvers/mutations/messengerApps.ts b/src/data/resolvers/mutations/messengerApps.ts
index 964e641eb..2eba20a47 100644
--- a/src/data/resolvers/mutations/messengerApps.ts
+++ b/src/data/resolvers/mutations/messengerApps.ts
@@ -1,104 +1,63 @@
-import { Forms, MessengerApps } from '../../../db/models';
-import { IUserDocument } from '../../../db/models/definitions/users';
+import { MessengerApps } from '../../../db/models';
import { requireLogin } from '../../permissions/wrappers';
-import { putCreateLog, putDeleteLog } from '../../utils';
+import { IContext } from '../../types';
const messengerAppMutations = {
- /**
- * Creates a messenger app knowledgebase
- * @param {string} params.name Name
- * @param {string} params.integrationId Integration
- * @param {string} params.topicId Topic
- */
- async messengerAppsAddKnowledgebase(_root, params, { user }: { user: IUserDocument }) {
- const { name, integrationId, topicId } = params;
- const kb = await MessengerApps.createApp({
- name,
- kind: 'knowledgebase',
- showInInbox: false,
- credentials: {
- integrationId,
- topicId,
- },
- });
-
- if (kb) {
- await putCreateLog(
- {
- type: 'messengerAppKb',
- newData: JSON.stringify(params),
- object: kb,
- description: `${name} has been created`,
- },
- user,
- );
- }
-
- return kb;
- },
-
- /**
- * Creates a messenger app lead
- * @param {string} params.name Name
- * @param {string} params.integrationId Integration
- * @param {string} params.formId Form
- */
- async messengerAppsAddLead(_root, params, { user }: { user: IUserDocument }) {
- const { name, integrationId, formId } = params;
- const form = await Forms.findOne({ _id: formId });
-
- if (!form) {
- throw new Error('Form not found');
+ async messengerAppSave(
+ _root,
+ { integrationId, messengerApps }: { integrationId: string; messengerApps: any },
+ { docModifier }: IContext,
+ ) {
+ await MessengerApps.deleteMany({ 'credentials.integrationId': integrationId });
+
+ if (messengerApps.websites) {
+ for (const website of messengerApps.websites) {
+ const doc = {
+ kind: 'website',
+ credentials: {
+ integrationId,
+ description: website.description,
+ buttonText: website.buttonText,
+ url: website.url,
+ },
+ };
+
+ await MessengerApps.createApp(docModifier(doc));
+ }
}
- const lead = await MessengerApps.createApp({
- name,
- kind: 'lead',
- showInInbox: false,
- credentials: {
- integrationId,
- formCode: form.code || '',
- },
- });
-
- if (lead) {
- await putCreateLog(
- {
- type: 'messengerAppLead',
- newData: JSON.stringify(params),
- object: lead,
- description: `${name} has been created`,
- },
- user,
- );
+ if (messengerApps.knowledgebases) {
+ for (const knowledgebase of messengerApps.knowledgebases) {
+ const doc = {
+ kind: 'knowledgebase',
+ credentials: {
+ integrationId,
+ topicId: knowledgebase.topicId,
+ },
+ };
+
+ await MessengerApps.createApp(docModifier(doc));
+ }
}
- return lead;
- },
-
- /*
- * Remove app
- */
- async messengerAppsRemove(_root, { _id }: { _id: string }, { user }: { user: IUserDocument }) {
- const messengerApp = await MessengerApps.findOne({ _id });
- const removed = await MessengerApps.deleteOne({ _id });
-
- if (messengerApp) {
- await putDeleteLog(
- {
- type: 'messengerApp',
- object: messengerApp,
- description: `${messengerApp.name} has been removed`,
- },
- user,
- );
+ if (messengerApps.leads) {
+ for (const lead of messengerApps.leads) {
+ const doc = {
+ kind: 'lead',
+ credentials: {
+ integrationId,
+ formCode: lead.formCode,
+ },
+ };
+
+ await MessengerApps.createApp(docModifier(doc));
+ }
}
- return removed;
+ return 'success';
},
};
-requireLogin(messengerAppMutations, 'messengerAppsAddKnowledgebase');
-requireLogin(messengerAppMutations, 'messengerAppsAddLead');
+requireLogin(messengerAppMutations, 'messengerAppSave');
export default messengerAppMutations;
diff --git a/src/data/resolvers/mutations/notifications.ts b/src/data/resolvers/mutations/notifications.ts
index d145e0b46..28e7b9ded 100644
--- a/src/data/resolvers/mutations/notifications.ts
+++ b/src/data/resolvers/mutations/notifications.ts
@@ -1,25 +1,37 @@
import { NotificationConfigurations, Notifications } from '../../../db/models';
import { IConfig } from '../../../db/models/definitions/notifications';
-import { IUserDocument } from '../../../db/models/definitions/users';
import { graphqlPubsub } from '../../../pubsub';
import { moduleRequireLogin } from '../../permissions/wrappers';
+import { IContext } from '../../types';
const notificationMutations = {
/**
* Save notification configuration
*/
- notificationsSaveConfig(_root, doc: IConfig, { user }: { user: IUserDocument }) {
+ notificationsSaveConfig(_root, doc: IConfig, { user }: IContext) {
return NotificationConfigurations.createOrUpdateConfiguration(doc, user);
},
/**
* Marks notification as read
*/
- notificationsMarkAsRead(_root, { _ids }: { _ids: string[] }, { user }: { user: IUserDocument }) {
+ async notificationsMarkAsRead(
+ _root,
+ { _ids, contentTypeId }: { _ids: string[]; contentTypeId: string },
+ { user }: IContext,
+ ) {
// notify subscription
graphqlPubsub.publish('notificationsChanged', '');
- return Notifications.markAsRead(_ids, user._id);
+ let notificationIds = _ids;
+
+ if (contentTypeId) {
+ const notifications = await Notifications.find({ contentTypeId });
+
+ notificationIds = notifications.map(notification => notification._id);
+ }
+
+ return Notifications.markAsRead(notificationIds, user._id);
},
};
diff --git a/src/data/resolvers/mutations/permissions.ts b/src/data/resolvers/mutations/permissions.ts
index 78df0a1a3..4c453ab4b 100644
--- a/src/data/resolvers/mutations/permissions.ts
+++ b/src/data/resolvers/mutations/permissions.ts
@@ -1,9 +1,68 @@
+import * as _ from 'underscore';
import { Permissions, Users, UsersGroups } from '../../../db/models';
-import { IPermissionParams, IUserGroup } from '../../../db/models/definitions/permissions';
+import { IPermissionParams, IUserGroup, IUserGroupDocument } from '../../../db/models/definitions/permissions';
import { IUserDocument } from '../../../db/models/definitions/users';
+import { MODULE_NAMES } from '../../constants';
+import { putCreateLog, putDeleteLog, putUpdateLog } from '../../logUtils';
import { resetPermissionsCache } from '../../permissions/utils';
import { moduleCheckPermission } from '../../permissions/wrappers';
-import { putCreateLog, putDeleteLog, putUpdateLog } from '../../utils';
+import { IContext } from '../../types';
+
+interface IParams {
+ memberIds?: string[];
+ oldUsers: IUserDocument[];
+ group: IUserGroupDocument;
+ currentUser: IUserDocument;
+}
+
+const writeUserLog = async (params: IParams) => {
+ const { memberIds = [], oldUsers = [], group, currentUser } = params;
+
+ for (const oldUser of oldUsers) {
+ const exists = memberIds.find(id => id === oldUser._id);
+
+ if (!exists) {
+ const groupIds = oldUser.groupIds ? oldUser.groupIds.filter(item => item !== group._id) : [];
+ // user has been removed from the group
+ await putUpdateLog(
+ {
+ type: MODULE_NAMES.USER,
+ object: { _id: oldUser._id, groupIds: oldUser.groupIds },
+ newData: { groupIds },
+ description: `User "${oldUser.email}" has been removed from group "${group.name}"`,
+ updatedDocument: { groupIds },
+ },
+ currentUser,
+ );
+ }
+ } // end oldUser loop
+
+ for (const memberId of memberIds) {
+ const exists = oldUsers.find(usr => usr._id === memberId);
+
+ // user has been added to the group
+ if (!exists) {
+ // already updated user row
+ const addedUser = await Users.findOne({ _id: memberId });
+
+ if (addedUser) {
+ // previous data was like this
+ const groupIds = (addedUser.groupIds || []).filter(groupId => groupId !== group._id);
+
+ await putUpdateLog(
+ {
+ type: MODULE_NAMES.USER,
+ object: { _id: memberId, groupIds },
+ newData: { groupIds: addedUser.groupIds },
+ description: `User "${addedUser.email}" has been added to group ${group.name}`,
+ updatedDocument: { groupIds: addedUser.groupIds },
+ },
+ currentUser,
+ );
+ }
+ }
+ } // end new user loop
+};
const permissionMutations = {
/**
@@ -14,42 +73,21 @@ const permissionMutations = {
* @param {Boolean} doc.allowed
* @return {Promise} newly created permission object
*/
- async permissionsAdd(_root, doc: IPermissionParams, { user }: { user: IUserDocument }) {
+ async permissionsAdd(_root, doc: IPermissionParams, { user }: IContext) {
const result = await Permissions.createPermission(doc);
- if (result && result.length > 0) {
- for (const perm of result) {
- let description = `Permission of module "${perm.module}", action "${perm.action}" assigned to `;
-
- if (perm.groupId) {
- const group = await UsersGroups.findOne({ _id: perm.groupId });
-
- if (group && group.name) {
- description = `${description} user group "${group.name}" `;
- }
- }
-
- if (perm.userId) {
- const permUser = await Users.findOne({ _id: perm.userId });
-
- if (permUser) {
- description = `${description} user "${permUser.email}" has been created`;
- }
- }
-
- await putCreateLog(
- {
- type: 'permission',
- object: perm,
- newData: JSON.stringify(perm),
- description,
- },
- user,
- );
- } // end for loop
- } // end result checking
+ for (const perm of result) {
+ await putCreateLog(
+ {
+ type: MODULE_NAMES.PERMISSION,
+ object: perm,
+ newData: perm,
+ },
+ user,
+ );
+ }
- resetPermissionsCache();
+ await resetPermissionsCache();
return result;
},
@@ -59,42 +97,15 @@ const permissionMutations = {
* @param {[String]} ids
* @return {Promise}
*/
- async permissionsRemove(_root, { ids }: { ids: string[] }, { user }: { user: IUserDocument }) {
+ async permissionsRemove(_root, { ids }: { ids: string[] }, { user }: IContext) {
const permissions = await Permissions.find({ _id: { $in: ids } });
const result = await Permissions.removePermission(ids);
for (const perm of permissions) {
- let description = `Permission of module "${perm.module}", action "${perm.action}" assigned to `;
-
- // prepare user group related description
- if (perm.groupId) {
- const group = await UsersGroups.findOne({ _id: perm.groupId });
-
- if (group && group.name) {
- description = `${description} user group "${group.name}" has been removed`;
- }
- }
-
- // prepare user related description
- if (perm.userId) {
- const permUser = await Users.findOne({ _id: perm.userId });
-
- if (permUser && permUser.email) {
- description = `${description} user "${permUser.email}" has been removed`;
- }
- }
-
- await putDeleteLog(
- {
- type: 'permission',
- object: perm,
- description,
- },
- user,
- );
- } // end for loop
+ await putDeleteLog({ type: MODULE_NAMES.PERMISSION, object: perm }, user);
+ }
- resetPermissionsCache();
+ await resetPermissionsCache();
return result;
},
@@ -107,28 +118,40 @@ const usersGroupMutations = {
* @param {String} doc.description
* @return {Promise} newly created group object
*/
- async usersGroupsAdd(
- _root,
- { memberIds, ...doc }: IUserGroup & { memberIds?: string[] },
- { user }: { user: IUserDocument },
- ) {
- const result = await UsersGroups.createGroup(doc, memberIds);
+ async usersGroupsAdd(_root, { memberIds, ...doc }: IUserGroup & { memberIds?: string[] }, { user }: IContext) {
+ // users before updating
+ const oldUsers = await Users.find({ _id: { $in: memberIds || [] } });
- if (result) {
- await putCreateLog(
+ const group = await UsersGroups.createGroup(doc, memberIds);
+
+ await putCreateLog(
+ {
+ type: MODULE_NAMES.USER_GROUP,
+ object: group,
+ newData: doc,
+ description: `"${group.name}" has been created`,
+ },
+ user,
+ );
+
+ for (const oldUser of oldUsers) {
+ const updatedDocument = { groupIds: [...(oldUser.groupIds || []), group._id] };
+
+ await putUpdateLog(
{
- type: 'userGroup',
- object: result,
- newData: JSON.stringify(doc),
- description: `${result.name} has been created`,
+ type: MODULE_NAMES.USER,
+ object: oldUser,
+ newData: updatedDocument,
+ description: `User "${oldUser.email}" has been added to group ${group.name}`,
+ updatedDocument,
},
user,
);
}
- resetPermissionsCache();
+ await resetPermissionsCache();
- return result;
+ return group;
},
/**
@@ -140,24 +163,33 @@ const usersGroupMutations = {
async usersGroupsEdit(
_root,
{ _id, memberIds, ...doc }: { _id: string; memberIds?: string[] } & IUserGroup,
- { user }: { user: IUserDocument },
+ { user }: IContext,
) {
- const group = await UsersGroups.findOne({ _id });
+ const group = await UsersGroups.getGroup(_id);
+ const oldUsers = await Users.find({ groupIds: { $in: [_id] } });
const result = await UsersGroups.updateGroup(_id, doc, memberIds);
- if (group) {
+ // don't write unnecessary log when nothing is changed
+ if (group.name !== doc.name) {
await putUpdateLog(
{
- type: 'userGroup',
+ type: MODULE_NAMES.USER_GROUP,
object: group,
- newData: JSON.stringify(doc),
- description: `${group.name} has been edited`,
+ newData: doc,
+ description: `"${group.name}" has been edited`,
},
user,
);
}
- resetPermissionsCache();
+ await writeUserLog({
+ currentUser: user,
+ memberIds,
+ oldUsers,
+ group,
+ });
+
+ await resetPermissionsCache();
return result;
},
@@ -167,25 +199,57 @@ const usersGroupMutations = {
* @param {String} _id
* @return {Promise}
*/
- async usersGroupsRemove(_root, { _id }: { _id: string }, { user }: { user: IUserDocument }) {
- const group = await UsersGroups.findOne({ _id });
+ async usersGroupsRemove(_root, { _id }: { _id: string }, { user }: IContext) {
+ const group = await UsersGroups.getGroup(_id);
+ const members = await Users.find({ groupIds: { $in: [group._id] } });
const result = await UsersGroups.removeGroup(_id);
- if (group && result) {
- await putDeleteLog(
+ await putDeleteLog(
+ {
+ type: MODULE_NAMES.USER_GROUP,
+ object: group,
+ description: `"${group.name}" has been removed`,
+ },
+ user,
+ );
+
+ for (const member of members) {
+ const groupIds = member.groupIds ? member.groupIds.filter(id => id !== group._id) : [];
+
+ await putUpdateLog(
{
- type: 'userGroup',
- object: group,
- description: `${group.name} has been removed`,
+ type: MODULE_NAMES.USER,
+ object: { _id: member._id, groupIds: member.groupIds },
+ newData: { groupIds },
+ updatedDocument: { groupIds },
+ description: `User ${member.email} has been removed from group ${group.name}`,
},
user,
);
}
- resetPermissionsCache();
+ await resetPermissionsCache();
return result;
},
+
+ async usersGroupsCopy(_root, { _id, memberIds }: { _id: string; memberIds: string[] }, { user }: IContext) {
+ const group = await UsersGroups.getGroup(_id);
+
+ const clone = await UsersGroups.copyGroup(group._id, memberIds);
+
+ await putCreateLog(
+ {
+ type: 'userGroup',
+ object: clone,
+ newData: { name: clone.name, description: clone.description },
+ description: `"${group.name}" has been copied`,
+ },
+ user,
+ );
+
+ return clone;
+ },
};
moduleCheckPermission(permissionMutations, 'managePermissions');
diff --git a/src/data/resolvers/mutations/pipelineLabels.ts b/src/data/resolvers/mutations/pipelineLabels.ts
new file mode 100644
index 000000000..96722cad0
--- /dev/null
+++ b/src/data/resolvers/mutations/pipelineLabels.ts
@@ -0,0 +1,72 @@
+import { PipelineLabels } from '../../../db/models';
+import { IPipelineLabel } from '../../../db/models/definitions/pipelineLabels';
+import { MODULE_NAMES } from '../../constants';
+import { putCreateLog, putDeleteLog, putUpdateLog } from '../../logUtils';
+import { IContext } from '../../types';
+
+interface IPipelineLabelsEdit extends IPipelineLabel {
+ _id: string;
+}
+
+const pipelineLabelMutations = {
+ /**
+ * Creates a new pipeline label
+ */
+ async pipelineLabelsAdd(_root, { ...doc }: IPipelineLabel, { user }: IContext) {
+ const pipelineLabel = await PipelineLabels.createPipelineLabel({ createdBy: user._id, ...doc });
+
+ await putCreateLog(
+ {
+ type: MODULE_NAMES.PIPELINE_LABEL,
+ newData: { ...doc, createdBy: user._id, createdAt: pipelineLabel.createdAt },
+ object: pipelineLabel,
+ },
+ user,
+ );
+
+ return pipelineLabel;
+ },
+
+ /**
+ * Edit pipeline label
+ */
+ async pipelineLabelsEdit(_root, { _id, ...doc }: IPipelineLabelsEdit, { user }: IContext) {
+ const pipelineLabel = await PipelineLabels.getPipelineLabel(_id);
+ const updated = await PipelineLabels.updatePipelineLabel(_id, doc);
+
+ await putUpdateLog(
+ {
+ type: MODULE_NAMES.PIPELINE_LABEL,
+ newData: doc,
+ object: pipelineLabel,
+ },
+ user,
+ );
+
+ return updated;
+ },
+
+ /**
+ * Remove pipeline label
+ */
+ async pipelineLabelsRemove(_root, { _id }: { _id: string }, { user }: IContext) {
+ const pipelineLabel = await PipelineLabels.getPipelineLabel(_id);
+ const removed = await PipelineLabels.removePipelineLabel(_id);
+
+ await putDeleteLog({ type: MODULE_NAMES.PIPELINE_LABEL, object: pipelineLabel }, user);
+
+ return removed;
+ },
+
+ /**
+ * Attach a label
+ */
+ pipelineLabelsLabel(
+ _root,
+ { pipelineId, targetId, labelIds }: { pipelineId: string; targetId: string; labelIds: string[] },
+ ) {
+ return PipelineLabels.labelsLabel(pipelineId, targetId, labelIds);
+ },
+};
+
+export default pipelineLabelMutations;
diff --git a/src/data/resolvers/mutations/pipelineTemplates.ts b/src/data/resolvers/mutations/pipelineTemplates.ts
new file mode 100644
index 000000000..7a0c2a7d2
--- /dev/null
+++ b/src/data/resolvers/mutations/pipelineTemplates.ts
@@ -0,0 +1,90 @@
+import * as _ from 'underscore';
+import { PipelineTemplates } from '../../../db/models';
+import { IPipelineTemplate, IPipelineTemplateStage } from '../../../db/models/definitions/pipelineTemplates';
+import { MODULE_NAMES } from '../../constants';
+import { putCreateLog, putDeleteLog, putUpdateLog } from '../../logUtils';
+import { IContext } from '../../types';
+import { registerOnboardHistory } from '../../utils';
+import { checkPermission } from '../boardUtils';
+
+interface IPipelineTemplatesEdit extends IPipelineTemplate {
+ _id: string;
+ stages: IPipelineTemplateStage[];
+}
+
+const pipelineTemplateMutations = {
+ /**
+ * Create new pipeline template
+ */
+ async pipelineTemplatesAdd(_root, { stages, ...doc }: IPipelineTemplate, { user, docModifier }: IContext) {
+ await checkPermission(doc.type, user, 'templatesAdd');
+
+ const pipelineTemplate = await PipelineTemplates.createPipelineTemplate(
+ docModifier({ createdBy: user._id, ...doc }),
+ stages,
+ );
+
+ await putCreateLog(
+ {
+ type: MODULE_NAMES.PIPELINE_TEMPLATE,
+ newData: { ...doc, stages: pipelineTemplate.stages },
+ object: pipelineTemplate,
+ },
+ user,
+ );
+
+ return pipelineTemplate;
+ },
+
+ /**
+ * Edit pipeline template
+ */
+ async pipelineTemplatesEdit(_root, { _id, stages, ...doc }: IPipelineTemplatesEdit, { user }: IContext) {
+ await checkPermission(doc.type, user, 'templatesEdit');
+
+ const pipelineTemplate = await PipelineTemplates.getPipelineTemplate(_id);
+ const updated = await PipelineTemplates.updatePipelineTemplate(_id, doc, stages);
+
+ await putUpdateLog(
+ {
+ type: MODULE_NAMES.PIPELINE_TEMPLATE,
+ newData: { ...doc, stages: updated.stages },
+ object: pipelineTemplate,
+ updatedDocument: updated,
+ },
+ user,
+ );
+
+ return updated;
+ },
+
+ /**
+ * Duplicate pipeline template
+ */
+ async pipelineTemplatesDuplicate(_root, { _id }: { _id: string }, { user }: IContext) {
+ const pipelineTemplate = await PipelineTemplates.getPipelineTemplate(_id);
+
+ await checkPermission(pipelineTemplate.type, user, 'templatesDuplicate');
+
+ await registerOnboardHistory({ type: `${pipelineTemplate.type}TemplatesDuplicate`, user });
+
+ return PipelineTemplates.duplicatePipelineTemplate(_id);
+ },
+
+ /**
+ * Remove pipeline template
+ */
+ async pipelineTemplatesRemove(_root, { _id }: { _id: string }, { user }: IContext) {
+ const pipelineTemplate = await PipelineTemplates.getPipelineTemplate(_id);
+
+ await checkPermission(pipelineTemplate.type, user, 'templatesRemove');
+
+ const removed = await PipelineTemplates.removePipelineTemplate(_id);
+
+ await putDeleteLog({ type: MODULE_NAMES.PIPELINE_TEMPLATE, object: pipelineTemplate }, user);
+
+ return removed;
+ },
+};
+
+export default pipelineTemplateMutations;
diff --git a/src/data/resolvers/mutations/products.ts b/src/data/resolvers/mutations/products.ts
index 94167d3d0..e05c48f48 100644
--- a/src/data/resolvers/mutations/products.ts
+++ b/src/data/resolvers/mutations/products.ts
@@ -1,32 +1,38 @@
-import { Products } from '../../../db/models';
-import { IProduct } from '../../../db/models/definitions/deals';
-import { IUserDocument } from '../../../db/models/definitions/users';
+import { ProductCategories, Products } from '../../../db/models';
+import { IProduct, IProductCategory, IProductDocument } from '../../../db/models/definitions/deals';
+import { MODULE_NAMES } from '../../constants';
+import { putCreateLog, putDeleteLog, putUpdateLog } from '../../logUtils';
import { moduleCheckPermission } from '../../permissions/wrappers';
-import { putCreateLog, putDeleteLog, putUpdateLog } from '../../utils';
+import { IContext } from '../../types';
interface IProductsEdit extends IProduct {
_id: string;
}
+interface IProductCategoriesEdit extends IProductCategory {
+ _id: string;
+}
+
const productMutations = {
/**
* Creates a new product
* @param {Object} doc Product document
*/
- async productsAdd(_root, doc: IProduct, { user }: { user: IUserDocument }) {
- const product = await Products.createProduct(doc);
-
- if (product) {
- await putCreateLog(
- {
- type: 'product',
- newData: JSON.stringify(doc),
- object: product,
- description: `${product.name} has been created`,
+ async productsAdd(_root, doc: IProduct, { user, docModifier }: IContext) {
+ const product = await Products.createProduct(docModifier(doc));
+
+ await putCreateLog(
+ {
+ type: MODULE_NAMES.PRODUCT,
+ newData: {
+ ...doc,
+ categoryId: product.categoryId,
+ customFieldsData: product.customFieldsData,
},
- user,
- );
- }
+ object: product,
+ },
+ user,
+ );
return product;
},
@@ -36,21 +42,19 @@ const productMutations = {
* @param {string} param2._id Product id
* @param {Object} param2.doc Product info
*/
- async productsEdit(_root, { _id, ...doc }: IProductsEdit, { user }: { user: IUserDocument }) {
- const product = await Products.findOne({ _id });
+ async productsEdit(_root, { _id, ...doc }: IProductsEdit, { user }: IContext) {
+ const product = await Products.getProduct({ _id });
const updated = await Products.updateProduct(_id, doc);
- if (product) {
- await putUpdateLog(
- {
- type: 'product',
- object: product,
- newData: JSON.stringify(doc),
- description: `${product.name} has been edited`,
- },
- user,
- );
- }
+ await putUpdateLog(
+ {
+ type: MODULE_NAMES.PRODUCT,
+ object: product,
+ newData: { ...doc, customFieldsData: updated.customFieldsData },
+ updatedDocument: updated,
+ },
+ user,
+ );
return updated;
},
@@ -59,21 +63,69 @@ const productMutations = {
* Removes a product
* @param {string} param1._id Product id
*/
- async productsRemove(_root, { _id }: { _id: string }, { user }: { user: IUserDocument }) {
- const product = await Products.findOne({ _id });
- const removed = await Products.removeProduct(_id);
-
- if (product) {
- await putDeleteLog(
- {
- type: 'product',
- object: product,
- description: `${product.name} has been removed`,
- },
- user,
- );
+ async productsRemove(_root, { productIds }: { productIds: string[] }, { user }: IContext) {
+ const products: IProductDocument[] = await Products.find({ _id: { $in: productIds } }).lean();
+
+ await Products.removeProducts(productIds);
+
+ for (const product of products) {
+ await putDeleteLog({ type: MODULE_NAMES.PRODUCT, object: product }, user);
}
+ return productIds;
+ },
+
+ /**
+ * Creates a new product category
+ * @param {Object} doc Product category document
+ */
+ async productCategoriesAdd(_root, doc: IProductCategory, { user, docModifier }: IContext) {
+ const productCategory = await ProductCategories.createProductCategory(docModifier(doc));
+
+ await putCreateLog(
+ {
+ type: MODULE_NAMES.PRODUCT_CATEGORY,
+ newData: { ...doc, order: productCategory.order },
+ object: productCategory,
+ },
+ user,
+ );
+
+ return productCategory;
+ },
+
+ /**
+ * Edits a product category
+ * @param {string} param2._id ProductCategory id
+ * @param {Object} param2.doc ProductCategory info
+ */
+ async productCategoriesEdit(_root, { _id, ...doc }: IProductCategoriesEdit, { user }: IContext) {
+ const productCategory = await ProductCategories.getProductCatogery({ _id });
+ const updated = await ProductCategories.updateProductCategory(_id, doc);
+
+ await putUpdateLog(
+ {
+ type: MODULE_NAMES.PRODUCT_CATEGORY,
+ object: productCategory,
+ newData: doc,
+ updatedDocument: updated,
+ },
+ user,
+ );
+
+ return updated;
+ },
+
+ /**
+ * Removes a product category
+ * @param {string} param1._id ProductCategory id
+ */
+ async productCategoriesRemove(_root, { _id }: { _id: string }, { user }: IContext) {
+ const productCategory = await ProductCategories.getProductCatogery({ _id });
+ const removed = await ProductCategories.removeProductCategory(_id);
+
+ await putDeleteLog({ type: MODULE_NAMES.PRODUCT_CATEGORY, object: productCategory }, user);
+
return removed;
},
};
diff --git a/src/data/resolvers/mutations/responseTemplates.ts b/src/data/resolvers/mutations/responseTemplates.ts
index cac7b02cd..31a7c659a 100644
--- a/src/data/resolvers/mutations/responseTemplates.ts
+++ b/src/data/resolvers/mutations/responseTemplates.ts
@@ -1,8 +1,9 @@
import { ResponseTemplates } from '../../../db/models';
import { IResponseTemplate } from '../../../db/models/definitions/responseTemplates';
-import { IUserDocument } from '../../../db/models/definitions/users';
+import { MODULE_NAMES } from '../../constants';
+import { putCreateLog, putDeleteLog, putUpdateLog } from '../../logUtils';
import { moduleCheckPermission } from '../../permissions/wrappers';
-import { putCreateLog, putDeleteLog, putUpdateLog } from '../../utils';
+import { IContext } from '../../types';
interface IResponseTemplatesEdit extends IResponseTemplate {
_id: string;
@@ -10,65 +11,51 @@ interface IResponseTemplatesEdit extends IResponseTemplate {
const responseTemplateMutations = {
/**
- * Create new response template
+ * Creates a new response template
*/
- async responseTemplatesAdd(_root, doc: IResponseTemplate, { user }: { user: IUserDocument }) {
- const template = await ResponseTemplates.create(doc);
+ async responseTemplatesAdd(_root, doc: IResponseTemplate, { user, docModifier }: IContext) {
+ const template = await ResponseTemplates.create(docModifier(doc));
- if (template) {
- await putCreateLog(
- {
- type: 'responseTemplate',
- newData: JSON.stringify(doc),
- object: template,
- description: `${template.name} has been created`,
- },
- user,
- );
- }
+ await putCreateLog(
+ {
+ type: MODULE_NAMES.RESPONSE_TEMPLATE,
+ newData: doc,
+ object: template,
+ },
+ user,
+ );
return template;
},
/**
- * Update response template
+ * Updates a response template
*/
- async responseTemplatesEdit(_root, { _id, ...fields }: IResponseTemplatesEdit, { user }: { user: IUserDocument }) {
- const template = await ResponseTemplates.findOne({ _id });
+ async responseTemplatesEdit(_root, { _id, ...fields }: IResponseTemplatesEdit, { user }: IContext) {
+ const template = await ResponseTemplates.getResponseTemplate(_id);
const updated = await ResponseTemplates.updateResponseTemplate(_id, fields);
- if (template) {
- await putUpdateLog(
- {
- type: 'responseTemplate',
- object: template,
- newData: JSON.stringify(fields),
- description: `${template.name} has been edited`,
- },
- user,
- );
- }
+ await putUpdateLog(
+ {
+ type: MODULE_NAMES.RESPONSE_TEMPLATE,
+ object: template,
+ newData: fields,
+ updatedDocument: updated,
+ },
+ user,
+ );
return updated;
},
/**
- * Delete response template
+ * Deletes a response template
*/
- async responseTemplatesRemove(_root, { _id }: { _id: string }, { user }: { user: IUserDocument }) {
- const template = await ResponseTemplates.findOne({ _id });
+ async responseTemplatesRemove(_root, { _id }: { _id: string }, { user }: IContext) {
+ const template = await ResponseTemplates.getResponseTemplate(_id);
const removed = await ResponseTemplates.removeResponseTemplate(_id);
- if (template) {
- await putDeleteLog(
- {
- type: 'responseTemplate',
- object: template,
- description: `${template.name} has been removed`,
- },
- user,
- );
- }
+ await putDeleteLog({ type: MODULE_NAMES.RESPONSE_TEMPLATE, object: template }, user);
return removed;
},
diff --git a/src/data/resolvers/mutations/robot.ts b/src/data/resolvers/mutations/robot.ts
new file mode 100644
index 000000000..b7e0ca98f
--- /dev/null
+++ b/src/data/resolvers/mutations/robot.ts
@@ -0,0 +1,34 @@
+import { OnboardingHistories, RobotEntries } from '../../../db/models/Robot';
+import { graphqlPubsub } from '../../../pubsub';
+import { IContext } from '../../types';
+
+const robotMutations = {
+ robotEntriesMarkAsNotified(_root, { _id }: { _id: string }) {
+ return RobotEntries.markAsNotified(_id);
+ },
+
+ async onboardingCheckStatus(_root, _args, { user }: IContext) {
+ const status = await OnboardingHistories.userStatus(user._id);
+
+ if (status !== 'completed') {
+ graphqlPubsub.publish('onboardingChanged', {
+ onboardingChanged: {
+ userId: user._id,
+ type: status,
+ },
+ });
+ }
+
+ return status;
+ },
+
+ onboardingForceComplete(_root, _args, { user }: IContext) {
+ return OnboardingHistories.forceComplete(user._id);
+ },
+
+ onboardingCompleteShowStep(_root, { step }: { step: string }, { user }: IContext) {
+ return OnboardingHistories.completeShowStep(step, user._id);
+ },
+};
+
+export default robotMutations;
diff --git a/src/data/resolvers/mutations/scripts.ts b/src/data/resolvers/mutations/scripts.ts
index c1f0a8b2b..8b3e17c3f 100644
--- a/src/data/resolvers/mutations/scripts.ts
+++ b/src/data/resolvers/mutations/scripts.ts
@@ -1,8 +1,9 @@
import { Scripts } from '../../../db/models';
import { IScript } from '../../../db/models/definitions/scripts';
-import { IUserDocument } from '../../../db/models/definitions/users';
+import { MODULE_NAMES } from '../../constants';
+import { putCreateLog, putDeleteLog, putUpdateLog } from '../../logUtils';
import { moduleCheckPermission } from '../../permissions/wrappers';
-import { putCreateLog, putDeleteLog, putUpdateLog } from '../../utils';
+import { IContext } from '../../types';
interface IScriptsEdit extends IScript {
_id: string;
@@ -10,65 +11,52 @@ interface IScriptsEdit extends IScript {
const scriptMutations = {
/**
- * Create new script
+ * Creates a new script
*/
- async scriptsAdd(_root, doc: IScript, { user }: { user: IUserDocument }) {
- const script = await Scripts.createScript(doc);
+ async scriptsAdd(_root, doc: IScript, { user, docModifier }: IContext) {
+ const modifiedDoc = docModifier(doc);
+ const script = await Scripts.createScript(modifiedDoc);
- if (script) {
- await putCreateLog(
- {
- type: 'script',
- newData: JSON.stringify(doc),
- object: script,
- description: `${script.name} has been created`,
- },
- user,
- );
- }
+ await putCreateLog(
+ {
+ type: MODULE_NAMES.SCRIPT,
+ newData: modifiedDoc,
+ object: script,
+ },
+ user,
+ );
return script;
},
/**
- * Update script
+ * Updates a script
*/
- async scriptsEdit(_root, { _id, ...fields }: IScriptsEdit, { user }: { user: IUserDocument }) {
- const script = await Scripts.findOne({ _id });
+ async scriptsEdit(_root, { _id, ...fields }: IScriptsEdit, { user }: IContext) {
+ const script = await Scripts.getScript(_id);
const updated = await Scripts.updateScript(_id, fields);
- if (script) {
- await putUpdateLog(
- {
- type: 'script',
- object: script,
- newData: JSON.stringify(fields),
- description: `${script.name} has been edited`,
- },
- user,
- );
- }
+ await putUpdateLog(
+ {
+ type: MODULE_NAMES.SCRIPT,
+ object: script,
+ newData: fields,
+ updatedDocument: updated,
+ },
+ user,
+ );
return updated;
},
/**
- * Delete script
+ * Deletes a script
*/
- async scriptsRemove(_root, { _id }: { _id: string }, { user }: { user: IUserDocument }) {
- const script = await Scripts.findOne({ _id });
+ async scriptsRemove(_root, { _id }: { _id: string }, { user }: IContext) {
+ const script = await Scripts.getScript(_id);
const removed = await Scripts.removeScript(_id);
- if (script) {
- await putDeleteLog(
- {
- type: 'script',
- object: script,
- description: `${script.name} has been removed`,
- },
- user,
- );
- }
+ await putDeleteLog({ type: MODULE_NAMES.SCRIPT, object: script }, user);
return removed;
},
diff --git a/src/data/resolvers/mutations/segments.ts b/src/data/resolvers/mutations/segments.ts
index 5adf23665..cf4f3791b 100644
--- a/src/data/resolvers/mutations/segments.ts
+++ b/src/data/resolvers/mutations/segments.ts
@@ -1,8 +1,9 @@
import { Segments } from '../../../db/models';
import { ISegment } from '../../../db/models/definitions/segments';
-import { IUserDocument } from '../../../db/models/definitions/users';
+import { MODULE_NAMES } from '../../constants';
+import { putCreateLog, putDeleteLog, putUpdateLog } from '../../logUtils';
import { moduleCheckPermission } from '../../permissions/wrappers';
-import { putCreateLog, putDeleteLog, putUpdateLog } from '../../utils';
+import { IContext } from '../../types';
interface ISegmentsEdit extends ISegment {
_id: string;
@@ -12,20 +13,18 @@ const segmentMutations = {
/**
* Create new segment
*/
- async segmentsAdd(_root, doc: ISegment, { user }: { user: IUserDocument }) {
- const segment = await Segments.createSegment(doc);
+ async segmentsAdd(_root, doc: ISegment, { user, docModifier }: IContext) {
+ const extendedDoc = docModifier(doc);
+ const segment = await Segments.createSegment(extendedDoc);
- if (segment) {
- await putCreateLog(
- {
- type: 'segment',
- newData: JSON.stringify(doc),
- object: segment,
- description: `${segment.name} has been created`,
- },
- user,
- );
- }
+ await putCreateLog(
+ {
+ type: MODULE_NAMES.SEGMENT,
+ newData: doc,
+ object: segment,
+ },
+ user,
+ );
return segment;
},
@@ -33,21 +32,19 @@ const segmentMutations = {
/**
* Update segment
*/
- async segmentsEdit(_root, { _id, ...doc }: ISegmentsEdit, { user }: { user: IUserDocument }) {
- const segment = await Segments.findOne({ _id });
+ async segmentsEdit(_root, { _id, ...doc }: ISegmentsEdit, { user }: IContext) {
+ const segment = await Segments.getSegment(_id);
const updated = await Segments.updateSegment(_id, doc);
- if (segment) {
- await putUpdateLog(
- {
- type: 'segment',
- object: segment,
- newData: JSON.stringify(doc),
- description: `${segment.name} has been edited`,
- },
- user,
- );
- }
+ await putUpdateLog(
+ {
+ type: MODULE_NAMES.SEGMENT,
+ object: segment,
+ newData: doc,
+ updatedDocument: updated,
+ },
+ user,
+ );
return updated;
},
@@ -55,20 +52,11 @@ const segmentMutations = {
/**
* Delete segment
*/
- async segmentsRemove(_root, { _id }: { _id: string }, { user }: { user: IUserDocument }) {
- const segment = await Segments.findOne({ _id });
+ async segmentsRemove(_root, { _id }: { _id: string }, { user }: IContext) {
+ const segment = await Segments.getSegment(_id);
const removed = await Segments.removeSegment(_id);
- if (segment) {
- await putDeleteLog(
- {
- type: 'segment',
- object: segment,
- description: `${segment.name} has been removed`,
- },
- user,
- );
- }
+ await putDeleteLog({ type: MODULE_NAMES.SEGMENT, object: segment }, user);
return removed;
},
diff --git a/src/data/resolvers/mutations/tags.ts b/src/data/resolvers/mutations/tags.ts
index f84a824cc..8fa27b3ee 100644
--- a/src/data/resolvers/mutations/tags.ts
+++ b/src/data/resolvers/mutations/tags.ts
@@ -1,8 +1,9 @@
import { Tags } from '../../../db/models';
import { ITag } from '../../../db/models/definitions/tags';
-import { IUserDocument } from '../../../db/models/definitions/users';
+import { MODULE_NAMES } from '../../constants';
+import { putCreateLog, putDeleteLog, putUpdateLog } from '../../logUtils';
import { checkPermission, requireLogin } from '../../permissions/wrappers';
-import { putCreateLog, putDeleteLog, putUpdateLog } from '../../utils';
+import { IContext } from '../../types';
import { publishConversationsChanged } from './conversations';
interface ITagsEdit extends ITag {
@@ -11,61 +12,57 @@ interface ITagsEdit extends ITag {
const tagMutations = {
/**
- * Create new tag
+ * Creates a new tag
*/
- async tagsAdd(_root, doc: ITag, { user }: { user: IUserDocument }) {
- const tag = await Tags.createTag(doc);
+ async tagsAdd(_root, doc: ITag, { user, docModifier }: IContext) {
+ const tag = await Tags.createTag(docModifier(doc));
- if (tag) {
- await putCreateLog(
- {
- type: 'tag',
- newData: JSON.stringify(tag),
- object: tag,
- description: `${tag.name} has been created`,
- },
- user,
- );
- }
+ await putCreateLog(
+ {
+ type: MODULE_NAMES.TAG,
+ newData: tag,
+ object: tag,
+ description: `"${tag.name}" has been created`,
+ },
+ user,
+ );
return tag;
},
/**
- * Edit tag
+ * Edits a tag
*/
- async tagsEdit(_root, { _id, ...doc }: ITagsEdit, { user }: { user: IUserDocument }) {
- const tag = await Tags.findOne({ _id });
+ async tagsEdit(_root, { _id, ...doc }: ITagsEdit, { user }: IContext) {
+ const tag = await Tags.getTag(_id);
const updated = await Tags.updateTag(_id, doc);
- if (tag) {
- await putUpdateLog(
- {
- type: 'tag',
- object: tag,
- newData: JSON.stringify(doc),
- description: `${tag.name} has been edited`,
- },
- user,
- );
- }
+ await putUpdateLog(
+ {
+ type: MODULE_NAMES.TAG,
+ object: tag,
+ newData: doc,
+ description: `"${tag.name}" has been edited`,
+ },
+ user,
+ );
return updated;
},
/**
- * Remove tag
+ * Removes a tag
*/
- async tagsRemove(_root, { ids }: { ids: string[] }, { user }: { user: IUserDocument }) {
+ async tagsRemove(_root, { ids }: { ids: string[] }, { user }: IContext) {
const tags = await Tags.find({ _id: { $in: ids } });
const removed = await Tags.removeTag(ids);
for (const tag of tags) {
await putDeleteLog(
{
- type: 'tag',
+ type: MODULE_NAMES.TAG,
object: tag,
- description: `${tag.name} has been removed`,
+ description: `"${tag.name}" has been removed`,
},
user,
);
@@ -79,7 +76,7 @@ const tagMutations = {
*/
tagsTag(_root, { type, targetIds, tagIds }: { type: string; targetIds: string[]; tagIds: string[] }) {
if (type === 'conversation') {
- publishConversationsChanged(targetIds, 'tag');
+ publishConversationsChanged(targetIds, MODULE_NAMES.TAG);
}
return Tags.tagsTag(type, targetIds, tagIds);
diff --git a/src/data/resolvers/mutations/tasks.ts b/src/data/resolvers/mutations/tasks.ts
index a6e37385a..de23664e3 100644
--- a/src/data/resolvers/mutations/tasks.ts
+++ b/src/data/resolvers/mutations/tasks.ts
@@ -1,10 +1,9 @@
import { Tasks } from '../../../db/models';
-import { IOrderInput } from '../../../db/models/definitions/boards';
-import { NOTIFICATION_TYPES } from '../../../db/models/definitions/constants';
-import { ITask } from '../../../db/models/definitions/tasks';
-import { IUserDocument } from '../../../db/models/definitions/users';
+import { IItemCommonFields as ITask, IItemDragCommonFields } from '../../../db/models/definitions/boards';
import { checkPermission } from '../../permissions/wrappers';
-import { itemsChange, manageNotifications, notifiedUserIds, sendNotifications } from '../boardUtils';
+import { IContext } from '../../types';
+import { registerOnboardHistory } from '../../utils';
+import { itemsAdd, itemsArchive, itemsChange, itemsCopy, itemsEdit, itemsRemove } from './boardUtils';
interface ITasksEdit extends ITask {
_id: string;
@@ -12,105 +11,69 @@ interface ITasksEdit extends ITask {
const taskMutations = {
/**
- * Create new task
+ * Creates a new task
*/
- async tasksAdd(_root, doc: ITask, { user }: { user: IUserDocument }) {
- return Tasks.createTask({
- ...doc,
- modifiedBy: user._id,
- });
+ async tasksAdd(_root, doc: ITask & { proccessId: string; aboveItemId: string }, { user, docModifier }: IContext) {
+ return itemsAdd(doc, 'deal', user, docModifier, Tasks.createTask);
},
/**
* Edit task
*/
- async tasksEdit(_root, { _id, ...doc }: ITasksEdit, { user }) {
- const task = await Tasks.updateTask(_id, {
- ...doc,
- modifiedAt: new Date(),
- modifiedBy: user._id,
- });
+ async tasksEdit(_root, { _id, proccessId, ...doc }: ITasksEdit & { proccessId: string }, { user }: IContext) {
+ const oldTask = await Tasks.getTask(_id);
- await manageNotifications(Tasks, task, user, 'task');
+ const updatedTask = await itemsEdit(_id, 'task', oldTask, doc, proccessId, user, Tasks.updateTask);
- return task;
- },
-
- /**
- * Change task
- */
- async tasksChange(
- _root,
- { _id, destinationStageId }: { _id: string; destinationStageId: string },
- { user }: { user: IUserDocument },
- ) {
- const task = await Tasks.updateTask(_id, {
- modifiedAt: new Date(),
- modifiedBy: user._id,
- stageId: destinationStageId,
- });
-
- const content = await itemsChange(Tasks, task, 'task', destinationStageId);
-
- await sendNotifications(
- task.stageId || '',
- user,
- NOTIFICATION_TYPES.TASK_CHANGE,
- await notifiedUserIds(task),
- content,
- 'task',
- );
+ if (updatedTask.assignedUserIds) {
+ await registerOnboardHistory({ type: 'taskAssignUser', user });
+ }
- return task;
+ return updatedTask;
},
/**
- * Update task orders (not sendNotifaction, ordered card to change)
+ * Change task
*/
- tasksUpdateOrder(_root, { stageId, orders }: { stageId: string; orders: IOrderInput[] }) {
- return Tasks.updateOrder(stageId, orders);
+ async tasksChange(_root, doc: IItemDragCommonFields, { user }: IContext) {
+ return itemsChange(doc, 'task', user, Tasks.updateTask);
},
/**
* Remove task
*/
- async tasksRemove(_root, { _id }: { _id: string }, { user }: { user: IUserDocument }) {
- const task = await Tasks.findOne({ _id });
-
- if (!task) {
- throw new Error('Task not found');
- }
-
- await sendNotifications(
- task.stageId || '',
- user,
- NOTIFICATION_TYPES.TASK_DELETE,
- await notifiedUserIds(task),
- `'{userName}' deleted task: '${task.name}'`,
- 'task',
- );
-
- return Tasks.removeTask(_id);
+ async tasksRemove(_root, { _id }: { _id: string }, { user }: IContext) {
+ return itemsRemove(_id, 'task', user);
},
/**
* Watch task
*/
- async tasksWatch(_root, { _id, isAdd }: { _id: string; isAdd: boolean }, { user }: { user: IUserDocument }) {
- const task = await Tasks.findOne({ _id });
+ async tasksWatch(_root, { _id, isAdd }: { _id: string; isAdd: boolean }, { user }: IContext) {
+ return Tasks.watchTask(_id, isAdd, user._id);
+ },
- if (!task) {
- throw new Error('Task not found');
- }
+ async tasksCopy(_root, { _id, proccessId }: { _id: string; proccessId: string }, { user }: IContext) {
+ return itemsCopy(_id, proccessId, 'task', user, [], Tasks.createTask);
+ },
- return Tasks.watchTask(_id, isAdd, user._id);
+ async tasksArchive(_root, { stageId, proccessId }: { stageId: string; proccessId: string }, { user }: IContext) {
+ return itemsArchive(stageId, 'task', proccessId, user);
+ },
+
+ async taskUpdateTimeTracking(
+ _root,
+ { _id, status, timeSpent, startDate }: { _id: string; status: string; timeSpent: number; startDate: string },
+ ) {
+ return Tasks.updateTimeTracking(_id, status, timeSpent, startDate);
},
};
checkPermission(taskMutations, 'tasksAdd', 'tasksAdd');
checkPermission(taskMutations, 'tasksEdit', 'tasksEdit');
-checkPermission(taskMutations, 'tasksUpdateOrder', 'tasksUpdateOrder');
checkPermission(taskMutations, 'tasksRemove', 'tasksRemove');
checkPermission(taskMutations, 'tasksWatch', 'tasksWatch');
+checkPermission(taskMutations, 'tasksArchive', 'tasksArchive');
+checkPermission(taskMutations, 'taskUpdateTimeTracking', 'taskUpdateTimeTracking');
export default taskMutations;
diff --git a/src/data/resolvers/mutations/tickets.ts b/src/data/resolvers/mutations/tickets.ts
index 8e513f70a..596dcfe66 100644
--- a/src/data/resolvers/mutations/tickets.ts
+++ b/src/data/resolvers/mutations/tickets.ts
@@ -1,10 +1,9 @@
import { Tickets } from '../../../db/models';
-import { IOrderInput } from '../../../db/models/definitions/boards';
-import { NOTIFICATION_TYPES } from '../../../db/models/definitions/constants';
+import { IItemDragCommonFields } from '../../../db/models/definitions/boards';
import { ITicket } from '../../../db/models/definitions/tickets';
-import { IUserDocument } from '../../../db/models/definitions/users';
import { checkPermission } from '../../permissions/wrappers';
-import { itemsChange, manageNotifications, notifiedUserIds, sendNotifications } from '../boardUtils';
+import { IContext } from '../../types';
+import { itemsAdd, itemsArchive, itemsChange, itemsCopy, itemsEdit, itemsRemove } from './boardUtils';
interface ITicketsEdit extends ITicket {
_id: string;
@@ -14,103 +13,53 @@ const ticketMutations = {
/**
* Create new ticket
*/
- async ticketsAdd(_root, doc: ITicket, { user }: { user: IUserDocument }) {
- return Tickets.createTicket({
- ...doc,
- modifiedBy: user._id,
- });
+ async ticketsAdd(_root, doc: ITicket & { proccessId: string; aboveItemId: string }, { user, docModifier }: IContext) {
+ return itemsAdd(doc, 'ticket', user, docModifier, Tickets.createTicket);
},
/**
* Edit ticket
*/
- async ticketsEdit(_root, { _id, ...doc }: ITicketsEdit, { user }) {
- const ticket = await Tickets.updateTicket(_id, {
- ...doc,
- modifiedAt: new Date(),
- modifiedBy: user._id,
- });
+ async ticketsEdit(_root, { _id, proccessId, ...doc }: ITicketsEdit & { proccessId: string }, { user }: IContext) {
+ const oldTicket = await Tickets.getTicket(_id);
- await manageNotifications(Tickets, ticket, user, 'ticket');
-
- return ticket;
+ return itemsEdit(_id, 'ticket', oldTicket, doc, proccessId, user, Tickets.updateTicket);
},
/**
* Change ticket
*/
- async ticketsChange(
- _root,
- { _id, destinationStageId }: { _id: string; destinationStageId: string },
- { user }: { user: IUserDocument },
- ) {
- const ticket = await Tickets.updateTicket(_id, {
- modifiedAt: new Date(),
- modifiedBy: user._id,
- stageId: destinationStageId,
- });
-
- const content = await itemsChange(Tickets, ticket, 'ticket', destinationStageId);
-
- await sendNotifications(
- ticket.stageId || '',
- user,
- NOTIFICATION_TYPES.TICKET_CHANGE,
- await notifiedUserIds(ticket),
- content,
- 'ticket',
- );
-
- return ticket;
- },
-
- /**
- * Update ticket orders (not sendNotifaction, ordered card to change)
- */
- ticketsUpdateOrder(_root, { stageId, orders }: { stageId: string; orders: IOrderInput[] }) {
- return Tickets.updateOrder(stageId, orders);
+ async ticketsChange(_root, doc: IItemDragCommonFields, { user }: IContext) {
+ return itemsChange(doc, 'ticket', user, Tickets.updateTicket);
},
/**
* Remove ticket
*/
- async ticketsRemove(_root, { _id }: { _id: string }, { user }: { user: IUserDocument }) {
- const ticket = await Tickets.findOne({ _id });
-
- if (!ticket) {
- throw new Error('ticket not found');
- }
-
- await sendNotifications(
- ticket.stageId || '',
- user,
- NOTIFICATION_TYPES.TICKET_DELETE,
- await notifiedUserIds(ticket),
- `'{userName}' deleted ticket: '${ticket.name}'`,
- 'ticket',
- );
-
- return Tickets.removeTicket(_id);
+ async ticketsRemove(_root, { _id }: { _id: string }, { user }: IContext) {
+ return itemsRemove(_id, 'ticket', user);
},
/**
* Watch ticket
*/
- async ticketsWatch(_root, { _id, isAdd }: { _id: string; isAdd: boolean }, { user }: { user: IUserDocument }) {
- const ticket = await Tickets.findOne({ _id });
+ async ticketsWatch(_root, { _id, isAdd }: { _id: string; isAdd: boolean }, { user }: IContext) {
+ return Tickets.watchTicket(_id, isAdd, user._id);
+ },
- if (!ticket) {
- throw new Error('Ticket not found');
- }
+ async ticketsCopy(_root, { _id, proccessId }: { _id: string; proccessId: string }, { user }: IContext) {
+ return itemsCopy(_id, proccessId, 'ticket', user, ['source'], Tickets.createTicket);
+ },
- return Tickets.watchTicket(_id, isAdd, user._id);
+ async ticketsArchive(_root, { stageId, proccessId }: { stageId: string; proccessId: string }, { user }: IContext) {
+ return itemsArchive(stageId, 'ticket', proccessId, user);
},
};
checkPermission(ticketMutations, 'ticketsAdd', 'ticketsAdd');
checkPermission(ticketMutations, 'ticketsEdit', 'ticketsEdit');
-checkPermission(ticketMutations, 'ticketsUpdateOrder', 'ticketsUpdateOrder');
checkPermission(ticketMutations, 'ticketsRemove', 'ticketsRemove');
checkPermission(ticketMutations, 'ticketsWatch', 'ticketsWatch');
+checkPermission(ticketMutations, 'ticketsArchive', 'ticketsArchive');
export default ticketMutations;
diff --git a/src/data/resolvers/mutations/users.ts b/src/data/resolvers/mutations/users.ts
index 75b130389..adb0e537e 100644
--- a/src/data/resolvers/mutations/users.ts
+++ b/src/data/resolvers/mutations/users.ts
@@ -1,14 +1,25 @@
-import { Channels, Users } from '../../../db/models';
-import { IDetail, IEmailSignature, ILink, IUser, IUserDocument } from '../../../db/models/definitions/users';
+import * as telemetry from 'erxes-telemetry';
+import * as express from 'express';
+import { Channels, Configs, Users } from '../../../db/models';
+import { ILink } from '../../../db/models/definitions/common';
+import { IDetail, IEmailSignature, IUser } from '../../../db/models/definitions/users';
+import messageBroker from '../../../messageBroker';
+import { resetPermissionsCache } from '../../permissions/utils';
import { checkPermission, requireLogin } from '../../permissions/wrappers';
-import utils, { authCookieOptions, getEnv } from '../../utils';
+import { IContext } from '../../types';
+import utils, { authCookieOptions, getEnv, sendRequest } from '../../utils';
interface IUsersEdit extends IUser {
channelIds?: string[];
- groupIds?: string[];
_id: string;
}
+interface ILogin {
+ email: string;
+ password: string;
+ deviceToken?: string;
+}
+
const sendInvitationEmail = ({ email, token }: { email: string; token: string }) => {
const MAIN_APP_DOMAIN = getEnv({ name: 'MAIN_APP_DOMAIN' });
const confirmationUrl = `${MAIN_APP_DOMAIN}/confirmation?token=${token}`;
@@ -22,23 +33,78 @@ const sendInvitationEmail = ({ email, token }: { email: string; token: string })
content: confirmationUrl,
domain: MAIN_APP_DOMAIN,
},
- isCustom: true,
},
});
};
+const login = async (args: ILogin, res: express.Response, secure: boolean) => {
+ const response = await Users.login(args);
+
+ const { token } = response;
+
+ res.cookie('auth-token', token, authCookieOptions(secure));
+
+ telemetry.trackCli('logged_in');
+
+ return 'loggedIn';
+};
+
const userMutations = {
- /*
- * Login
- */
- async login(_root, args: { email: string; password: string; deviceToken?: string }, { res }) {
- const response = await Users.login(args);
+ async usersCreateOwner(
+ _root,
+ {
+ email,
+ password,
+ firstName,
+ lastName,
+ subscribeEmail,
+ }: { email: string; password: string; firstName: string; lastName?: string; subscribeEmail?: boolean },
+ ) {
+ const userCount = await Users.countDocuments();
- const { token } = response;
+ if (userCount > 0) {
+ throw new Error('Access denied');
+ }
+
+ const doc: IUser = {
+ isOwner: true,
+ email,
+ password,
+ details: {
+ fullName: `${firstName} ${lastName || ''}`,
+ },
+ };
+
+ const user = await Users.createUser(doc);
+
+ if (subscribeEmail && process.env.NODE_ENV === 'production') {
+ await sendRequest({
+ url: 'https://erxes.io/subscribe',
+ method: 'POST',
+ body: {
+ email,
+ firstName,
+ lastName,
+ },
+ });
+ }
- res.cookie('auth-token', token, authCookieOptions());
+ await Configs.createOrUpdateConfig({ code: 'UPLOAD_SERVICE_TYPE', value: 'local' });
- return 'loggedIn';
+ await messageBroker().sendMessage('erxes-api:integrations-notification', {
+ type: 'addUserId',
+ payload: {
+ _id: user._id,
+ },
+ });
+
+ return 'success';
+ },
+ /*
+ * Login
+ */
+ async login(_root, args: ILogin, { res, requestInfo }: IContext) {
+ return login(args, res, requestInfo.secure);
},
async logout(_root, _args, { res }) {
@@ -57,7 +123,7 @@ const userMutations = {
const link = `${MAIN_APP_DOMAIN}/reset-password?token=${token}`;
- utils.sendEmail({
+ await utils.sendEmail({
toEmails: [email],
title: 'Reset password',
template: {
@@ -68,7 +134,7 @@ const userMutations = {
},
});
- return link;
+ return 'sent';
},
/*
@@ -78,14 +144,17 @@ const userMutations = {
return Users.resetPassword(args);
},
+ /*
+ * Reset member's password
+ */
+ usersResetMemberPassword(_root, args: { _id: string; newPassword: string }) {
+ return Users.resetMemberPassword(args);
+ },
+
/*
* Change user password
*/
- usersChangePassword(
- _root,
- args: { currentPassword: string; newPassword: string },
- { user }: { user: IUserDocument },
- ) {
+ usersChangePassword(_root, args: { currentPassword: string; newPassword: string }, { user }: IContext) {
return Users.changePassword({ _id: user._id, ...args });
},
@@ -93,7 +162,7 @@ const userMutations = {
* Update user
*/
async usersEdit(_root, args: IUsersEdit) {
- const { _id, username, email, channelIds = [], groupIds = [], details, links } = args;
+ const { _id, username, email, channelIds, groupIds = [], brandIds = [], details, links } = args;
const updatedUser = await Users.updateUser(_id, {
username,
@@ -101,10 +170,13 @@ const userMutations = {
details,
links,
groupIds,
+ brandIds,
});
// add new user to channels
- await Channels.updateUserChannels(channelIds, _id);
+ await Channels.updateUserChannels(channelIds || [], _id);
+
+ await resetPermissionsCache();
return updatedUser;
},
@@ -127,13 +199,9 @@ const userMutations = {
details: IDetail;
links: ILink;
},
- { user }: { user: IUserDocument },
+ { user }: IContext,
) {
- const userOnDb = await Users.findOne({ _id: user._id });
-
- if (!userOnDb) {
- throw new Error('User not found');
- }
+ const userOnDb = await Users.getUser(user._id);
const valid = await Users.comparePassword(password, userOnDb.password);
@@ -148,7 +216,7 @@ const userMutations = {
/*
* Set Active or inactive user
*/
- async usersSetActiveStatus(_root, { _id }: { _id: string }, { user }: { user: IUserDocument }) {
+ async usersSetActiveStatus(_root, { _id }: { _id: string }, { user }: IContext) {
if (user._id === _id) {
throw new Error('You can not delete yourself');
}
@@ -159,11 +227,11 @@ const userMutations = {
/*
* Invites users to team members
*/
- async usersInvite(_root, { entries }: { entries: Array<{ email: string; groupId: string }> }) {
+ async usersInvite(_root, { entries }: { entries: Array<{ email: string; password: string; groupId: string }> }) {
for (const entry of entries) {
await Users.checkDuplication({ email: entry.email });
- const token = await Users.createUserWithConfirmation(entry);
+ const token = await Users.invite(entry);
sendInvitationEmail({ email: entry.email, token });
}
@@ -180,13 +248,6 @@ const userMutations = {
return token;
},
- /*
- * User has seen onboard
- */
- async usersSeenOnBoard(_root, {}, { user }: { user: IUserDocument }) {
- return Users.updateOnBoardSeen({ _id: user._id });
- },
-
async usersConfirmInvitation(
_root,
{
@@ -203,18 +264,23 @@ const userMutations = {
username?: string;
},
) {
- return Users.confirmInvitation({ token, password, passwordConfirmation, fullName, username });
+ const user = await Users.confirmInvitation({ token, password, passwordConfirmation, fullName, username });
+
+ await messageBroker().sendMessage('erxes-api:integrations-notification', {
+ type: 'addUserId',
+ payload: {
+ _id: user._id,
+ },
+ });
+
+ return user;
},
- usersConfigEmailSignatures(
- _root,
- { signatures }: { signatures: IEmailSignature[] },
- { user }: { user: IUserDocument },
- ) {
+ usersConfigEmailSignatures(_root, { signatures }: { signatures: IEmailSignature[] }, { user }: IContext) {
return Users.configEmailSignatures(user._id, signatures);
},
- usersConfigGetNotificationByEmail(_root, { isAllowed }: { isAllowed: boolean }, { user }: { user: IUserDocument }) {
+ usersConfigGetNotificationByEmail(_root, { isAllowed }: { isAllowed: boolean }, { user }: IContext) {
return Users.configGetNotificationByEmail(user._id, isAllowed);
},
};
@@ -228,5 +294,6 @@ checkPermission(userMutations, 'usersEdit', 'usersEdit');
checkPermission(userMutations, 'usersInvite', 'usersInvite');
checkPermission(userMutations, 'usersResendInvitation', 'usersInvite');
checkPermission(userMutations, 'usersSetActiveStatus', 'usersSetActiveStatus');
+checkPermission(userMutations, 'usersResetMemberPassword', 'usersEdit');
export default userMutations;
diff --git a/src/data/resolvers/mutations/webhooks.ts b/src/data/resolvers/mutations/webhooks.ts
new file mode 100644
index 000000000..8ba09e8ec
--- /dev/null
+++ b/src/data/resolvers/mutations/webhooks.ts
@@ -0,0 +1,90 @@
+import { Webhooks } from '../../../db/models';
+import { WEBHOOK_STATUS } from '../../../db/models/definitions/constants';
+import { IWebhook } from '../../../db/models/definitions/webhook';
+import { MODULE_NAMES } from '../../constants';
+import { putCreateLog, putDeleteLog, putUpdateLog } from '../../logUtils';
+import { moduleCheckPermission } from '../../permissions/wrappers';
+import { IContext } from '../../types';
+import { sendRequest } from '../../utils';
+
+interface IWebhookEdit extends IWebhook {
+ _id: string;
+}
+
+const webhookMutations = {
+ /**
+ * Creates a new webhook
+ */
+ async webhooksAdd(_root, doc: IWebhook, { user, docModifier }: IContext) {
+ const webhook = await Webhooks.createWebhook(docModifier(doc));
+
+ sendRequest({
+ url: webhook.url,
+ headers: {
+ 'Erxes-token': webhook.token || '',
+ },
+ method: 'post',
+ })
+ .then(async () => {
+ await Webhooks.updateStatus(webhook._id, WEBHOOK_STATUS.AVAILABLE);
+ })
+ .catch(async () => {
+ await Webhooks.updateStatus(webhook._id, WEBHOOK_STATUS.UNAVAILABLE);
+ });
+
+ await putCreateLog(
+ {
+ type: MODULE_NAMES.WEBHOOK,
+ newData: webhook,
+ object: webhook,
+ description: `${webhook.url} has been created`,
+ },
+ user,
+ );
+
+ return webhook;
+ },
+
+ /**
+ * Edits a webhook
+ */
+ async webhooksEdit(_root, { _id, ...doc }: IWebhookEdit, { user }: IContext) {
+ const webhook = await Webhooks.getWebHook(_id);
+ const updated = await Webhooks.updateWebhook(_id, doc);
+
+ await putUpdateLog(
+ {
+ type: MODULE_NAMES.WEBHOOK,
+ object: webhook,
+ newData: doc,
+ description: `${webhook.url} has been edited`,
+ },
+ user,
+ );
+
+ return updated;
+ },
+
+ /**
+ * Removes a webhook
+ */
+ async webhooksRemove(_root, { _id }: { _id: string }, { user }: IContext) {
+ const webhook = await Webhooks.getWebHook(_id);
+ const removed = await Webhooks.removeWebhooks(_id);
+
+ await putDeleteLog(
+ {
+ type: MODULE_NAMES.WEBHOOK,
+ object: webhook,
+ description: `${webhook.url} has been removed`,
+ },
+ user,
+ );
+
+ return removed;
+ },
+};
+
+moduleCheckPermission(webhookMutations, 'manageWebhooks');
+
+export default webhookMutations;
diff --git a/src/data/resolvers/mutations/widgets.ts b/src/data/resolvers/mutations/widgets.ts
new file mode 100644
index 000000000..62a5d8c33
--- /dev/null
+++ b/src/data/resolvers/mutations/widgets.ts
@@ -0,0 +1,718 @@
+import * as strip from 'strip';
+import {
+ Brands,
+ Companies,
+ Conformities,
+ Conversations,
+ Customers,
+ EngageMessages,
+ Forms,
+ FormSubmissions,
+ Integrations,
+ KnowledgeBaseArticles,
+ MessengerApps,
+ Users,
+} from '../../../db/models';
+import Messages from '../../../db/models/ConversationMessages';
+import { IBrowserInfo, IVisitorContactInfoParams } from '../../../db/models/Customers';
+import { CONVERSATION_OPERATOR_STATUS, CONVERSATION_STATUSES } from '../../../db/models/definitions/constants';
+import { IIntegrationDocument, IMessengerDataMessagesItem } from '../../../db/models/definitions/integrations';
+import { IKnowledgebaseCredentials, ILeadCredentials } from '../../../db/models/definitions/messengerApps';
+import { debugBase } from '../../../debuggers';
+import { trackViewPageEvent } from '../../../events';
+import memoryStorage from '../../../inmemoryStorage';
+import { graphqlPubsub } from '../../../pubsub';
+import { AUTO_BOT_MESSAGES, BOT_MESSAGE_TYPES } from '../../constants';
+import { registerOnboardHistory, sendEmail, sendMobileNotification, sendRequest, sendToWebhook } from '../../utils';
+import { conversationNotifReceivers } from './conversations';
+
+interface ISubmission {
+ _id: string;
+ value: any;
+ type?: string;
+ validation?: string;
+}
+
+interface IWidgetEmailParams {
+ toEmails: string[];
+ fromEmail: string;
+ title: string;
+ content: string;
+}
+
+export const getMessengerData = async (integration: IIntegrationDocument) => {
+ let messagesByLanguage: IMessengerDataMessagesItem | null = null;
+ let messengerData = integration.messengerData;
+
+ if (messengerData) {
+ messengerData = messengerData.toJSON();
+
+ const languageCode = integration.languageCode || 'en';
+ const messages = (messengerData || {}).messages;
+
+ if (messages) {
+ messagesByLanguage = messages[languageCode];
+ }
+ }
+
+ // knowledgebase app =======
+ const kbApp = await MessengerApps.findOne({
+ kind: 'knowledgebase',
+ 'credentials.integrationId': integration._id,
+ });
+
+ const topicId = kbApp && kbApp.credentials ? (kbApp.credentials as IKnowledgebaseCredentials).topicId : null;
+
+ // lead app ==========
+ const leadApp = await MessengerApps.findOne({ kind: 'lead', 'credentials.integrationId': integration._id });
+
+ const formCode = leadApp && leadApp.credentials ? (leadApp.credentials as ILeadCredentials).formCode : null;
+
+ // website app ============
+ const websiteApps = await MessengerApps.find({
+ kind: 'website',
+ 'credentials.integrationId': integration._id,
+ });
+
+ return {
+ ...(messengerData || {}),
+ messages: messagesByLanguage,
+ knowledgeBaseTopicId: topicId,
+ websiteApps,
+ formCode,
+ };
+};
+
+const widgetMutations = {
+ // Find integrationId by brandCode
+ async widgetsLeadConnect(_root, args: { brandCode: string; formCode: string; cachedCustomerId?: string }) {
+ const brand = await Brands.findOne({ code: args.brandCode });
+ const form = await Forms.findOne({ code: args.formCode });
+
+ if (!brand || !form) {
+ throw new Error('Invalid configuration');
+ }
+
+ // find integration by brandId & formId
+ const integ = await Integrations.findOne({
+ brandId: brand._id,
+ formId: form._id,
+ });
+
+ if (!integ) {
+ throw new Error('Integration not found');
+ }
+
+ if (integ.leadData && integ.leadData.loadType === 'embedded') {
+ await Integrations.increaseViewCount(form._id);
+ }
+
+ if (integ.createdUserId) {
+ const user = await Users.getUser(integ.createdUserId);
+
+ registerOnboardHistory({ type: 'leadIntegrationInstalled', user });
+ }
+
+ if (integ.leadData?.isRequireOnce && args.cachedCustomerId) {
+ const conversation = await Conversations.findOne({ customerId: args.cachedCustomerId, integrationId: integ.id });
+ if (conversation) {
+ return null;
+ }
+ }
+
+ // return integration details
+ return {
+ integration: integ,
+ form,
+ };
+ },
+
+ // create new conversation using form data
+ async widgetsSaveLead(
+ _root,
+ args: {
+ integrationId: string;
+ formId: string;
+ submissions: ISubmission[];
+ browserInfo: any;
+ cachedCustomerId?: string;
+ },
+ ) {
+ const { integrationId, formId, submissions, browserInfo, cachedCustomerId } = args;
+
+ const form = await Forms.findOne({ _id: formId });
+
+ if (!form) {
+ throw new Error('Form not found');
+ }
+
+ const errors = await Forms.validate(formId, submissions);
+
+ if (errors.length > 0) {
+ return { status: 'error', errors };
+ }
+
+ const content = form.title;
+
+ let email;
+ let phone;
+ let firstName = '';
+ let lastName = '';
+
+ submissions.forEach(submission => {
+ if (submission.type === 'email') {
+ email = submission.value;
+ }
+
+ if (submission.type === 'phone') {
+ phone = submission.value;
+ }
+
+ if (submission.type === 'firstName') {
+ firstName = submission.value;
+ }
+
+ if (submission.type === 'lastName') {
+ lastName = submission.value;
+ }
+ });
+
+ // get or create customer
+ let customer = await Customers.getWidgetCustomer({ integrationId, email, phone, cachedCustomerId });
+
+ if (!customer) {
+ customer = await Customers.createCustomer({
+ integrationId,
+ primaryEmail: email,
+ emails: [email],
+ firstName,
+ lastName,
+ primaryPhone: phone,
+ });
+ }
+
+ const customerDoc = {
+ location: browserInfo,
+ firstName: customer.firstName || firstName,
+ lastName: customer.lastName || lastName,
+ ...(customer.primaryEmail
+ ? {}
+ : {
+ emails: [email],
+ primaryEmail: email,
+ }),
+ ...(customer.primaryPhone
+ ? {}
+ : {
+ phones: [phone],
+ primaryPhone: phone,
+ }),
+ };
+
+ // update location info and missing fields
+ await Customers.updateCustomer(customer._id, customerDoc);
+
+ // Inserting customer id into submitted customer ids
+ const doc = {
+ formId,
+ customerId: customer._id,
+ submittedAt: new Date(),
+ };
+
+ await FormSubmissions.createFormSubmission(doc);
+
+ // create conversation
+ const conversation = await Conversations.createConversation({
+ integrationId,
+ customerId: customer._id,
+ content,
+ });
+
+ // create message
+ const message = await Messages.createMessage({
+ conversationId: conversation._id,
+ customerId: customer._id,
+ content,
+ formWidgetData: submissions,
+ });
+
+ // increasing form submitted count
+ await Integrations.increaseContactsGathered(formId);
+
+ graphqlPubsub.publish('conversationClientMessageInserted', {
+ conversationClientMessageInserted: message,
+ });
+
+ graphqlPubsub.publish('conversationMessageInserted', {
+ conversationMessageInserted: message,
+ });
+
+ await sendToWebhook('create', 'popupSubmitted', {
+ formId: args.formId,
+ submissions: args.submissions,
+ customer: customerDoc,
+ cachedCustomerId: args.cachedCustomerId,
+ });
+
+ return { status: 'ok', messageId: message._id };
+ },
+
+ widgetsLeadIncreaseViewCount(_root, { formId }: { formId: string }) {
+ return Integrations.increaseViewCount(formId);
+ },
+
+ widgetsKnowledgebaseIncReactionCount(
+ _root,
+ { articleId, reactionChoice }: { articleId: string; reactionChoice: string },
+ ) {
+ return KnowledgeBaseArticles.incReactionCount(articleId, reactionChoice);
+ },
+
+ /*
+ * Create a new customer or update existing customer info
+ * when connection established
+ */
+ async widgetsMessengerConnect(
+ _root,
+ args: {
+ brandCode: string;
+ email?: string;
+ phone?: string;
+ code?: string;
+ isUser?: boolean;
+ companyData?: any;
+ data?: any;
+ cachedCustomerId?: string;
+ deviceToken?: string;
+ },
+ ) {
+ const { brandCode, email, phone, code, isUser, companyData, data, cachedCustomerId, deviceToken } = args;
+
+ const customData = data;
+
+ // find brand
+ const brand = await Brands.findOne({ code: brandCode });
+
+ if (!brand) {
+ throw new Error('Brand not found');
+ }
+
+ // find integration
+ const integration = await Integrations.getWidgetIntegration(brandCode, 'messenger');
+
+ if (!integration) {
+ throw new Error('Integration not found');
+ }
+
+ let customer = await Customers.getWidgetCustomer({
+ integrationId: integration._id,
+ cachedCustomerId,
+ email,
+ phone,
+ code,
+ });
+
+ const doc = {
+ integrationId: integration._id,
+ email,
+ phone,
+ code,
+ isUser,
+ deviceToken,
+ };
+
+ customer = customer
+ ? await Customers.updateMessengerCustomer({ _id: customer._id, doc, customData })
+ : await Customers.createMessengerCustomer({ doc, customData });
+
+ // get or create company
+ if (companyData && companyData.name) {
+ let company = await Companies.findOne({
+ $or: [{ names: { $in: [companyData.name] } }, { primaryName: companyData.name }],
+ });
+
+ if (!company) {
+ companyData.primaryName = companyData.name;
+ companyData.names = [companyData.name];
+
+ company = await Companies.createCompany({ ...companyData, scopeBrandIds: [brand._id] });
+ }
+
+ // add company to customer's companyIds list
+ await Conformities.create({
+ mainType: 'customer',
+ mainTypeId: customer._id,
+ relType: 'company',
+ relTypeId: company._id,
+ });
+ }
+
+ if (integration.createdUserId) {
+ const user = await Users.getUser(integration.createdUserId);
+
+ registerOnboardHistory({ type: 'messengerIntegrationInstalled', user });
+ }
+
+ return {
+ integrationId: integration._id,
+ uiOptions: integration.uiOptions,
+ languageCode: integration.languageCode,
+ messengerData: await getMessengerData(integration),
+ customerId: customer._id,
+ brand,
+ };
+ },
+
+ /*
+ * Create a new message
+ */
+ async widgetsInsertMessage(
+ _root,
+ args: {
+ integrationId: string;
+ customerId: string;
+ conversationId?: string;
+ message: string;
+ attachments?: any[];
+ contentType: string;
+ },
+ ) {
+ const { integrationId, customerId, conversationId, message, attachments, contentType } = args;
+
+ const conversationContent = strip(message || '').substring(0, 100);
+
+ // customer can write a message
+ // to the closed conversation even if it's closed
+ let conversation;
+
+ const integration = await Integrations.findOne({ _id: integrationId }).lean();
+
+ const messengerData = integration.messengerData || {};
+
+ const { botEndpointUrl } = messengerData;
+
+ let HAS_BOTENDPOINT_URL = (botEndpointUrl || '').length > 0;
+
+ const getConversationStatus = (IS_CONVERSATION_OPERATOR?: boolean) => {
+ const { OPEN, CLOSED } = CONVERSATION_STATUSES;
+
+ if (IS_CONVERSATION_OPERATOR) {
+ HAS_BOTENDPOINT_URL = false;
+ }
+
+ return !HAS_BOTENDPOINT_URL || IS_CONVERSATION_OPERATOR ? OPEN : CLOSED;
+ };
+
+ if (conversationId) {
+ conversation = await Conversations.findOne({ _id: conversationId }).lean();
+
+ conversation = await Conversations.findByIdAndUpdate(
+ conversationId,
+ {
+ // mark this conversation as unread
+ readUserIds: [],
+
+ // reopen this conversation if it's closed
+ status: getConversationStatus(conversation.operatorStatus !== CONVERSATION_OPERATOR_STATUS.BOT),
+ },
+ { new: true },
+ );
+ // create conversation
+ } else {
+ conversation = await Conversations.createConversation({
+ customerId,
+ integrationId,
+ operatorStatus: HAS_BOTENDPOINT_URL ? CONVERSATION_OPERATOR_STATUS.BOT : CONVERSATION_OPERATOR_STATUS.OPERATOR,
+ status: getConversationStatus(),
+ content: conversationContent,
+ });
+ }
+
+ // create message
+ const msg = await Messages.createMessage({
+ conversationId: conversation._id,
+ customerId,
+ attachments,
+ contentType,
+ content: message,
+ });
+
+ await Conversations.updateOne(
+ { _id: msg.conversationId },
+ {
+ $set: {
+ // Reopen its conversation if it's closed
+ status: getConversationStatus(),
+
+ // setting conversation's content to last message
+ content: conversationContent,
+
+ // Mark as unread
+ readUserIds: [],
+ },
+ },
+ );
+
+ // mark customer as active
+ await Customers.markCustomerAsActive(conversation.customerId);
+
+ graphqlPubsub.publish('conversationClientMessageInserted', { conversationClientMessageInserted: msg });
+ graphqlPubsub.publish('conversationMessageInserted', { conversationMessageInserted: msg });
+
+ // bot message ================
+ if (HAS_BOTENDPOINT_URL) {
+ graphqlPubsub.publish('conversationBotTypingStatus', {
+ conversationBotTypingStatus: { conversationId: msg.conversationId, typing: true },
+ });
+
+ const botRequest = await sendRequest({
+ method: 'POST',
+ url: botEndpointUrl,
+ body: {
+ type: 'text',
+ text: message,
+ },
+ });
+
+ const { responses } = botRequest;
+
+ const botData =
+ responses.length !== 0
+ ? responses
+ : [
+ {
+ type: 'text',
+ text: AUTO_BOT_MESSAGES.NO_RESPONSE,
+ },
+ ];
+
+ const botMessage = await Messages.createMessage({
+ conversationId: conversation._id,
+ customerId,
+ contentType,
+ botData,
+ });
+
+ graphqlPubsub.publish('conversationBotTypingStatus', {
+ conversationBotTypingStatus: { conversationId: msg.conversationId, typing: false },
+ });
+
+ graphqlPubsub.publish('conversationClientMessageInserted', { conversationClientMessageInserted: botMessage });
+ graphqlPubsub.publish('conversationMessageInserted', { conversationMessageInserted: botMessage });
+ }
+
+ const customerLastStatus = await memoryStorage().get(`customer_last_status_${customerId}`, 'left');
+
+ if (customerLastStatus === 'left') {
+ memoryStorage().set(`customer_last_status_${customerId}`, 'joined');
+
+ // customer has joined + time
+ const conversationMessages = await Conversations.changeCustomerStatus(
+ 'joined',
+ customerId,
+ conversation.integrationId,
+ );
+
+ for (const mg of conversationMessages) {
+ graphqlPubsub.publish('conversationMessageInserted', {
+ conversationMessageInserted: mg,
+ });
+ }
+
+ // notify as connected
+ graphqlPubsub.publish('customerConnectionChanged', {
+ customerConnectionChanged: {
+ _id: customerId,
+ status: 'connected',
+ },
+ });
+ }
+
+ if (!HAS_BOTENDPOINT_URL) {
+ sendMobileNotification({
+ title: 'You have a new message',
+ body: conversationContent,
+ customerId,
+ conversationId: conversation._id,
+ receivers: conversationNotifReceivers(conversation, customerId),
+ });
+ }
+
+ await sendToWebhook('create', 'customerMessages', msg);
+
+ return msg;
+ },
+
+ /*
+ * Mark given conversation's messages as read
+ */
+ async widgetsReadConversationMessages(_root, args: { conversationId: string }) {
+ await Messages.updateMany(
+ {
+ conversationId: args.conversationId,
+ userId: { $exists: true },
+ isCustomerRead: { $ne: true },
+ },
+ { isCustomerRead: true },
+ { multi: true },
+ );
+
+ return args.conversationId;
+ },
+
+ widgetsSaveCustomerGetNotified(_root, args: IVisitorContactInfoParams) {
+ return Customers.saveVisitorContactInfo(args);
+ },
+
+ /*
+ * Update customer location field
+ */
+ async widgetsSaveBrowserInfo(_root, { customerId, browserInfo }: { customerId: string; browserInfo: IBrowserInfo }) {
+ // update location
+ await Customers.updateLocation(customerId, browserInfo);
+
+ try {
+ await trackViewPageEvent({ customerId, attributes: { url: browserInfo.url } });
+ } catch (e) {
+ /* istanbul ignore next */
+ debugBase(`Error occurred during widgets save browser info ${e.message}`);
+ }
+
+ // update messenger session data
+ const customer = await Customers.updateSession(customerId);
+
+ // Preventing from displaying non messenger integrations like form's messages
+ // as last unread message
+ const integration = await Integrations.findOne({
+ _id: customer.integrationId,
+ kind: 'messenger',
+ });
+
+ if (!integration) {
+ throw new Error('Integration not found');
+ }
+
+ const brand = await Brands.findOne({ _id: integration.brandId });
+
+ if (!brand) {
+ throw new Error('Brand not found');
+ }
+
+ // try to create engage chat auto messages
+ if (!customer.primaryEmail) {
+ await EngageMessages.createVisitorMessages({
+ brand,
+ integration,
+ customer,
+ browserInfo,
+ });
+ }
+
+ // find conversations
+ const convs = await Conversations.find({
+ integrationId: integration._id,
+ customerId: customer._id,
+ });
+
+ return Messages.findOne(Conversations.widgetsUnreadMessagesQuery(convs));
+ },
+
+ widgetsSendTypingInfo(_root, args: { conversationId: string; text?: string }) {
+ graphqlPubsub.publish('conversationClientTypingStatusChanged', {
+ conversationClientTypingStatusChanged: args,
+ });
+
+ return 'ok';
+ },
+
+ async widgetsSendEmail(_root, args: IWidgetEmailParams) {
+ const { toEmails, fromEmail, title, content } = args;
+
+ await sendEmail({
+ toEmails,
+ fromEmail,
+ title,
+ template: { data: { content } },
+ });
+ },
+
+ async widgetBotRequest(
+ _root,
+ {
+ integrationId,
+ conversationId,
+ customerId,
+ message,
+ payload,
+ type,
+ }: {
+ conversationId: string;
+ customerId: string;
+ integrationId: string;
+ message: string;
+ payload: string;
+ type: string;
+ },
+ ) {
+ const integration = await Integrations.findOne({ _id: integrationId }).lean();
+
+ const { botEndpointUrl } = integration.messengerData;
+
+ // create customer message
+ const msg = await Messages.createMessage({
+ conversationId,
+ customerId,
+ content: message,
+ });
+
+ graphqlPubsub.publish('conversationClientMessageInserted', { conversationClientMessageInserted: msg });
+ graphqlPubsub.publish('conversationMessageInserted', { conversationMessageInserted: msg });
+
+ let botMessage;
+ let botData;
+
+ if (type !== BOT_MESSAGE_TYPES.SAY_SOMETHING) {
+ const botRequest = await sendRequest({
+ method: 'POST',
+ url: botEndpointUrl,
+ body: {
+ type: 'text',
+ text: payload,
+ },
+ });
+
+ const { responses } = botRequest;
+
+ botData =
+ responses.length !== 0
+ ? responses
+ : [
+ {
+ type: 'text',
+ text: AUTO_BOT_MESSAGES.NO_RESPONSE,
+ },
+ ];
+ } else {
+ botData = [
+ {
+ type: 'text',
+ text: payload,
+ },
+ ];
+ }
+
+ // create bot message
+ botMessage = await Messages.createMessage({
+ conversationId,
+ customerId,
+ botData,
+ });
+
+ graphqlPubsub.publish('conversationClientMessageInserted', { conversationClientMessageInserted: botMessage });
+ graphqlPubsub.publish('conversationMessageInserted', { conversationMessageInserted: botMessage });
+
+ return botMessage;
+ },
+};
+
+export default widgetMutations;
diff --git a/src/data/resolvers/pipeline.ts b/src/data/resolvers/pipeline.ts
index d75521586..667894d09 100644
--- a/src/data/resolvers/pipeline.ts
+++ b/src/data/resolvers/pipeline.ts
@@ -1,7 +1,13 @@
-import { Users } from '../../db/models';
+import { Deals, GrowthHacks, Tasks, Tickets, Users } from '../../db/models';
import { IPipelineDocument } from '../../db/models/definitions/boards';
-import { PIPELINE_VISIBLITIES } from '../../db/models/definitions/constants';
-import { IUserDocument } from '../../db/models/definitions/users';
+import { BOARD_TYPES, PIPELINE_VISIBLITIES } from '../../db/models/definitions/constants';
+import { IContext } from '../types';
+import {
+ generateDealCommonFilters,
+ generateGrowthHackCommonFilters,
+ generateTaskCommonFilters,
+ generateTicketCommonFilters,
+} from './queries/boardUtils';
export default {
members(pipeline: IPipelineDocument, {}) {
@@ -12,7 +18,7 @@ export default {
return [];
},
- isWatched(pipeline: IPipelineDocument, _args, { user }: { user: IUserDocument }) {
+ isWatched(pipeline: IPipelineDocument, _args, { user }: IContext) {
const watchedUserIds = pipeline.watchedUserIds || [];
if (watchedUserIds.includes(user._id)) {
@@ -21,4 +27,48 @@ export default {
return false;
},
+
+ state(pipeline: IPipelineDocument) {
+ if (pipeline.startDate && pipeline.endDate) {
+ const now = new Date().getTime();
+
+ const startDate = new Date(pipeline.startDate).getTime();
+ const endDate = new Date(pipeline.endDate).getTime();
+
+ if (now > endDate) {
+ return 'Completed';
+ } else if (now < endDate && now > startDate) {
+ return 'In progress';
+ } else {
+ return 'Not started';
+ }
+ }
+
+ return '';
+ },
+
+ async itemsTotalCount(pipeline: IPipelineDocument, _args, { user }: IContext) {
+ switch (pipeline.type) {
+ case BOARD_TYPES.DEAL: {
+ const filter = await generateDealCommonFilters(user._id, { pipelineId: pipeline._id });
+
+ return Deals.find(filter).countDocuments();
+ }
+ case BOARD_TYPES.TICKET: {
+ const filter = await generateTicketCommonFilters(user._id, { pipelineId: pipeline._id });
+
+ return Tickets.find(filter).countDocuments();
+ }
+ case BOARD_TYPES.TASK: {
+ const filter = await generateTaskCommonFilters(user._id, { pipelineId: pipeline._id });
+
+ return Tasks.find(filter).countDocuments();
+ }
+ case BOARD_TYPES.GROWTH_HACK: {
+ const filter = await generateGrowthHackCommonFilters(user._id, { pipelineId: pipeline._id });
+
+ return GrowthHacks.find(filter).countDocuments();
+ }
+ }
+ },
};
diff --git a/src/data/resolvers/product.ts b/src/data/resolvers/product.ts
new file mode 100644
index 000000000..de02e66e5
--- /dev/null
+++ b/src/data/resolvers/product.ts
@@ -0,0 +1,12 @@
+import { ProductCategories, Tags } from '../../db/models';
+import { IProductDocument } from '../../db/models/definitions/deals';
+
+export default {
+ category(product: IProductDocument) {
+ return ProductCategories.findOne({ _id: product.categoryId });
+ },
+
+ getTags(product: IProductDocument) {
+ return Tags.find({ _id: { $in: product.tagIds || [] } });
+ },
+};
diff --git a/src/data/resolvers/productCategory.ts b/src/data/resolvers/productCategory.ts
new file mode 100644
index 000000000..dea69af82
--- /dev/null
+++ b/src/data/resolvers/productCategory.ts
@@ -0,0 +1,12 @@
+import { Products } from '../../db/models';
+import { IProductCategoryDocument } from '../../db/models/definitions/deals';
+
+export default {
+ isRoot(category: IProductCategoryDocument, {}) {
+ return category.parentId ? false : true;
+ },
+
+ async productCount(category: IProductCategoryDocument, {}) {
+ return Products.countDocuments({ categoryId: category._id });
+ },
+};
diff --git a/src/data/resolvers/queries/activityLogs.ts b/src/data/resolvers/queries/activityLogs.ts
index 1b7e87a1d..25bc939c6 100644
--- a/src/data/resolvers/queries/activityLogs.ts
+++ b/src/data/resolvers/queries/activityLogs.ts
@@ -1,28 +1,157 @@
-import { ActivityLogs } from '../../../db/models';
-import { IActivityLog } from '../../../db/models/definitions/activityLogs';
-import { moduleRequireLogin } from '../../permissions/wrappers';
-
-const activityLogQueries = {
- /**
- * Get activity log list
- */
- activityLogs(_root, doc: IActivityLog) {
- const { contentType, contentId, activityType, limit } = doc;
-
- const query = { 'contentType.type': contentType, 'contentType.id': contentId };
-
- if (activityType) {
- query['activity.type'] = activityType;
- }
-
- const sort = { createdAt: -1 };
-
- return ActivityLogs.find(query)
- .sort(sort)
- .limit(limit);
- },
-};
-
-moduleRequireLogin(activityLogQueries);
-
-export default activityLogQueries;
+import {
+ ActivityLogs,
+ Conformities,
+ Conversations,
+ EmailDeliveries,
+ EngageMessages,
+ InternalNotes,
+ Tasks,
+} from '../../../db/models';
+import { IActivityLogDocument } from '../../../db/models/definitions/activityLogs';
+import { debugExternalApi } from '../../../debuggers';
+import { moduleRequireLogin } from '../../permissions/wrappers';
+import { IContext } from '../../types';
+
+interface IListArgs {
+ contentType: string;
+ contentId: string;
+ activityType: string;
+}
+
+const activityLogQueries = {
+ /**
+ * Get activity log list
+ */
+ async activityLogs(_root, doc: IListArgs, { dataSources }: IContext) {
+ const { contentType, contentId, activityType } = doc;
+
+ const activities: IActivityLogDocument[] = [];
+
+ const relatedItemIds = await Conformities.savedConformity({
+ mainType: contentType,
+ mainTypeId: contentId,
+ relTypes: contentType !== 'task' ? ['deal', 'ticket'] : ['deal', 'ticket', 'task'],
+ });
+
+ const relatedTaskIds = await Conformities.savedConformity({
+ mainType: contentType,
+ mainTypeId: contentId,
+ relTypes: ['task'],
+ });
+
+ const collectItems = (items: any, type?: string) => {
+ if (items) {
+ items.map(item => {
+ let result: IActivityLogDocument = {} as any;
+
+ item = item.toJSON();
+
+ if (!type) {
+ result = item;
+ }
+
+ if (type && type !== 'taskDetail') {
+ result._id = item._id;
+ result.contentType = type;
+ result.contentId = contentId;
+ result.createdAt = item.createdAt;
+ }
+
+ if (type === 'taskDetail') {
+ result._id = item._id;
+ result.contentType = type;
+ result.createdAt = item.closeDate || item.createdAt;
+ }
+ activities.push(result);
+ });
+ }
+ };
+
+ const collectConversations = async () => {
+ collectItems(
+ await Conversations.find({ $or: [{ customerId: contentId }, { participatedUserIds: contentId }] }).limit(25),
+ 'conversation',
+ );
+
+ if (contentType === 'customer') {
+ let conversationIds;
+
+ try {
+ conversationIds = await dataSources.IntegrationsAPI.fetchApi('/facebook/get-customer-posts', {
+ customerId: contentId,
+ });
+ collectItems(await Conversations.find({ _id: { $in: conversationIds } }), 'comment');
+ } catch (e) {
+ debugExternalApi(e);
+ }
+ }
+ };
+
+ const collectActivityLogs = async () => {
+ collectItems(await ActivityLogs.find({ contentId: { $in: [...relatedItemIds, contentId] } }));
+ };
+
+ const collectInternalNotes = async () => {
+ collectItems(await InternalNotes.find({ contentTypeId: contentId }).sort({ createdAt: -1 }), 'note');
+ };
+
+ const collectEngageMessages = async () => {
+ collectItems(await EngageMessages.find({ customerIds: contentId, method: 'email' }), 'engage-email');
+ collectItems(await EmailDeliveries.find({ customerId: contentId }), 'email');
+ };
+
+ const collectTasks = async () => {
+ if (contentType !== 'task') {
+ collectItems(
+ await Tasks.find({ $and: [{ _id: { $in: relatedTaskIds } }, { status: { $ne: 'archived' } }] }).sort({
+ closeDate: 1,
+ }),
+ 'taskDetail',
+ );
+ }
+
+ const contentIds = activities.filter(activity => activity.action === 'convert').map(activity => activity.content);
+
+ if (Array.isArray(contentIds)) {
+ collectItems(await Conversations.find({ _id: { $in: contentIds } }).limit(25), 'conversation');
+ }
+ };
+
+ switch (activityType) {
+ case 'conversation':
+ await collectConversations();
+ break;
+
+ case 'internal_note':
+ await collectInternalNotes();
+ break;
+
+ case 'task':
+ await collectTasks();
+ break;
+
+ case 'email':
+ await collectEngageMessages();
+ break;
+
+ default:
+ await collectConversations();
+ await collectActivityLogs();
+ await collectInternalNotes();
+ await collectEngageMessages();
+ await collectTasks();
+
+ break;
+ }
+
+ activities.sort((a, b) => {
+ return new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime();
+ });
+
+ return activities;
+ },
+};
+
+moduleRequireLogin(activityLogQueries);
+
+export default activityLogQueries;
diff --git a/src/data/resolvers/queries/boardUtils.ts b/src/data/resolvers/queries/boardUtils.ts
index 4ae97ca4d..93ebc539f 100644
--- a/src/data/resolvers/queries/boardUtils.ts
+++ b/src/data/resolvers/queries/boardUtils.ts
@@ -1,128 +1,199 @@
import * as moment from 'moment';
-import { Stages } from '../../../db/models';
-import { getNextMonth, getToday } from '../../utils';
-
-export const contains = (values: string[] = [], empty = false) => {
- if (empty) {
- return [];
- }
+import { Conformities, Pipelines, Stages } from '../../../db/models';
+import { IItemCommonFields } from '../../../db/models/definitions/boards';
+import { BOARD_STATUSES } from '../../../db/models/definitions/constants';
+import { getNextMonth, getToday, regexSearchText } from '../../utils';
+import { IListParams } from './boards';
+
+export interface IArchiveArgs {
+ pipelineId: string;
+ search: string;
+ page?: number;
+ perPage?: number;
+}
+const contains = (values: string[]) => {
return { $in: values };
};
-export const generateCommonFilters = async (args: any) => {
+export const generateCommonFilters = async (currentUserId: string, args: any) => {
const {
- $and,
- date,
pipelineId,
stageId,
search,
- overdue,
- nextMonth,
- nextDay,
- nextWeek,
- noCloseDate,
+ closeDateType,
assignedUserIds,
customerIds,
companyIds,
- order,
- probability,
+ conformityMainType,
+ conformityMainTypeId,
+ conformityIsRelated,
+ conformityIsSaved,
initialStageId,
+ type,
+ labelIds,
+ priority,
+ userIds,
} = args;
- const assignedToNoOne = value => {
+ const isListEmpty = value => {
return value.length === 1 && value[0].length === 0;
};
- const filter: any = {};
+ const filter: any = { status: { $ne: BOARD_STATUSES.ARCHIVED } };
+
+ let filterIds: string[] = [];
if (assignedUserIds) {
// Filter by assigned to no one
- const notAssigned = assignedToNoOne(assignedUserIds);
+ const notAssigned = isListEmpty(assignedUserIds);
- filter.assignedUserIds = notAssigned ? contains([], true) : contains(assignedUserIds);
+ filter.assignedUserIds = notAssigned ? [] : contains(assignedUserIds);
}
- if ($and) {
- filter.$and = $and;
- }
+ if (customerIds && type) {
+ const relIds = await Conformities.filterConformity({
+ mainType: 'customer',
+ mainTypeIds: customerIds,
+ relType: type,
+ });
- if (customerIds) {
- filter.customerIds = contains(customerIds);
+ filterIds = relIds;
}
- if (companyIds) {
- filter.companyIds = contains(companyIds);
+ if (companyIds && type) {
+ const relIds = await Conformities.filterConformity({
+ mainType: 'company',
+ mainTypeIds: companyIds,
+ relType: type,
+ });
+
+ filterIds = filterIds.length ? filterIds.filter(id => relIds.includes(id)) : relIds;
}
- if (order) {
- filter.order = order;
+ if (customerIds || companyIds) {
+ filter._id = contains(filterIds || []);
}
- if (probability) {
- filter.probability = probability;
+ if (conformityMainType && conformityMainTypeId) {
+ if (conformityIsSaved) {
+ const relIds = await Conformities.savedConformity({
+ mainType: conformityMainType,
+ mainTypeId: conformityMainTypeId,
+ relTypes: [type],
+ });
+
+ filter._id = contains(relIds || []);
+ }
+
+ if (conformityIsRelated) {
+ const relIds = await Conformities.relatedConformity({
+ mainType: conformityMainType,
+ mainTypeId: conformityMainTypeId,
+ relType: type,
+ });
+
+ filter._id = contains(relIds);
+ }
}
if (initialStageId) {
filter.initialStageId = initialStageId;
}
- if (nextDay) {
- const tommorrow = moment().add(1, 'days');
-
- filter.closeDate = {
- $gte: new Date(tommorrow.startOf('day').format('YYYY-MM-DD')),
- $lte: new Date(tommorrow.endOf('day').format('YYYY-MM-DD')),
- };
+ if (closeDateType) {
+ if (closeDateType === 'nextDay') {
+ const tommorrow = moment().add(1, 'days');
+
+ filter.closeDate = {
+ $gte: new Date(tommorrow.startOf('day').toISOString()),
+ $lte: new Date(tommorrow.endOf('day').toISOString()),
+ };
+ }
+
+ if (closeDateType === 'nextWeek') {
+ const monday = moment()
+ .day(1 + 7)
+ .format('YYYY-MM-DD');
+ const nextSunday = moment()
+ .day(7 + 7)
+ .format('YYYY-MM-DD');
+
+ filter.closeDate = {
+ $gte: new Date(monday),
+ $lte: new Date(nextSunday),
+ };
+ }
+
+ if (closeDateType === 'nextMonth') {
+ const now = new Date();
+ const { start, end } = getNextMonth(now);
+
+ filter.closeDate = {
+ $gte: new Date(start),
+ $lte: new Date(end),
+ };
+ }
+
+ if (closeDateType === 'noCloseDate') {
+ filter.closeDate = { $exists: false };
+ }
+
+ if (closeDateType === 'overdue') {
+ const now = new Date();
+ const today = getToday(now);
+
+ filter.closeDate = { $lt: today };
+ }
}
- if (nextWeek) {
- const monday = moment()
- .day(1 + 7)
- .format('YYYY-MM-DD');
- const nextSunday = moment()
- .day(7 + 7)
- .format('YYYY-MM-DD');
+ if (search) {
+ Object.assign(filter, regexSearchText(search));
+ }
- filter.closeDate = {
- $gte: new Date(monday),
- $lte: new Date(nextSunday),
- };
+ if (stageId) {
+ filter.stageId = stageId;
}
- if (nextMonth) {
- const now = new Date();
- const { start, end } = getNextMonth(now);
+ if (labelIds) {
+ const isEmpty = isListEmpty(labelIds);
- filter.closeDate = {
- $gte: new Date(start),
- $lte: new Date(end),
- };
+ filter.labelIds = isEmpty ? { $in: [null, []] } : { $in: labelIds };
}
- if (noCloseDate) {
- filter.closeDate = { $exists: false };
+ if (priority) {
+ filter.priority = contains(priority);
}
- if (overdue) {
- const now = new Date();
- const today = getToday(now);
-
- filter.closeDate = { $lt: today };
+ if (pipelineId) {
+ const pipeline = await Pipelines.getPipeline(pipelineId);
+ if (pipeline.isCheckUser && !(pipeline.excludeCheckUserIds || []).includes(currentUserId)) {
+ Object.assign(filter, { $or: [{ assignedUserIds: { $in: [currentUserId] } }, { userId: currentUserId }] });
+ }
}
- if (search) {
- filter.$or = [
- { name: new RegExp(`.*${search || ''}.*`, 'i') },
- { description: new RegExp(`.*${search || ''}.*`, 'i') },
- ];
+ if (userIds) {
+ const isEmpty = isListEmpty(userIds);
+
+ filter.userId = isEmpty ? { $in: [null, []] } : { $in: userIds };
}
- if (stageId) {
- filter.stageId = stageId;
+ return filter;
+};
+
+export const generateDealCommonFilters = async (currentUserId: string, args: any, extraParams?: any) => {
+ args.type = 'deal';
+
+ const filter = await generateCommonFilters(currentUserId, args);
+ const { productIds } = extraParams || args;
+
+ if (productIds) {
+ filter['productsData.productId'] = contains(productIds);
}
// Calendar monthly date
+ const { date, pipelineId } = args;
+
if (date) {
const stageIds = await Stages.find({ pipelineId }).distinct('_id');
@@ -133,38 +204,52 @@ export const generateCommonFilters = async (args: any) => {
return filter;
};
-export const generateDealCommonFilters = async (args: any, extraParams?: any) => {
- const filter = await generateCommonFilters(args);
- const { productIds } = extraParams || args;
+export const generateTicketCommonFilters = async (currentUserId: string, args: any, extraParams?: any) => {
+ args.type = 'ticket';
- if (productIds) {
- filter['productsData.productId'] = contains(productIds);
+ const filter = await generateCommonFilters(currentUserId, args);
+ const { source } = extraParams || args;
+
+ if (source) {
+ filter.source = contains(source);
}
return filter;
};
-export const generateTicketCommonFilters = async (args: any, extraParams?: any) => {
- const filter = await generateCommonFilters(args);
- const { priority, source } = extraParams || args;
+export const generateTaskCommonFilters = async (currentUserId: string, args: any) => {
+ args.type = 'task';
- if (priority) {
- filter.priority = contains(priority);
- }
+ return generateCommonFilters(currentUserId, args);
+};
- if (source) {
- filter.source = contains(source);
+export const generateSort = (args: IListParams) => {
+ let sort: any = { order: 1, createdAt: -1 };
+
+ const { sortField, sortDirection } = args;
+
+ if (sortField && sortDirection) {
+ sort = { [sortField]: sortDirection };
}
- return filter;
+ return sort;
};
-export const generateTaskCommonFilters = async (args: any, extraParams?: any) => {
- const filter = await generateCommonFilters(args);
- const { priority } = extraParams || args;
+export const generateGrowthHackCommonFilters = async (currentUserId: string, args: any, extraParams?: any) => {
+ args.type = 'growthHack';
- if (priority) {
- filter.priority = contains(priority);
+ const { hackStage, pipelineId, stageId } = extraParams || args;
+
+ const filter = await generateCommonFilters(currentUserId, args);
+
+ if (hackStage) {
+ filter.hackStages = contains(hackStage);
+ }
+
+ if (!stageId && pipelineId) {
+ const stageIds = await Stages.find({ pipelineId }).distinct('_id');
+
+ filter.stageId = { $in: stageIds };
}
return filter;
@@ -175,15 +260,84 @@ interface IDate {
year: number;
}
-export const dateSelector = (date: IDate) => {
+const dateSelector = (date: IDate) => {
const { year, month } = date;
- const currentDate = new Date();
- const start = currentDate.setFullYear(year, month, 1);
- const end = currentDate.setFullYear(year, month + 1, 0);
+ const start = new Date(Date.UTC(year, month, 1, 0, 0, 0));
+ const end = new Date(Date.UTC(year, month + 1, 1, 0, 0, 0));
return {
- $gte: new Date(start),
- $lte: new Date(end),
+ $gte: start,
+ $lte: end,
};
};
+
+export const checkItemPermByUser = async (currentUserId: string, item: IItemCommonFields) => {
+ const stage = await Stages.getStage(item.stageId);
+
+ const pipeline = await Pipelines.getPipeline(stage.pipelineId);
+
+ if (pipeline.visibility === 'private' && !(pipeline.memberIds || []).includes(currentUserId)) {
+ throw new Error('You do not have permission to view.');
+ }
+
+ // pipeline is Show only the users assigned(created) cards checked
+ // and current user nothing dominant users
+ // current user hans't this carts assigned and created
+ if (
+ pipeline.isCheckUser &&
+ !(pipeline.excludeCheckUserIds || []).includes(currentUserId) &&
+ !((item.assignedUserIds || []).includes(currentUserId) || item.userId === currentUserId)
+ ) {
+ throw new Error('You do not have permission to view.');
+ }
+
+ return item;
+};
+
+export const archivedItems = async (params: IArchiveArgs, collection: any) => {
+ const { pipelineId, search, ...listArgs } = params;
+
+ const filter: any = { status: BOARD_STATUSES.ARCHIVED };
+ const { page = 0, perPage = 0 } = listArgs;
+
+ const stages = await Stages.find({ pipelineId });
+
+ if (stages.length > 0) {
+ filter.stageId = { $in: stages.map(stage => stage._id) };
+
+ if (search) {
+ Object.assign(filter, regexSearchText(search, 'name'));
+ }
+
+ return collection
+ .find(filter)
+ .sort({
+ modifiedAt: -1,
+ })
+ .skip(page || 0)
+ .limit(perPage || 20);
+ }
+
+ return [];
+};
+
+export const archivedItemsCount = async (params: IArchiveArgs, collection: any) => {
+ const { pipelineId, search } = params;
+
+ const filter: any = { status: BOARD_STATUSES.ARCHIVED };
+
+ const stages = await Stages.find({ pipelineId });
+
+ if (stages.length > 0) {
+ filter.stageId = { $in: stages.map(stage => stage._id) };
+
+ if (search) {
+ Object.assign(filter, regexSearchText(search, 'name'));
+ }
+
+ return collection.countDocuments(filter);
+ }
+
+ return 0;
+};
diff --git a/src/data/resolvers/queries/boards.ts b/src/data/resolvers/queries/boards.ts
index 4fc3fe75c..f6b3191ee 100644
--- a/src/data/resolvers/queries/boards.ts
+++ b/src/data/resolvers/queries/boards.ts
@@ -1,81 +1,258 @@
-import { Boards, Pipelines, Stages } from '../../../db/models';
-import { moduleRequireLogin } from '../../permissions/wrappers';
-
-export interface IDate {
- month: number;
- year: number;
-}
-
-export interface IListParams {
- pipelineId?: string;
- stageId: string;
- skip?: number;
- date?: IDate;
- search?: string;
- customerIds?: [string];
- companyIds?: [string];
- assignedUserIds?: [string];
-}
-
-const boardQueries = {
- /**
- * Boards list
- */
- boards(_root, { type }: { type: string }) {
- return Boards.find({ type }).sort({ order: 1, createdAt: -1 });
- },
-
- /**
- * Board detail
- */
- boardDetail(_root, { _id }: { _id: string }) {
- return Boards.findOne({ _id });
- },
-
- /**
- * Get last board
- */
- boardGetLast(_root, { type }: { type: string }) {
- return Boards.findOne({ type }).sort({ createdAt: -1 });
- },
-
- /**
- * Pipelines list
- */
- pipelines(_root, { boardId }: { boardId: string; type: string }) {
- return Pipelines.find({ boardId }).sort({ order: 1, createdAt: -1 });
- },
-
- /**
- * Pipeline detail
- */
- pipelineDetail(_root, { _id }: { _id: string }) {
- return Pipelines.findOne({ _id });
- },
-
- /**
- * Stages list
- */
- stages(_root, { pipelineId, isNotLost }: { pipelineId: string; isNotLost: boolean }) {
- const filter: any = {};
-
- filter.pipelineId = pipelineId;
-
- if (isNotLost) {
- filter.probability = { $ne: 'Lost' };
- }
-
- return Stages.find(filter).sort({ order: 1, createdAt: -1 });
- },
-
- /**
- * Stage detail
- */
- stageDetail(_root, { _id }: { _id: string }) {
- return Stages.findOne({ _id });
- },
-};
-
-moduleRequireLogin(boardQueries);
-
-export default boardQueries;
+import { Boards, Deals, Pipelines, Stages, Tasks, Tickets } from '../../../db/models';
+import { BOARD_STATUSES } from '../../../db/models/definitions/constants';
+import { moduleRequireLogin } from '../../permissions/wrappers';
+import { IContext } from '../../types';
+import { paginate, regexSearchText } from '../../utils';
+import { IConformityQueryParams } from './types';
+
+export interface IDate {
+ month: number;
+ year: number;
+}
+
+export interface IListParams extends IConformityQueryParams {
+ pipelineId: string;
+ stageId: string;
+ skip?: number;
+ date?: IDate;
+ search?: string;
+ customerIds?: string[];
+ companyIds?: string[];
+ assignedUserIds?: string[];
+ sortField?: string;
+ sortDirection?: number;
+ labelIds?: string[];
+ userIds?: string[];
+}
+
+const boardQueries = {
+ /**
+ * Boards list
+ */
+ boards(_root, { type }: { type: string }, { commonQuerySelector }: IContext) {
+ return Boards.find({ ...commonQuerySelector, type }).sort({ order: 1, createdAt: -1 });
+ },
+
+ /**
+ * Boards count
+ */
+ async boardCounts(_root, { type }: { type: string }, { commonQuerySelector }: IContext) {
+ const boards = await Boards.find({ ...commonQuerySelector, type }).sort({ name: 1 });
+
+ const counts: Array<{ _id: string; name: string; count: number }> = [];
+
+ let allCount = 0;
+
+ for (const board of boards) {
+ const count = await Pipelines.find({ boardId: board._id }).countDocuments();
+
+ counts.push({
+ _id: board._id,
+ name: board.name || '',
+ count,
+ });
+
+ allCount += count;
+ }
+
+ counts.unshift({ _id: '', name: 'All', count: allCount });
+
+ return counts;
+ },
+
+ /**
+ * Board detail
+ */
+ boardDetail(_root, { _id }: { _id: string }, { commonQuerySelector }: IContext) {
+ return Boards.findOne({ ...commonQuerySelector, _id });
+ },
+
+ /**
+ * Get last board
+ */
+ boardGetLast(_root, { type }: { type: string }, { commonQuerySelector }: IContext) {
+ return Boards.findOne({ ...commonQuerySelector, type }).sort({ createdAt: -1 });
+ },
+
+ /**
+ * Pipelines list
+ */
+ pipelines(
+ _root,
+ { boardId, type, ...queryParams }: { boardId: string; type: string; page: number; perPage: number },
+ ) {
+ const query: any = {};
+ const { page, perPage } = queryParams;
+
+ if (boardId) {
+ query.boardId = boardId;
+ }
+
+ if (type) {
+ query.type = type;
+ }
+
+ if (page && perPage) {
+ return paginate(Pipelines.find(query).sort({ createdAt: 1 }), queryParams);
+ }
+
+ return Pipelines.find(query).sort({ order: 1, createdAt: -1 });
+ },
+
+ async pipelineStateCount(_root, { boardId, type }: { boardId: string; type: string }) {
+ const query: any = {};
+
+ if (boardId) {
+ query.boardId = boardId;
+ }
+
+ if (type) {
+ query.type = type;
+ }
+
+ const counts: any = {};
+ const now = new Date();
+
+ const notStartedQuery = {
+ ...query,
+ startDate: { $gt: now },
+ };
+
+ const notStartedCount = await Pipelines.find(notStartedQuery).countDocuments();
+
+ counts['Not started'] = notStartedCount;
+
+ const inProgressQuery = {
+ ...query,
+ startDate: { $lt: now },
+ endDate: { $gt: now },
+ };
+
+ const inProgressCount = await Pipelines.find(inProgressQuery).countDocuments();
+
+ counts['In progress'] = inProgressCount;
+
+ const completedQuery = {
+ ...query,
+ endDate: { $lt: now },
+ };
+
+ const completedCounted = await Pipelines.find(completedQuery).countDocuments();
+
+ counts.Completed = completedCounted;
+
+ counts.All = notStartedCount + inProgressCount + completedCounted;
+
+ return counts;
+ },
+
+ /**
+ * Pipeline detail
+ */
+ pipelineDetail(_root, { _id }: { _id: string }) {
+ return Pipelines.findOne({ _id });
+ },
+
+ /**
+ * Stages list
+ */
+ stages(_root, { pipelineId, isNotLost, isAll }: { pipelineId: string; isNotLost: boolean; isAll: boolean }) {
+ const filter: any = {};
+
+ filter.pipelineId = pipelineId;
+
+ if (isNotLost) {
+ filter.probability = { $ne: 'Lost' };
+ }
+
+ if (!isAll) {
+ filter.$or = [{ status: null }, { status: BOARD_STATUSES.ACTIVE }];
+ }
+
+ return Stages.find(filter).sort({ order: 1, createdAt: -1 });
+ },
+
+ /**
+ * Stage detail
+ */
+ stageDetail(_root, { _id }: { _id: string }) {
+ return Stages.findOne({ _id });
+ },
+
+ /**
+ * Archived stages
+ */
+
+ archivedStages(
+ _root,
+ { pipelineId, search, ...listArgs }: { pipelineId: string; search?: string; page?: number; perPage?: number },
+ ) {
+ const filter: any = { pipelineId, status: BOARD_STATUSES.ARCHIVED };
+
+ if (search) {
+ Object.assign(filter, regexSearchText(search, 'name'));
+ }
+
+ return paginate(Stages.find(filter).sort({ createdAt: -1 }), listArgs);
+ },
+
+ archivedStagesCount(_root, { pipelineId, search }: { pipelineId: string; search?: string }) {
+ const filter: any = { pipelineId, status: BOARD_STATUSES.ARCHIVED };
+
+ if (search) {
+ Object.assign(filter, regexSearchText(search, 'name'));
+ }
+
+ return Stages.countDocuments(filter);
+ },
+
+ /**
+ * ConvertTo info
+ */
+ async convertToInfo(_root, { conversationId }: { conversationId: string }) {
+ const filter = { sourceConversationId: conversationId };
+ let dealUrl = '';
+ let ticketUrl = '';
+ let taskUrl = '';
+
+ const deal = await Deals.findOne(filter);
+
+ if (deal) {
+ const stage = await Stages.getStage(deal.stageId);
+ const pipeline = await Pipelines.getPipeline(stage.pipelineId);
+ const board = await Boards.getBoard(pipeline.boardId);
+
+ dealUrl = `/deal/board?_id=${board._id}&pipelineId=${pipeline._id}&itemId=${deal._id}`;
+ }
+
+ const task = await Tasks.findOne(filter);
+
+ if (task) {
+ const stage = await Stages.getStage(task.stageId);
+ const pipeline = await Pipelines.getPipeline(stage.pipelineId);
+ const board = await Boards.getBoard(pipeline.boardId);
+
+ taskUrl = `/task/board?_id=${board._id}&pipelineId=${pipeline._id}&itemId=${task._id}`;
+ }
+
+ const ticket = await Tickets.findOne(filter);
+
+ if (ticket) {
+ const stage = await Stages.getStage(ticket.stageId);
+ const pipeline = await Pipelines.getPipeline(stage.pipelineId);
+ const board = await Boards.getBoard(pipeline.boardId);
+
+ ticketUrl = `/inbox/ticket/board?_id=${board._id}&pipelineId=${pipeline._id}&itemId=${ticket._id}`;
+ }
+
+ return {
+ dealUrl,
+ ticketUrl,
+ taskUrl,
+ };
+ },
+};
+
+moduleRequireLogin(boardQueries);
+
+export default boardQueries;
diff --git a/src/data/resolvers/queries/brands.ts b/src/data/resolvers/queries/brands.ts
index 2cb9b70c1..825b66c4c 100644
--- a/src/data/resolvers/queries/brands.ts
+++ b/src/data/resolvers/queries/brands.ts
@@ -1,42 +1,66 @@
-import { Brands } from '../../../db/models';
-import { checkPermission, requireLogin } from '../../permissions/wrappers';
-import { paginate } from '../../utils';
-
-const brandQueries = {
- /**
- * Brands list
- */
- brands(_root, args: { page: number; perPage: number }) {
- const brands = paginate(Brands.find({}), args);
- return brands.sort({ createdAt: -1 });
- },
-
- /**
- * Get one brand
- */
- brandDetail(_root, { _id }: { _id: string }) {
- return Brands.findOne({ _id });
- },
-
- /**
- * Get all brands count. We will use it in pager
- */
- brandsTotalCount() {
- return Brands.find({}).countDocuments();
- },
-
- /**
- * Get last brand
- */
- brandsGetLast() {
- return Brands.findOne({}).sort({ createdAt: -1 });
- },
-};
-
-requireLogin(brandQueries, 'brandsTotalCount');
-requireLogin(brandQueries, 'brandsGetLast');
-requireLogin(brandQueries, 'brandDetail');
-
-checkPermission(brandQueries, 'brands', 'showBrands', []);
-
-export default brandQueries;
+import { Brands } from '../../../db/models';
+import { checkPermission, requireLogin } from '../../permissions/wrappers';
+import { IContext } from '../../types';
+import { readFile } from '../../utils';
+
+interface IListArgs {
+ page?: number;
+ perPage?: number;
+ searchValue?: string;
+}
+
+const queryBuilder = (params: IListArgs, brandIdSelector: any) => {
+ const selector: any = { ...brandIdSelector };
+
+ const { searchValue } = params;
+
+ if (searchValue) {
+ selector.name = new RegExp(`.*${params.searchValue}.*`, 'i');
+ }
+
+ return selector;
+};
+
+const brandQueries = {
+ /**
+ * Brands list
+ */
+ brands(_root, args: IListArgs, { brandIdSelector }: IContext) {
+ const selector = queryBuilder(args, brandIdSelector);
+
+ return Brands.find(selector).sort({ createdAt: -1 });
+ },
+
+ /**
+ * Get one brand
+ */
+ brandDetail(_root, { _id }: { _id: string }) {
+ return Brands.findOne({ _id });
+ },
+
+ /**
+ * Get all brands count. We will use it in pager
+ */
+ brandsTotalCount(_root, _args, { brandIdSelector }: IContext) {
+ return Brands.find(brandIdSelector).countDocuments();
+ },
+
+ /**
+ * Get last brand
+ */
+ brandsGetLast() {
+ return Brands.findOne({}).sort({ createdAt: -1 });
+ },
+
+ brandsGetDefaultEmailConfig() {
+ return readFile('conversationCron');
+ },
+};
+
+requireLogin(brandQueries, 'brandsTotalCount');
+requireLogin(brandQueries, 'brandsGetLast');
+requireLogin(brandQueries, 'brandDetail');
+
+checkPermission(brandQueries, 'brands', 'showBrands', []);
+
+export default brandQueries;
diff --git a/src/data/resolvers/queries/channels.ts b/src/data/resolvers/queries/channels.ts
index 52011f800..9a14f03ca 100644
--- a/src/data/resolvers/queries/channels.ts
+++ b/src/data/resolvers/queries/channels.ts
@@ -1,58 +1,55 @@
-import { Channels } from '../../../db/models';
-import { checkPermission, requireLogin } from '../../permissions/wrappers';
-import { paginate } from '../../utils';
-
-interface IIn {
- $in: string[];
-}
-
-interface IChannelQuery {
- memberIds?: IIn;
-}
-
-const channelQueries = {
- /**
- * Channels list
- */
- channels(_root, { memberIds, ...queryParams }: { page: number; perPage: number; memberIds: string[] }) {
- const query: IChannelQuery = {};
- const sort = { createdAt: -1 };
-
- if (memberIds) {
- query.memberIds = { $in: memberIds };
- }
-
- const channels = paginate(Channels.find(query), queryParams);
-
- return channels.sort(sort);
- },
-
- /**
- * Get one channel
- */
- channelDetail(_root, { _id }: { _id: string }) {
- return Channels.findOne({ _id });
- },
-
- /**
- * Get all channels count. We will use it in pager
- */
- channelsTotalCount() {
- return Channels.find({}).countDocuments();
- },
-
- /**
- * Get last channel
- */
- channelsGetLast() {
- return Channels.findOne({}).sort({ createdAt: -1 });
- },
-};
-
-requireLogin(channelQueries, 'channelsGetLast');
-requireLogin(channelQueries, 'channelsTotalCount');
-requireLogin(channelQueries, 'channelDetail');
-
-checkPermission(channelQueries, 'channels', 'showChannels', []);
-
-export default channelQueries;
+import { Channels } from '../../../db/models';
+import { checkPermission, requireLogin } from '../../permissions/wrappers';
+
+interface IIn {
+ $in: string[];
+}
+
+interface IChannelQuery {
+ memberIds?: IIn;
+}
+
+const channelQueries = {
+ /**
+ * Channels list
+ */
+ channels(_root, { memberIds }: { memberIds: string[] }) {
+ const query: IChannelQuery = {};
+ const sort = { createdAt: -1 };
+
+ if (memberIds) {
+ query.memberIds = { $in: memberIds };
+ }
+
+ return Channels.find(query).sort(sort);
+ },
+
+ /**
+ * Get one channel
+ */
+ channelDetail(_root, { _id }: { _id: string }) {
+ return Channels.findOne({ _id });
+ },
+
+ /**
+ * Get all channels count. We will use it in pager
+ */
+ channelsTotalCount() {
+ return Channels.find({}).countDocuments();
+ },
+
+ /**
+ * Get last channel
+ */
+ channelsGetLast() {
+ return Channels.findOne({}).sort({ createdAt: -1 });
+ },
+};
+
+requireLogin(channelQueries, 'channelsGetLast');
+requireLogin(channelQueries, 'channelsTotalCount');
+requireLogin(channelQueries, 'channelDetail');
+
+checkPermission(channelQueries, 'channels', 'showChannels', []);
+
+export default channelQueries;
diff --git a/src/data/resolvers/queries/checklists.ts b/src/data/resolvers/queries/checklists.ts
new file mode 100644
index 000000000..189318596
--- /dev/null
+++ b/src/data/resolvers/queries/checklists.ts
@@ -0,0 +1,25 @@
+import { Checklists } from '../../../db/models';
+import { moduleRequireLogin } from '../../permissions/wrappers';
+
+const checklistQueries = {
+ /**
+ * Checklists list
+ */
+ async checklists(_root, { contentType, contentTypeId }: { contentType: string; contentTypeId: string }) {
+ return Checklists.find({ contentType, contentTypeId }).sort({
+ createdDate: 1,
+ order: 1,
+ });
+ },
+
+ /**
+ * Checklist
+ */
+ async checklistDetail(_root, { _id }: { _id: string }) {
+ return Checklists.findOne({ _id }).sort({ order: 1 });
+ },
+};
+
+moduleRequireLogin(checklistQueries);
+
+export default checklistQueries;
diff --git a/src/data/resolvers/queries/companies.ts b/src/data/resolvers/queries/companies.ts
index c2c919c60..4b3379374 100644
--- a/src/data/resolvers/queries/companies.ts
+++ b/src/data/resolvers/queries/companies.ts
@@ -1,157 +1,85 @@
-import { Brands, Companies, Segments, Tags } from '../../../db/models';
-import { ACTIVITY_CONTENT_TYPES, TAG_TYPES } from '../../../db/models/definitions/constants';
-import { COC_LEAD_STATUS_TYPES, COC_LIFECYCLE_STATE_TYPES } from '../../constants';
-import { brandFilter, filter, IListArgs, sortBuilder } from '../../modules/coc/companies';
-import QueryBuilder from '../../modules/segments/queryBuilder';
-import { checkPermission, requireLogin } from '../../permissions/wrappers';
-import { paginate } from '../../utils';
-
-interface ICountArgs extends IListArgs {
- only?: string;
- byFakeSegment: any;
-}
-
-interface ICountBy {
- [index: string]: number;
-}
-
-const count = async (query: any, args: ICountArgs) => {
- const selector = await filter(args);
-
- const findQuery = { ...selector, ...query };
-
- return Companies.find(findQuery).countDocuments();
-};
-
-const countBySegment = async (args: ICountArgs): Promise© 2019 erxes inc Growth Marketing Platform
tag should be allowed
+ const contentValid = content.indexOf('