|
@@ -1,10 +1,10 @@
|
|
-const Contact = require('../model/contact');
|
|
|
|
|
|
+const ContactModel = require('../model/contact');
|
|
const UserModel = require('../model/user');
|
|
const UserModel = require('../model/user');
|
|
|
|
|
|
const listContacts = async (req, res, next) => {
|
|
const listContacts = async (req, res, next) => {
|
|
try {
|
|
try {
|
|
const userId = req.user.id;
|
|
const userId = req.user.id;
|
|
- const contacts = await Contact.getList(userId, req.query);
|
|
|
|
|
|
+ const contacts = await ContactModel.getList(userId, req.query);
|
|
return res.json({
|
|
return res.json({
|
|
status: 'success',
|
|
status: 'success',
|
|
code: 200,
|
|
code: 200,
|
|
@@ -21,7 +21,7 @@ const getContactById = async (req, res, next) => {
|
|
try {
|
|
try {
|
|
const id = req.params.id;
|
|
const id = req.params.id;
|
|
const userId = req.user.id;
|
|
const userId = req.user.id;
|
|
- const contact = await Contact.getById(id, userId);
|
|
|
|
|
|
+ const contact = await ContactModel.getById(id, userId);
|
|
if (contact)
|
|
if (contact)
|
|
return res.json({
|
|
return res.json({
|
|
status: 'success',
|
|
status: 'success',
|
|
@@ -42,11 +42,14 @@ const getContactById = async (req, res, next) => {
|
|
|
|
|
|
const addContact = async (req, res, next) => {
|
|
const addContact = async (req, res, next) => {
|
|
try {
|
|
try {
|
|
- const { name, lastName, number, country, avatarUrl, color } =
|
|
|
|
- await UserModel.findByNumber(req.body.number);
|
|
|
|
- if (avatarUrl) {
|
|
|
|
- const userId = req.user.id;
|
|
|
|
- const newContact = await Contact.add({
|
|
|
|
|
|
+ const userId = req.user.id;
|
|
|
|
+ const number = req.body.number;
|
|
|
|
+ const user = await UserModel.findByNumber(number);
|
|
|
|
+ const isExist = await ContactModel.getByField(number, userId);
|
|
|
|
+ if (user && !isExist) {
|
|
|
|
+ const { name, lastName, country, avatarUrl, color, _id } = user;
|
|
|
|
+ const newContact = await ContactModel.add({
|
|
|
|
+ companionId: _id,
|
|
name,
|
|
name,
|
|
lastName,
|
|
lastName,
|
|
number,
|
|
number,
|
|
@@ -75,7 +78,7 @@ const removeContact = async (req, res, next) => {
|
|
try {
|
|
try {
|
|
const id = req.params.id;
|
|
const id = req.params.id;
|
|
const userId = req.user.id;
|
|
const userId = req.user.id;
|
|
- const contact = await Contact.remove(id, userId);
|
|
|
|
|
|
+ const contact = await ContactModel.remove(id, userId);
|
|
if (contact) {
|
|
if (contact) {
|
|
return res.json({
|
|
return res.json({
|
|
status: 'success',
|
|
status: 'success',
|
|
@@ -100,7 +103,7 @@ const updateContact = async (req, res, next) => {
|
|
try {
|
|
try {
|
|
const id = req.params.id;
|
|
const id = req.params.id;
|
|
const userId = req.user.id;
|
|
const userId = req.user.id;
|
|
- const contact = await Contact.update(id, userId, req.body);
|
|
|
|
|
|
+ const contact = await ContactModel.update(id, userId, req.body);
|
|
if (contact) {
|
|
if (contact) {
|
|
return res.status(200).json({
|
|
return res.status(200).json({
|
|
status: 'success',
|
|
status: 'success',
|