cambia configurazione posta per cloud

.jhipster/AuditLog.json

@@ -37,11 +37,11 @@
   "pagination": "pagination",
   "relationships": [
     {
-      "relationshipSide": "left",
+      "otherEntityField": "username",
-      "relationshipType": "many-to-one",
       "otherEntityName": "utenteApp",
       "relationshipName": "utente",
-      "otherEntityField": "username"
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
     }
   ],
   "searchEngine": "no",

.jhipster/Conferma.json

@@ -20,18 +20,18 @@
   "pagination": "pagination",
   "relationships": [
     {
-      "relationshipSide": "left",
+      "otherEntityField": "username",
-      "relationshipType": "many-to-one",
       "otherEntityName": "utenteApp",
       "relationshipName": "confermataDa",
-      "otherEntityField": "username"
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
     },
     {
-      "relationshipSide": "right",
-      "relationshipType": "one-to-one",
       "otherEntityName": "prenotazione",
       "otherEntityRelationshipName": "conferma",
-      "relationshipName": "prenotazione"
+      "relationshipName": "prenotazione",
+      "relationshipSide": "right",
+      "relationshipType": "one-to-one"
     }
   ],
   "searchEngine": "no",

.jhipster/Disponibilita.json

@@ -44,12 +44,12 @@
   "pagination": "infinite-scroll",
   "relationships": [
     {
-      "relationshipSide": "left",
+      "otherEntityField": "nome",
-      "relationshipType": "many-to-one",
       "otherEntityName": "struttura",
       "otherEntityRelationshipName": "disponibilita",
       "relationshipName": "struttura",
-      "otherEntityField": "nome"
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
     }
   ],
   "searchEngine": "no",

.jhipster/Liberatoria.json

@@ -13,18 +13,18 @@
   "name": "Liberatoria",
   "relationships": [
     {
-      "relationshipSide": "left",
+      "otherEntityField": "username",
-      "relationshipType": "many-to-one",
       "otherEntityName": "utenteApp",
       "otherEntityRelationshipName": "liberatorie",
       "relationshipName": "utente",
-      "otherEntityField": "username"
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
     },
     {
-      "relationshipSide": "left",
-      "relationshipType": "many-to-one",
       "otherEntityName": "modelloLiberatoria",
-      "relationshipName": "modelloLiberatoria"
+      "relationshipName": "modelloLiberatoria",
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
     }
   ],
   "searchEngine": "no",

.jhipster/Messaggio.json

@@ -21,11 +21,11 @@
   "name": "Messaggio",
   "relationships": [
     {
-      "relationshipSide": "left",
+      "otherEntityField": "username",
-      "relationshipType": "many-to-one",
       "otherEntityName": "utenteApp",
       "relationshipName": "utente",
-      "otherEntityField": "username"
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
     }
   ],
   "searchEngine": "no",

.jhipster/ModelloLiberatoria.json

@@ -29,11 +29,11 @@
   "name": "ModelloLiberatoria",
   "relationships": [
     {
-      "relationshipSide": "left",
-      "relationshipType": "many-to-one",
       "otherEntityName": "struttura",
       "otherEntityRelationshipName": "moduliLiberatorie",
-      "relationshipName": "struttura"
+      "relationshipName": "struttura",
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
     }
   ],
   "searchEngine": "no",

.jhipster/Notifica.json

@@ -41,10 +41,10 @@
   "pagination": "pagination",
   "relationships": [
     {
-      "relationshipSide": "left",
-      "relationshipType": "many-to-one",
       "otherEntityName": "conferma",
-      "relationshipName": "conferma"
+      "relationshipName": "conferma",
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
     }
   ],
   "searchEngine": "no",

.jhipster/Prenotazione.json

@@ -36,25 +36,25 @@
   "pagination": "pagination",
   "relationships": [
     {
-      "relationshipSide": "left",
-      "relationshipType": "one-to-one",
       "otherEntityName": "conferma",
       "otherEntityRelationshipName": "prenotazione",
-      "relationshipName": "conferma"
+      "relationshipName": "conferma",
+      "relationshipSide": "left",
+      "relationshipType": "one-to-one"
     },
     {
-      "relationshipSide": "left",
+      "otherEntityField": "username",
-      "relationshipType": "many-to-one",
       "otherEntityName": "utenteApp",
       "relationshipName": "utente",
-      "otherEntityField": "username"
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
     },
     {
-      "relationshipSide": "left",
+      "otherEntityField": "nome",
-      "relationshipType": "many-to-one",
       "otherEntityName": "struttura",
       "relationshipName": "struttura",
-      "otherEntityField": "nome"
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
     }
   ],
   "searchEngine": "no",

