From 9431acfd2b4a401a152e819465697213fba676b9 Mon Sep 17 00:00:00 2001 From: Sofía Benítez Date: Fri, 31 Mar 2023 14:58:03 -0400 Subject: [PATCH] Incorporación de beneficios --- curriculumsearch/src/main/java/com/roshka/service/Scheduler.java | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------- 1 file changed, 54 insertions(+), 57 deletions(-) diff --git a/curriculumsearch/src/main/java/com/roshka/service/Scheduler.java b/curriculumsearch/src/main/java/com/roshka/service/Scheduler.java index 364aa8f..a0d3161 100644 --- a/curriculumsearch/src/main/java/com/roshka/service/Scheduler.java +++ b/curriculumsearch/src/main/java/com/roshka/service/Scheduler.java @@ -45,7 +45,7 @@ public class Scheduler { @Scheduled(cron = "0 * * * * *") public void cumples() { String url = "https://hooks.slack.com/services/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"; - // verificar que no sea feriado + // Verificar que no sea feriado Feriado esFeriado = feriadoRepository.findByFecha(new Date()); if (esFeriado != null){ return; @@ -54,12 +54,12 @@ public class Scheduler { int contador = 1; Date hoy = new Date(); Date fechaAyer = new Date(hoy.getTime() - ((1000 * 60 * 60 * 24) * contador) ); - SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy"); SimpleDateFormat f = new SimpleDateFormat("EEEE"); String diaAyer = f.format(fechaAyer); Boolean diaNoHabil = false; + // Verificar que no sea Sábado ni domingo if ((diaAyer.equals("sábado")) || (diaAyer.equals("domingo"))){ diaNoHabil = true; } @@ -82,7 +82,6 @@ public class Scheduler { diaNoHabil = false; hoy = new Date(); fechaAyer = new Date(hoy.getTime() - ((1000 * 60 * 60 * 24) * contador) ); - f = new SimpleDateFormat("EEEE"); diaAyer = f.format(fechaAyer); if ((diaAyer.equals("sábado")) || (diaAyer.equals("domingo"))){ @@ -94,51 +93,56 @@ public class Scheduler { diaNoHabil = true; } } - for (Birthday cumple : cumplesDiaNoHabiles){ - String json = "{\n" + - "\"blocks\": [\n" + - "{\n" + - "\"type\": \"section\",\n" + - "\"text\": {\n" + - "\"type\": \"mrkdwn\",\n" + - "\"text\": \"Buenos días \n En la fecha " + cumple.getFecha() + " estuvo de cumpleaños *" + cumple.getNombreCompleto() + "* <@" + cumple.getIdSlack() + ">. 🥳 ¡Que los cumplas muy feliz te desea Roshka! Que en la vida siempre encuentres razones para sonreír 🥳\",\n" + - "}" + - "}," + - "{" + - "\"type\": \"divider\"" + - "}," + - "{\n" + - "\"type\": \"image\",\n" + - "\"title\": {\n" + - "\"type\": \"plain_text\",\n" + - "\"text\": \"" + cumple.getNombreCompleto() + "\"\n" + - "},\n" + - "\"block_id\": \"image4\",\n" + - "\"image_url\": \"http://placekitten.com/500/500\",\n" + - "\"alt_text\": \"An incredibly cute kitten.\"\n" + - "}\n" + - "]\n" + - "}" + - ""; - String result = null; - HttpPost httpPost = new HttpPost(url); - httpPost.setEntity(new StringEntity(json, ContentType.APPLICATION_JSON)); - - try (CloseableHttpClient httpclient = HttpClients.createDefault()) { - try (CloseableHttpResponse response = httpclient.execute(httpPost)) { - result = EntityUtils.toString(response.getEntity()); + if (cumplesDiaNoHabiles != null ) + { + for (Birthday cumple : cumplesDiaNoHabiles){ + + SimpleDateFormat formato = new SimpleDateFormat("dd/MM/yyyy"); + String fechaFormateada = formato.format(cumple.getFecha()); + String json = "{\n" + + "\"blocks\": [\n" + + "{\n" + + "\"type\": \"section\",\n" + + "\"text\": {\n" + + "\"type\": \"mrkdwn\",\n" + + "\"text\": \"Buenos días \n En la fecha " + fechaFormateada + " estuvo de cumpleaños *" + cumple.getNombreCompleto() + "* <@" + cumple.getIdSlack() + ">. 🥳 ¡Que los cumplas muy feliz te desea Roshka! Que en la vida siempre encuentres razones para sonreír 🥳\",\n" + + "}" + + "}," + + "{" + + "\"type\": \"divider\"" + + "}," + + "{\n" + + "\"type\": \"image\",\n" + + "\"title\": {\n" + + "\"type\": \"plain_text\",\n" + + "\"text\": \"" + cumple.getNombreCompleto() + "\"\n" + + "},\n" + + "\"block_id\": \"image4\",\n" + + "\"image_url\": \"http://placekitten.com/500/500\",\n" + + "\"alt_text\": \"An incredibly cute kitten.\"\n" + + "}\n" + + "]\n" + + "}" + + ""; + String result = null; + HttpPost httpPost = new HttpPost(url); + httpPost.setEntity(new StringEntity(json, ContentType.APPLICATION_JSON)); + + try (CloseableHttpClient httpclient = HttpClients.createDefault()) { + try (CloseableHttpResponse response = httpclient.execute(httpPost)) { + result = EntityUtils.toString(response.getEntity()); + } + + } catch (IOException | ParseException e) { + e.printStackTrace(); } - } catch (IOException | ParseException e) { - e.printStackTrace(); } - System.out.println("FIN"); + } - } - // Verificar el cumpleaños de quien es + // Verificar el cumpleaños de quién es List cumples = birthdayRepository.findAllByFecha(new Date()); - System.out.println("PRUEBA"); for (Birthday cumple : cumples) { String json = "{\n" + "\"blocks\": [\n" + @@ -177,26 +181,19 @@ public class Scheduler { } catch (IOException | ParseException e) { e.printStackTrace(); } - - System.out.println("FIN"); } } - - - - @Scheduled(cron = "0 0 8 * * MON-FRI") -// @Scheduled(cron = "0 * * * * *") - public void feriados(){ - - } - - - @Scheduled(cron = "0 0 1 * * FRI") -// @Scheduled(cron = "0 * * * * *") +// @Scheduled(cron = "0 0 1 * * FRI") + @Scheduled(cron = "0 * * * * *") public void beneficios() { String url = "https://hooks.slack.com/services/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"; - // Traer random + // Verificar que no sea feriado + Feriado esFeriado = feriadoRepository.findByFecha(new Date()); + if (esFeriado != null){ + return; + } + Beneficio beneficio = getRandomBeneficio(); if (beneficio != null) { String json = "{" + -- libgit2 0.26.0