Merge pull request #246 from amansinghbais/#245

Improved: logic to fetch organizationPartyId from db instead of hardcoding it (#245)

src/services/UserService.ts

@@ -359,9 +359,11 @@ const deletePartyRole = async (payload: any): Promise <any> => {
 }
 
 const createCommercePartyRelationshipFrom = async (payload: any): Promise <any> => {
+  const organizationPartyId = store.getters['util/getOrganizationPartyId'];
+
   payload = {
     ...payload,
-    "partyIdFrom": "COMPANY",
+    "partyIdFrom": organizationPartyId,
     "roleTypeIdFrom": "INTERNAL_ORGANIZATIO",
     "partyRelationshipTypeId": "OWNER",
     "statusId": "ACCOUNT_CREATED",
@@ -508,6 +510,8 @@ const isUserLoginIdAlreadyExists = async(username: string): Promise<any> => {
 }
 
 const finishSetup = async (payload: any): Promise <any> => {
+  const organizationPartyId = store.getters['util/getOrganizationPartyId'];
+
   try {
     const selectedUser = payload.selectedUser;
     const selectedTemplate = payload.selectedTemplate;
@@ -528,7 +532,7 @@ const finishSetup = async (payload: any): Promise <any> => {
         "requirePasswordChange": payload.formData.requirePasswordChange ? "Y" : "N",
         "enabled": "Y",
         "userPrefTypeId": "ORGANIZATION_PARTY",
-        "userPrefValue": "COMPANY"
+        "userPrefValue": organizationPartyId
       });
       if (!hasError(resp)) {
         addUserToSecurityGroup({

src/services/UtilService.ts

@@ -60,8 +60,17 @@ const getShopifyConfigs = async (): Promise <any>  => {
   });
 }
 
+const fetchOrganizationPartyId = async (payload: any): Promise<any> => {
+  return api({
+    url: "performFind",
+    method: "POST",
+    data: payload
+  })
+}
+
 export const UtilService = {
   fetchFacilities,
+  fetchOrganizationPartyId,
   fetchProductStores,
   getSecurityGroups,
   getShopifyConfigs,

src/store/modules/user/actions.ts

@@ -72,6 +72,7 @@ const actions: ActionTree<UserState, RootState> = {
       commit(types.USER_INFO_UPDATED, userProfile);
       commit(types.USER_PERMISSIONS_UPDATED, appPermissions);
       commit(types.USER_TOKEN_CHANGED, { newToken: token })
+      this.dispatch('util/fetchOrganizationPartyId')
 
       const partyId = router.currentRoute.value.query.partyId
       if (partyId) {

src/store/modules/util/UtilState.ts

@@ -5,4 +5,5 @@ export default interface UtilState {
   classificationSecurityGroups: any[];
   facilities: any[];
   shopifyShops: any[];
+  organizationPartyId: string;
 }

src/store/modules/util/actions.ts

@@ -194,6 +194,32 @@ const actions: ActionTree<UtilState, RootState> = {
     commit(types.UTIL_PRODUCT_STORES_UPDATED, stores)
   },
 
+  async fetchOrganizationPartyId({ commit }) {
+    let partyId = ""
+
+    const params = {
+      entityName: "PartyRole",
+      inputFields: {
+        roleTypeId: 'INTERNAL_ORGANIZATIO'
+      },
+      noConditionFind: 'Y',
+      fieldList: ["partyId"],
+      viewSize: 1
+    }
+
+    try {
+      const resp = await UtilService.fetchOrganizationPartyId(params)
+      if (!hasError(resp)) {
+        partyId = resp.data.docs[0]?.partyId
+      } else {
+        throw resp.data
+      }
+    } catch (error) {
+      logger.error(error)
+    }
+    commit(types.UTIL_ORGANIZATION_PARTY_ID_UPDATED, partyId)
+  },
+
   updateSecurityGroup({commit}, payload) {
     commit(types.UTIL_SECURITY_GROUPS_UPDATED, payload)
   },
@@ -202,6 +228,7 @@ const actions: ActionTree<UtilState, RootState> = {
     commit(types.UTIL_FACILITIES_UPDATED, [])
     commit(types.UTIL_SECURITY_GROUPS_UPDATED, []);
     commit(types.UTIL_PRODUCT_STORES_UPDATED, [])
+    commit(types.UTIL_ORGANIZATION_PARTY_ID_UPDATED, "")
   },
 }
 

src/store/modules/util/getters.ts

@@ -23,6 +23,9 @@ const getters: GetterTree<UtilState, RootState> = {
   },
   getShopifyShops(state) {
     return state.shopifyShops;
+  },
+  getOrganizationPartyId(state) {
+    return state.organizationPartyId;
   }
 }
 export default getters;

src/store/modules/util/index.ts

@@ -13,7 +13,8 @@ const utilModule: Module<UtilState, RootState> = {
     securityGroups: [],
     classificationSecurityGroups: [],
     facilities: [],
-    shopifyShops: []
+    shopifyShops: [],
+    organizationPartyId: ""
   },
   getters,
   actions,

src/store/modules/util/mutation-types.ts

@@ -5,3 +5,4 @@ export const UTIL_SECURITY_GROUPS_UPDATED = SN_UTIL + '/SECURITY_GROUPS_UPDATED'
 export const UTIL_FACILITIES_UPDATED = SN_UTIL + '/FACILITIES_UPDATED'
 export const UTIL_SHOPIFY_SHOPS_UPDATED = SN_UTIL + '/SHOPIFY_SHOPS_UPDATED'
 export const UTIL_CLASSIFICATION_SECURITY_GROUPS_UPDATED = SN_UTIL + '/CLASSIFICATION_SECURITY_GROUPS_UPDATED'
+export const UTIL_ORGANIZATION_PARTY_ID_UPDATED = SN_UTIL + '/ORGANIZATION_PARTY_ID_UPDATED'

src/store/modules/util/mutations.ts

@@ -19,6 +19,9 @@ const mutations: MutationTree<UtilState> = {
     state.shopifyShops = payload
   },[types.UTIL_CLASSIFICATION_SECURITY_GROUPS_UPDATED](state, payload) {
     state.classificationSecurityGroups = payload
+  },
+  [types.UTIL_ORGANIZATION_PARTY_ID_UPDATED](state, payload) {
+    state.organizationPartyId = payload
   }
 }
 export default mutations;

src/views/CreateUser.vue

@@ -115,7 +115,8 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters({
-      facilities: 'util/getFacilities'
+      facilities: 'util/getFacilities',
+      organizationPartyId: 'util/getOrganizationPartyId'
     })
   },
   data() {
@@ -194,7 +195,7 @@ export default defineComponent({
         const payload = {
           ...this.formData,
           partyTypeId,
-          "partyIdFrom": "COMPANY",
+          "partyIdFrom": this.organizationPartyId,
           "roleTypeIdFrom": "INTERNAL_ORGANIZATIO",
           "roleTypeIdTo": "APPLICATION_USER",
           "partyRelationshipTypeId": "EMPLOYMENT",

src/views/UserDetails.vue

@@ -492,7 +492,8 @@ export default defineComponent({
       securityGroups: 'util/getSecurityGroups',
       userProfile: 'user/getUserProfile',
       baseUrl: 'user/getBaseUrl',
-      shopifyShops: 'util/getShopifyShops'
+      shopifyShops: 'util/getShopifyShops',
+      organizationPartyId: 'util/getOrganizationPartyId'
     })
   },
   props: ['partyId'],
@@ -724,7 +725,7 @@ export default defineComponent({
           userLoginId: this.username,
           enabled: 'Y',
           userPrefTypeId: 'ORGANIZATION_PARTY',
-          userPrefValue: 'COMPANY',
+          userPrefValue: this.organizationPartyId,
         })
         if (!hasError(resp)) {
           await this.store.dispatch("user/getSelectedUserDetails", { partyId: this.partyId, isFetchRequired: true });