.jhipster/Struttura.json

@@ -43,18 +43,18 @@
   "pagination": "pagination",
   "relationships": [
     {
-      "relationshipSide": "right",
-      "relationshipType": "one-to-many",
       "otherEntityName": "disponibilita",
       "otherEntityRelationshipName": "struttura",
-      "relationshipName": "disponibilita"
+      "relationshipName": "disponibilita",
+      "relationshipSide": "right",
+      "relationshipType": "one-to-many"
     },
     {
-      "relationshipSide": "right",
-      "relationshipType": "one-to-many",
       "otherEntityName": "modelloLiberatoria",
       "otherEntityRelationshipName": "struttura",
-      "relationshipName": "moduliLiberatorie"
+      "relationshipName": "moduliLiberatorie",
+      "relationshipSide": "right",
+      "relationshipType": "one-to-many"
     }
   ],
   "searchEngine": "no",

.jhipster/UtenteApp.json

@@ -22,8 +22,8 @@
     {
       "fieldName": "ruolo",
       "fieldType": "Ruolo",
-      "fieldValues": "USER,INCARICATO,ADMIN",
+      "fieldValidateRules": ["required"],
-      "fieldValidateRules": ["required"]
+      "fieldValues": "USER,INCARICATO,ADMIN"
     },
     {
       "fieldName": "attivo",
@@ -74,19 +74,19 @@
   "name": "UtenteApp",
   "relationships": [
     {
-      "relationshipSide": "left",
+      "otherEntityField": "login",
-      "relationshipType": "one-to-one",
       "otherEntityName": "user",
       "relationshipName": "internalUser",
-      "otherEntityField": "login",
+      "relationshipSide": "left",
+      "relationshipType": "one-to-one",
       "relationshipWithBuiltInEntity": true
     },
     {
-      "relationshipSide": "right",
-      "relationshipType": "one-to-many",
       "otherEntityName": "liberatoria",
       "otherEntityRelationshipName": "utente",
-      "relationshipName": "liberatorie"
+      "relationshipName": "liberatorie",
+      "relationshipSide": "right",
+      "relationshipType": "one-to-many"
     }
   ],
   "searchEngine": "no",

.yo-rc.json

@@ -35,6 +35,7 @@
     "lastLiquibaseTimestamp": 1765383090000,
     "microfrontend": null,
     "microfrontends": [],
+    "monorepository": true,
     "nativeLanguage": "it",
     "packageName": "it.sw.pa.comune.artegna",
     "prodDatabaseType": "postgresql",
@@ -42,10 +43,9 @@
     "rememberMeKey": "c3201ccf39b5d82ef696ad12b95009f33d980fc0468a86e957ad91487d1fe80d9440f72a1d09721585bc96b11048fda07240",
     "serverPort": null,
     "serviceDiscoveryType": null,
+    "skipCommitHook": true,
     "syncUserWithIdp": null,
     "testFrameworks": ["cypress"],
-    "withAdminUi": true,
+    "withAdminUi": true
-    "monorepository": true,
-    "skipCommitHook": true
   }
 }

docker-compose/.yo-rc.json

@@ -0,0 +1,10 @@
+{
+  "generator-jhipster": {
+    "appsFolders": ["smartbooking"],
+    "deploymentType": "docker-compose",
+    "directoryPath": "../../",
+    "jwtSecretKey": "MDQwNzk2YjgyMzE3NjQxNWViNzQyZThjNmJjNjI1YzBmZGRiYzBmYzMxNjg2ODM4MGMxOTFjM2NiNGUxMDE1ZWFiODA0ZTA1M2JkZjM5NThhNTc3YzViY2MxY2IxYTNiYWQ0Zg==",
+    "monitoring": "no",
+    "serviceDiscoveryType": "no"
+  }
+}

docker-compose/README-DOCKER-COMPOSE.md

@@ -0,0 +1,14 @@
+# JHipster generated Docker-Compose configuration
+
+## Usage
+
+Launch all your infrastructure by running: `docker compose up -d`.
+
+## Configured Docker services
+
+### Applications and dependencies:
+
+- smartbooking (monolith application)
+- smartbooking's postgresql database
+
+### Additional Services:

docker-compose/docker-compose.yml

