minor enhancements

sombriks · Mar 25, 2024 · 6aa926f · 6aa926f
1 parent b3f13e4
commit 6aa926f
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 16 deletions.
diff --git a/service-node-koa/app/config/db/migrations/20240324233852_alter_table_planejamento.mjs b/service-node-koa/app/config/db/migrations/20240324233852_alter_table_planejamento.mjs
@@ -0,0 +1,18 @@
+/**
+ * @param { import('knex').Knex } knex
+ * @returns { Promise<void> }
+ */
+export const up = async (knex) =>
+  knex.schema.table('planejamento', tb => {
+    tb.integer('tipo_movimentacao_id').unsigned().notNullable()
+      .references('tipo_movimentacao.id').defaultTo(2)
+  })
+
+/**
+ * @param { import('knex').Knex } knex
+ * @returns { Promise<void> }
+ */
+export const down = async (knex) =>
+  knex.schema.table('planejamento', tb => {
+    tb.dropColumn("tipo_movimentacao_id")
+  })
diff --git a/service-node-koa/app/services/recorrencia.mjs b/service-node-koa/app/services/recorrencia.mjs
@@ -1,5 +1,5 @@
 import { knex } from '../config/db/index.mjs'
-import { addMonths, differenceInDays, differenceInMonths, differenceInYears } from 'date-fns'
+import { addDays, addMonths, addYears, differenceInDays, differenceInMonths, differenceInYears } from 'date-fns'
 
 export const listRecorrencia = ({ usuario_id = -1, q = '', limit = 10, offset = 0 }) => {
   return knex('recorrencia')
@@ -41,16 +41,16 @@ export const geraLancamentos = async ({ usuario_id, id }) => {
       recorrencia_id: recorrencia.id,
       conta_id: recorrencia.conta_id,
       tipo_movimentacao_id: recorrencia.tipo_movimentacao_id,
-      vencimento: addMonths(recorrencia.inicial, i).toISOString(),
+      vencimento: proximoVencimento(recorrencia, i),
       valor: recorrencia.valorParcela
     })
   }
   const result = await knex('movimentacao').insert(lancamentos)
-  return { success: true }
+  return { success: true, result }
 }
 
 const limparParcelas = async (recorrencia) => {
-  return await knex('movimentacao').del().where({ recorrencia_id: recorrencia.id })
+  return knex('movimentacao').del().where({ recorrencia_id: recorrencia.id })
 }
 
 const calculaParcelas = ({ tipo_recorrencia_id, inicial, final }) => {
@@ -63,3 +63,14 @@ const calculaParcelas = ({ tipo_recorrencia_id, inicial, final }) => {
       return 1 + differenceInDays(final, inicial)
   }
 }
+
+const proximoVencimento = (recorrencia, i) => {
+  switch (recorrencia.tipo_recorrencia_id) {
+    case 1:
+      return addMonths(recorrencia.inicial, i).toISOString()
+    case 2:
+      return addYears(recorrencia.inicial, i).toISOString()
+    default:
+      return addDays(recorrencia.inicial, i).toISOString()
+  }
+}
diff --git a/web-app-vue/index.html b/web-app-vue/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8">
     <link rel="icon" href="/favicon.ico">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=1.5">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=0.1, maximum-scale=1.5">
     <title>Redline Finance</title>
   </head>
   <body>

diff --git a/web-app-vue/package-lock.json b/web-app-vue/package-lock.json