fixing organization list and project after refactor to typescript

Author: alexanmtz

src/app/controllers/organization.ts

@@ -1,10 +1,8 @@
-import { organizationBuilds, organizationUpdate } from '../../modules/organizations'
-
-const Organizations = require('../../modules/organizations')
+import { organizationBuilds, organizationUpdate, organizationFetch, organizationList } from '../../modules/organizations'
 
 export const listOrganizations = async (req: any, res: any) => {
   try {
-    const data = await Organizations.organizationList(req.params)
+    const data = await organizationList(req.params)
     res.send(data)
   } catch (error: any) {
     // eslint-disable-next-line no-console
@@ -15,7 +13,7 @@ export const listOrganizations = async (req: any, res: any) => {
 
 export const fetchOrganization = async (req: any, res: any) => {
   try {
-    const data = await Organizations.organizationFetch(req.params || req.query)
+    const data = await organizationFetch(req.params || req.query)
     res.send(data)
   } catch (error: any) {
     // eslint-disable-next-line no-console

src/app/controllers/project.ts

@@ -1,8 +1,8 @@
-import { projectList } from '../../modules/projects'
+import { projectList, projectFetch } from '../../modules/projects'
 
 export const fetchProject = async (req: any, res: any) => {
   try {
-    const data = await projectList()
+    const data = await projectFetch(req.params || req.query)
     res.send(data)
   } catch (error: any) {
     // eslint-disable-next-line no-console
@@ -13,7 +13,7 @@ export const fetchProject = async (req: any, res: any) => {
 
 export const listProjects = async (req: any, res: any) => {
   try {
-    const data = await projectList()
+    const data = await projectList(req.params || req.query)
     res.send(data)
   } catch (error: any) {
     // eslint-disable-next-line no-console

src/modules/organizations/organizationFetch.ts

@@ -6,7 +6,7 @@ type FetchOrganizationParams = {
   id: number
 }
 
-export async function fetchOrganization(orgParams: FetchOrganizationParams) {
+export async function organizationFetch(orgParams: FetchOrganizationParams) {
   try {
     const data = await currentModels.Organization.findOne({
       where: {

src/modules/organizations/organizationList.ts

@@ -2,7 +2,7 @@ import models from '../../models'
 
 const currentModels = models as any
 
-export async function listOrganizations() {
+export async function organizationList(params?: any) {
   try {
     const data = await currentModels.Organization.findAll({
       include: [

src/modules/projects/projectList.ts

@@ -2,7 +2,7 @@ import models from '../../models'
 
 const currentModels = models as any
 
-export async function projectList() {
+export async function projectList(params?: any) {
   try {
     const data = await currentModels.Project.findAll({
       include: [

src/modules/webhooks/balanceAvailable.ts

@@ -1,10 +1,6 @@
 import Models from '../../models'
-import i18n from 'i18n'
-import moment from 'moment'
 import SendMail from '../mail/mail'
-import WalletMail from '../mail/wallet'
 import Stripe from '../../client/payment/stripe'
-import { FAILED_REASON, CURRENCIES, formatStripeAmount } from './constants'
 
 const models = Models as any
 const stripe = Stripe()

src/modules/webhooks/chargeFailed.ts

@@ -1,10 +1,8 @@
 import Models from '../../models'
 import i18n from 'i18n'
-import moment from 'moment'
 import SendMail from '../mail/mail'
-import WalletMail from '../mail/wallet'
 import Stripe from '../../client/payment/stripe'
-import { FAILED_REASON, CURRENCIES, formatStripeAmount } from './constants'
+import { FAILED_REASON } from './constants'
 
 const models = Models as any
 const stripe = Stripe()

src/modules/webhooks/chargeUpdated.ts

@@ -1,11 +1,16 @@
 import Models from '../../models'
 import i18n from 'i18n'
-import moment from 'moment'
 import SendMail from '../mail/mail'
 
 const models = Models as any
 
-export default async function chargeUpdated(event: any, paid: any, status: any, req: any, res: any) {
+export default async function chargeUpdated(
+  event: any,
+  paid: any,
+  status: any,
+  req: any,
+  res: any
+) {
   if (event?.data?.object?.source?.id) {
     return models.Order.update(
       {

src/modules/webhooks/customerSourceCreated.ts

@@ -1,10 +1,7 @@
 import Models from '../../models'
 import i18n from 'i18n'
-import moment from 'moment'
 import SendMail from '../mail/mail'
-import WalletMail from '../mail/wallet'
 import Stripe from '../../client/payment/stripe'
-import { FAILED_REASON, CURRENCIES, formatStripeAmount } from './constants'
 
 const models = Models as any
 const stripe = Stripe()

src/modules/webhooks/invoiceCreated.ts

@@ -1,10 +1,8 @@
 import Models from '../../models'
 import i18n from 'i18n'
-import moment from 'moment'
 import SendMail from '../mail/mail'
-import WalletMail from '../mail/wallet'
 import Stripe from '../../client/payment/stripe'
-import { FAILED_REASON, CURRENCIES, formatStripeAmount } from './constants'
+import { formatStripeAmount } from './constants'
 
 const models = Models as any
 const stripe = Stripe()