@@ -0,0 +1,31 @@
+services:
+  smartbooking:
+    image: git.bigc.it/sbierti/smartbooking:latest
+    environment:
+      - _JAVA_OPTIONS=-Xmx512m -Xms256m
+      - SPRING_PROFILES_ACTIVE=prod,api-docs
+      - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://smartbooking-postgresql:5432/smartbooking
+      - SPRING_LIQUIBASE_URL=jdbc:postgresql://smartbooking-postgresql:5432/smartbooking
+      - JHIPSTER_SLEEP=30
+    ports:
+      - 8080:8080
+    depends_on:
+      - postgresql
+  postgresql:
+    image: postgres:18.1
+    # volumes:
+    #   - ~/volumes/jhipster/smartbooking/postgresql/:/var/lib/postgresql/data/
+    environment:
+      - POSTGRES_USER=smartbooking
+      - POSTGRES_HOST_AUTH_METHOD=trust
+    healthcheck:
+      test: [ 'CMD-SHELL', 'pg_isready -U $${POSTGRES_USER}' ]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+    # If you want to expose these ports outside your dev PC,
+    # remove the "127.0.0.1:" prefix
+    ports:
+      - 127.0.0.1:5432:5432
+

src/main/resources/config/application-dev.yml

@@ -42,14 +42,15 @@ spring:
     # Remove 'faker' if you do not want the sample data to be loaded automatically
     contexts: dev, faker
   mail:
-    host: smtps.aruba.it
+    host: mail-eu.smtp2go.com
-    port: 465
+    port: 587
-    username: noreply@bigc.it
+    username: artegna
-    password: Ungr@nb3l4n1m4l0
+    password: gpTottUCcB9GKG15
-    protocol: smtps
+    protocol: smtp
     properties.mail.smtp:
       auth: true
       starttls.enable: true
+      starttls.required: true
 
   messages:
     cache-duration: PT1S # 1 second, see the ISO 8601 standard

src/main/resources/config/application-prod.yml

@@ -43,14 +43,15 @@ spring:
   liquibase:
     contexts: prod
   mail:
-    host: smtps.aruba.it
+    host: mail-eu.smtp2go.com
-    port: 465
+    port: 587
-    username: noreply@bigc.it
+    username: artegna
-    password: Ungr@nb3l4n1m4l0
+    password: gpTottUCcB9GKG15
-    protocol: smtps
+    protocol: smtp
     properties.mail.smtp:
       auth: true
       starttls.enable: true
+      starttls.required: true
   thymeleaf:
     cache: true
 

src/main/webapp/app/account/register/register.vue

@@ -139,11 +139,11 @@
           <button type="submit" :disabled="v$.$invalid" class="btn btn-primary" data-cy="submit">{{ t$('register.form.button') }}</button>
         </form>
         <p></p>
-        <div class="alert alert-warning">
+        <!--div class="alert alert-warning">
           <span>{{ t$('global.messages.info.authenticated.prefix') }}</span>
           <a class="alert-link" @click="showLogin()">{{ t$('global.messages.info.authenticated.link') }}</a
           ><span v-html="t$('global.messages.info.authenticated.suffix')"></span>
-        </div>
+        </div-->
       </div>
     </div>
   </div>

src/main/webapp/app/core/home/home.component.ts

