@goweekdays/layer-common 1.0.0 → 1.0.1

package/composables/useOrg.ts

@@ -1,26 +1,37 @@
 export default function useOrg() {
-  function getOrgs({ page = 1, search = "", user = "", limit = 20 } = {}) {
+  function getAll({ page = 1, search = "", limit = 20 } = {}) {
     return useNuxtApp().$api<Record<string, any>>("/api/organizations", {
       method: "GET",
       query: {
         page,
         search,
-        user,
         limit,
       },
     });
   }
 
-  const org = useState("org", (): TOrg => {
-    return {
-      _id: "",
-      name: "",
-      email: "",
-      contact: "",
-      busInst: "",
-      type: "",
-      status: "",
-    };
+  function getByUserId({ page = 1, search = "", user = "", limit = 20 } = {}) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/organizations/user/${user}`,
+      {
+        method: "GET",
+        query: {
+          page,
+          search,
+          limit,
+        },
+      }
+    );
+  }
+
+  const org = ref({
+    _id: "",
+    name: "",
+    email: "",
+    contact: "",
+    busInst: "",
+    type: "",
+    status: "",
   });
 
   function reset() {
@@ -71,7 +82,8 @@ export default function useOrg() {
 
   return {
     org,
-    getOrgs,
+    getAll,
+    getByUserId,
     reset,
     set,
     perSeatPrice,

package/composables/useOrgPermission.ts

@@ -0,0 +1,27 @@
+export function useOrgPermission() {
+  const { memberPermissions, rolePermissions, invitationPermission } =
+    useCommonPermissions();
+  const permissions: TPermissions = {
+    organizations: {
+      "create-organization": {
+        check: true,
+        description: "Create Organization",
+      },
+      "view-organization": {
+        check: true,
+        description: "View Organization",
+      },
+      "view-organization-details": {
+        check: true,
+        description: "View Organization Details",
+      },
+    },
+    members: memberPermissions,
+    invitations: invitationPermission,
+    roles: rolePermissions,
+  };
+
+  return {
+    permissions,
+  };
+}

package/composables/useRole.ts

@@ -1,14 +1,15 @@
 export default function useRole() {
   function createRole(
-    { name, permissions, type } = {} as {
+    { name, permissions, type, org } = {} as {
       name: string;
       permissions: Array<string>;
       type: string;
+      org: string;
     }
   ) {
     return useNuxtApp().$api("/api/roles", {
       method: "POST",
-      body: { name, permissions, type },
+      body: { name, permissions, type, org },
     });
   }
 
@@ -57,7 +58,7 @@ export default function useRole() {
   }
 
   function deleteRole(_id: string) {
-    return useNuxtApp().$api(`/api/roles/${_id}`, {
+    return useNuxtApp().$api<Record<string, any>>(`/api/roles/${_id}`, {
       method: "DELETE",
     });
   }
@@ -66,6 +67,7 @@ export default function useRole() {
     return {
       _id: "",
       name: "",
+      org: "",
       permissions: [],
       createdAt: "",
       updatedAt: "",

package/composables/useSchoolPermission.ts

@@ -0,0 +1,13 @@
+export function useSchoolPermission() {
+  const { memberPermissions, rolePermissions, invitationPermission } =
+    useCommonPermissions();
+  const permissions: TPermissions = {
+    members: memberPermissions,
+    invitations: invitationPermission,
+    roles: rolePermissions,
+  };
+
+  return {
+    permissions,
+  };
+}

package/composables/useSubscription.ts

@@ -69,7 +69,9 @@ export default function useSubscription() {
   }
 
   function getByOrgId(id: string) {
-    return useNuxtApp().$api<TSubscription>(`/api/subscriptions/org/${id}`);
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/subscriptions/org/${id}`
+    );
   }
 
   function getSubscriptions() {
@@ -186,6 +188,7 @@ export default function useSubscription() {
   }
 
   function updateSeatsById({
+    transactionId = "",
     subscriptionId = "",
     seats = 0,
     amount = 0,
@@ -197,6 +200,7 @@ export default function useSubscription() {
         body: {
           seats,
           amount,
+          transactionId,
         },
       }
     );
@@ -213,7 +217,7 @@ export default function useSubscription() {
 
   function addOrgSubscription(value: {
     user: string;
-    transactionId: string;
+    transactionId?: string;
     promoCode?: string;
     seats: number;
     perSeatPrice: number;

package/composables/useUser.ts

@@ -1,48 +1,48 @@
 export default function useUser() {
   function inviteUser({ email = "", app = "", role = "", name = "" } = {}) {
-    return useNuxtApp().$api<TKeyValuePair>("/api/auth/invite", {
+    return useNuxtApp().$api<Record<string, any>>("/api/auth/invite", {
       method: "POST",
       body: { email, app, role, name },
     });
   }
 
   function updateName({ firstName = "", lastName = "" } = {}) {
-    return useNuxtApp().$api<TKeyValuePair>("/api/users/name", {
+    return useNuxtApp().$api<Record<string, any>>("/api/users/name", {
       method: "PUT",
       body: { firstName, lastName },
     });
   }
 
   function updateBirthday({ month = "", day = 0, year = 0 } = {}) {
-    return useNuxtApp().$api<TKeyValuePair>("/api/users/birthday", {
+    return useNuxtApp().$api<Record<string, any>>("/api/users/birthday", {
       method: "PUT",
       body: { month, day, year },
     });
   }
 
   function updateGender(gender = "") {
-    return useNuxtApp().$api<TKeyValuePair>("/api/users/gender", {
+    return useNuxtApp().$api<Record<string, any>>("/api/users/gender", {
       method: "PUT",
       body: { gender },
     });
   }
 
   function updateEmail(email = "") {
-    return useNuxtApp().$api<TKeyValuePair>("/api/users/email", {
+    return useNuxtApp().$api<Record<string, any>>("/api/users/email", {
       method: "PUT",
       body: { email },
     });
   }
 
   function updateContact(contact = "") {
-    return useNuxtApp().$api<TKeyValuePair>("/api/users/contact", {
+    return useNuxtApp().$api<Record<string, any>>("/api/users/contact", {
       method: "PUT",
       body: { contact },
     });
   }
 
   function updateUserFieldById(id = "", field = "", value = "") {
-    return useNuxtApp().$api<TKeyValuePair>(`/api/users/field/${id}`, {
+    return useNuxtApp().$api<Record<string, any>>(`/api/users/field/${id}`, {
       method: "PATCH",
       body: { field, value },
     });
@@ -54,14 +54,14 @@ export default function useUser() {
     search = "",
     page = 1,
   } = {}) {
-    return useNuxtApp().$api<TKeyValuePair>("/api/users", {
+    return useNuxtApp().$api<Record<string, any>>("/api/users", {
       method: "GET",
       query: { status, search, page, type },
     });
   }
 
   function getById(id = "") {
-    return useNuxtApp().$api<TKeyValuePair>(`/api/users/id/${id}`, {
+    return useNuxtApp().$api<Record<string, any>>(`/api/users/id/${id}`, {
       method: "GET",
     });
   }
@@ -74,7 +74,7 @@ export default function useUser() {
     referralCode = "",
     type = "",
   } = {}) {
-    return useNuxtApp().$api<TKeyValuePair>(`/api/users/invite/${id}`, {
+    return useNuxtApp().$api<Record<string, any>>(`/api/users/invite/${id}`, {
       method: "POST",
       body: { firstName, lastName, password, referralCode, type },
     });

package/composables/useUtils.ts

@@ -199,23 +199,32 @@ export default function useUtils() {
   // console.log(formatNumber(1234.56, { useSymbol: true, currency: "EUR", locale: "de-DE" })); // "1.234,56 €"
   // console.log(formatNumber(1234.56, { useSymbol: true, currency: "EUR", locale: "de-DE", decimalPlaces: 0 })); // "1.234 €"
 
-  function computeTieredCost(seats: number, tiers: TPromoTier[]) {
+  function computeTieredCost(
+    seats: number,
+    tiers: { min: number; max: number; price: number }[],
+    remainingDays?: number,
+    totalDaysInMonth?: number
+  ) {
     let totalCost = 0;
 
-    for (let i = 0; i < tiers.length; i++) {
-      let { min, max, price } = tiers[i];
+    for (let i = 1; i <= seats; i++) {
+      for (const { min, max, price } of tiers) {
+        const effectiveMax = max === 0 ? Infinity : max;
 
-      if (max === 0) max = Infinity; // Handle unlimited tier
+        if (i >= min && i <= effectiveMax) {
+          // Prorate the cost for this seat based on its tier price
+          if (remainingDays && totalDaysInMonth) {
+            totalCost += price * (remainingDays / totalDaysInMonth);
+            break;
+          }
 
-      if (seats >= min) {
-        let seatsInTier = Math.min(seats, max) - min + 1;
-        totalCost += seatsInTier * price;
+          totalCost += price;
+          break; // Stop checking once we apply the correct tier pricing
+        }
       }
-
-      if (seats <= max) break; // Stop when all seats are counted
     }
 
-    return totalCost;
+    return totalCost; // This now returns the total prorated cost
   }
 
   function convertPermissionsToArray(permissions: TPermissions) {

package/nuxt.config.ts

@@ -28,6 +28,7 @@ export default defineNuxtConfig({
       APP_ACCOUNTING: (process.env.APP_ACCOUNTING as string) ?? "",
       APP_BOOK_KEEPING: (process.env.APP_BOOK_KEEPING as string) ?? "",
       APP_ZONAL: (process.env.APP_ZONAL as string) ?? "",
+      APP_SCHOOL: (process.env.APP_SCHOOL as string) ?? "",
     },
   },
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@goweekdays/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "./nuxt.config.ts",
   "publishConfig": {
     "access": "public"

package/types/org.d.ts

@@ -5,6 +5,7 @@ declare type TOrg = {
   contact: string;
   busInst: string;
   type: string;
+  apps?: Array<string>;
   createdAt?: string;
   updatedAt?: string;
   status?: string;

package/types/role.d.ts

@@ -3,6 +3,7 @@ declare type TRole = {
   name?: string;
   permissions?: Array<string>;
   type?: string;
+  org: string;
   status?: string;
   default?: boolean;
   createdBy?: string;

package/types/user.d.ts

@@ -7,8 +7,10 @@ declare type TUser = {
   lastName: string;
   suffix?: string;
   birthMonth?: string;
-  birthDate?: string;
+  birthDay?: string;
   birthYear?: string;
+  gender?: string;
+  contact?: string;
   profile?: string;
   defaultOrg?: string;
   createdAt: string;