@@ -9,7 +9,7 @@ export default defineComponent({
     const { showLogin } = useLoginModal();
     const authenticated = inject<ComputedRef<boolean>>('authenticated');
     const username = inject<ComputedRef<string>>('currentUsername');
-    const utenteAppService = inject<UtenteAppService>('utenteAppService', () => new UtenteAppService());
+    const utenteAppService = inject<UtenteAppService>('utenteAppService', () => new UtenteAppService(), true);
 
     const profileIncomplete: Ref<boolean> = ref(false);
     const checkingProfile: Ref<boolean> = ref(false);
@@ -23,7 +23,7 @@ export default defineComponent({
       try {
         checkingProfile.value = true;
         const utenteApp = await utenteAppService.getCurrentUser();
-
+        console.log('utenteApp', utenteApp);
         // Check if essential profile fields are missing
         if (
           !utenteApp ||

src/main/webapp/app/core/home/home.vue

@@ -11,20 +11,21 @@
         <div class="alert alert-success" v-if="authenticated">
           <span v-if="username">{{ t$('home.logged.message', { username }) }}</span>
         </div>
-        <button class="btn btn-primary jhi-create-entity" v-if="authenticated">
+        <button class="btn btn-primary jh-create-entity create-prenotazione" v-if="authenticated && !profileIncomplete && !checkingProfile">
           <router-link to="/prenotazione">{{ t$('home.prenotazioni') }}</router-link>
         </button>
         <div class="alert alert-warning" v-if="authenticated && profileIncomplete && !checkingProfile">
           <span>{{ t$('home.profile.incomplete.message') }}</span>
-          &nbsp;
+          <div>
             <router-link class="alert-link" to="/account/profile">{{ t$('home.profile.incomplete.link') }}</router-link>
           </div>
+        </div>
 
-        <div class="alert alert-warning" v-if="!authenticated">
+        <!--div class="alert alert-warning" v-if="!authenticated">
           <span>{{ t$('global.messages.info.authenticated.prefix') }}</span>
           <a class="alert-link" @click="showLogin()">{{ t$('global.messages.info.authenticated.link') }}</a
           ><span v-html="t$('global.messages.info.authenticated.suffix')"></span>
-        </div>
+        </div-->
         <div class="alert alert-warning" v-if="!authenticated">
           <span>{{ t$('global.messages.info.register.noaccount') }}</span
           >&nbsp;

src/main/webapp/app/entities/disponibilita/disponibilita.vue

@@ -125,8 +125,8 @@
             </td>
           </tr>
         </tbody>
-        <span ref="infiniteScrollEl"></span>
       </table>
+      <span ref="infiniteScrollEl"></span>
     </div>
     <b-modal ref="removeEntity" id="removeEntity">
       <template #title>

src/main/webapp/app/entities/prenotazione/prenotazione-form-user.vue

@@ -311,7 +311,7 @@
           class="btn btn-sm btn-outline-primary"
         >
           <font-awesome-icon icon="download"></font-awesome-icon>
-          {{ t$('entity.action.download') }}
+          {{ t$('smartbookingApp.modelloLiberatoria.download') }}
         </a>
       </div>
 

src/main/webapp/app/entities/prenotazione/prenotazione.component.ts

@@ -1,4 +1,4 @@
-import { type Ref, computed, defineComponent, inject, onMounted, ref, watch } from 'vue';
+import { type ComputedRef, type Ref, computed, defineComponent, inject, onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import { useAlertService } from '@/shared/alert/alert.service';
@@ -12,6 +12,14 @@ import { useAccountStore } from '@/shared/config/store/account-store';
 import ConfermaService from '../conferma/conferma.service';
 import PrenotazioneService from './prenotazione.service';
 
+import UtenteAppService from '@/entities/utente-app/utente-app.service';
+import account from '@/router/account.ts';
+import type { IUtenteApp } from '@/shared/model/utente-app.model.ts';
+
+import axios from 'axios';
+
+const baseApiUrl = 'api/utente-apps';
+
 export default defineComponent({
   name: 'Prenotazione',
   setup() {
@@ -22,6 +30,9 @@ export default defineComponent({
     const alertService = inject('alertService', () => useAlertService(), true);
     const accountStore = useAccountStore();
 
+    const authenticated = inject<ComputedRef<boolean>>('authenticated');
+    const utenteAppService = inject<UtenteAppService>('utenteAppService', () => new UtenteAppService(), true);
+
     const itemsPerPage = ref(20);
     const queryCount: Ref<number> = ref(null);
     const page: Ref<number> = ref(1);
@@ -49,6 +60,57 @@ export default defineComponent({
     });
     const isSubmittingConferma = ref(false);
 
+    // CONTROLLIAMO SE L'UTENTE HA UN PROFILO IMPOSTATO+
+    const profileIncomplete: Ref<boolean> = ref(false);
+    const checkingProfile: Ref<boolean> = ref(false);
+
+    const getCurrentUser = async () => {
+      return new Promise<IUtenteApp>((resolve, reject) => {
+        axios
+          .get(`${baseApiUrl}/current`)
+          .then(res => {
+            resolve(res.data);
+          })
+          .catch(err => {
+            reject(err);
+          });
+      });
+    };
+
+    const checkProfileCompletion = async () => {
+      if (!authenticated.value) {
+        profileIncomplete.value = false;
+        return;
+      }
+
+      try {
+        checkingProfile.value = true;
+        const utenteApp = await getCurrentUser();
+        // Check if essential profile fields are missing
+        if (
+          !utenteApp ||
+          !utenteApp.nome ||
+          !utenteApp.cognome ||
+          !utenteApp.dataNascita ||
+          !utenteApp.luogoNascita ||
+          !utenteApp.residente ||
+          !utenteApp.telefono
+        ) {
+          profileIncomplete.value = true;
+        } else {
+          console.log('Profile is complete');
+          profileIncomplete.value = false;
+        }
+      } catch (error) {
+        // If UtenteApp doesn't exist, profile is incomplete
+        profileIncomplete.value = true;
+      } finally {
+        checkingProfile.value = false;
+      }
+    };
+
+    // CHIUDIAMO IL CONTROLLO DEL PROFILO IMPOSTATO
+
     const clear = () => {
       page.value = 1;
     };
@@ -86,6 +148,7 @@ export default defineComponent({
 
     onMounted(async () => {
       await retrievePrenotaziones();
+      await checkProfileCompletion();
     });
 
     const removeId: Ref<number> = ref(null);
@@ -162,6 +225,10 @@ export default defineComponent({
       await retrievePrenotaziones();
     });
 
+    watch(page, async () => {
+      await checkProfileCompletion();
+    });
+
     return {
       prenotaziones,
       handleSyncList,
@@ -182,6 +249,10 @@ export default defineComponent({
       totalItems,
       changeOrder,
       t$,
+      authenticated,
+      profileIncomplete,
+      checkingProfile,
+      checkProfileCompletion,
       // Role-based
       isIncaricato,
       prenotazioniPendenti,

src/main/webapp/app/entities/prenotazione/prenotazione.vue

@@ -2,6 +2,13 @@
   <div>
     <!-- ============================= ROLE_USER VIEW ============================= -->
     <template v-if="!isIncaricato">
+      <div class="alert alert-warning" v-if="authenticated && profileIncomplete && !checkingProfile">
+        <span>{{ t$('home.profile.incomplete.message') }}</span>
+        <div>
+          <router-link class="alert-link" to="/account/profile">{{ t$('home.profile.incomplete.link') }}</router-link>
+        </div>
+      </div>
+      <div v-if="authenticated && !profileIncomplete && !checkingProfile">
         <h2 id="page-heading" data-cy="PrenotazioneHeading">
           <span id="prenotazione">{{ t$('smartbookingApp.prenotazione.home.title') }}</span>
           <div class="d-flex justify-content-end">
@@ -150,6 +157,7 @@
             <b-pagination size="md" :total-rows="totalItems" v-model="page" :per-page="itemsPerPage"></b-pagination>
           </div>
         </div>
+      </div>
     </template>
 
     <!-- ============================= ROLE_INCARICATO VIEW ============================= -->
@@ -211,11 +219,7 @@
                     <font-awesome-icon icon="eye"></font-awesome-icon>
                     <span class="d-none d-md-inline">{{ t$('entity.action.view') }}</span>
                   </router-link>
-                  <button
+                  <button class="btn btn-success btn-sm" data-cy="prendiInCaricoButton" @click="prendiInCarico(prenotazione)">
-                    class="btn btn-success btn-sm"
-                    data-cy="prendiInCaricoButton"
-                    @click="prendiInCarico(prenotazione)"
-                  >
                     <font-awesome-icon icon="check"></font-awesome-icon>
                     <span class="d-none d-md-inline">{{ t$('smartbookingApp.prenotazione.prendiInCarico.button') }}</span>
                   </button>
@@ -304,7 +308,11 @@
       </div>
 
       <!-- "Prendi in carico" modal -->
-      <b-modal v-model="showPrendiInCaricoModal" :title="t$('smartbookingApp.prenotazione.prendiInCarico.title')" @hidden="closePrendiInCaricoModal">
+      <b-modal
+        v-model="showPrendiInCaricoModal"
+        :title="t$('smartbookingApp.prenotazione.prendiInCarico.title')"
+        @hidden="closePrendiInCaricoModal"
+      >
         <div v-if="selectedPrenotazione">
           <p class="text-muted mb-3">
             {{ t$('smartbookingApp.prenotazione.prendiInCarico.subtitle', { id: selectedPrenotazione.id }) }}

src/main/webapp/i18n/it/modelloLiberatoria.json

@@ -21,6 +21,7 @@
       "nome": "Nome",
       "testo": "Testo",
       "documento": "Documento",
+      "download": "Download documento",
       "validoDal": "Valido Dal",
       "validoAl": "Valido Al",
       "struttura": "Struttura"