Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

G2pc-registry changes #14

Open
wants to merge 64 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
d1aa5a3
Initial application structure
abhilashkadu Nov 9, 2023
89cd999
g2pc-core-lib sub repo added.
abhilashkadu Nov 9, 2023
efd4ca8
g2pc-dc-core-lib sub repo added.
abhilashkadu Nov 9, 2023
2d4ff49
g2pc-dp-core-lib sub repo added.
abhilashkadu Nov 9, 2023
7fe95fa
reference app g2pc-ref-dc-client sub repo added.
abhilashkadu Nov 9, 2023
46a7db0
reference app g2pc-ref-farmer-regsvc sub repo added.
abhilashkadu Nov 9, 2023
61d0324
reference app g2pc-ref-mno-regsvc sub repo added.
abhilashkadu Nov 9, 2023
dc13157
documents structure added.
abhilashkadu Nov 9, 2023
4f7b60d
Merge pull request #1 from abhilashkadu/alpha-1.0
vvujjini Nov 9, 2023
e16f8b9
registry draw.io file
vvujjini Nov 16, 2023
0c03d70
Update color index
vvujjini Nov 16, 2023
fda209a
Simplified index color codes
vvujjini Nov 28, 2023
fe6561f
index colour update
vvujjini Nov 28, 2023
72dab63
Refactored g2pc-core-lib changes.
abhilashkadu Dec 1, 2023
1b459c7
Refactored g2pc-dc-core-lib changes.
abhilashkadu Dec 1, 2023
6bb0686
Refactored g2pc-dp-core-lib changes.
abhilashkadu Dec 1, 2023
9eacb0e
Refactored g2pc-ref-dc-client changes.
abhilashkadu Dec 1, 2023
8f00c0a
Refactored g2pc-ref-dc-client changes-1.
abhilashkadu Dec 1, 2023
3b169d8
Refactored g2pc-ref-farmer-regsvc changes.
abhilashkadu Dec 1, 2023
667ae0a
Refactored g2pc-ref-mno-regsvc changes.
abhilashkadu Dec 1, 2023
e09ff50
Merge pull request #2 from abhilashkadu/alpha-1.0
vvujjini Dec 4, 2023
d1c9715
g2pc-core-lib changes.
abhilashkadu Dec 11, 2023
79ed5f4
g2pc-dc-core-lib changes.
abhilashkadu Dec 11, 2023
3b3309f
g2pc-dp-core-lib changes.
abhilashkadu Dec 11, 2023
2e71a66
g2pc-ref-dc-client changes.
abhilashkadu Dec 11, 2023
01d1965
g2pc-ref-farmer-regsvc changes.
abhilashkadu Dec 11, 2023
9f08ca9
g2pc-ref-mno-regsvc changes.
abhilashkadu Dec 11, 2023
0e0f7ee
Credentials updated.
abhilashkadu Dec 11, 2023
a74d6ab
Merge pull request #3 from abhilashkadu/alpha-1.0
vvujjini Dec 12, 2023
9b07861
Doc README.md and reference images
kshitijapatange Dec 13, 2023
528f9c0
Merge pull request #4 from kshitijapatange/alpha-1.0
vvujjini Dec 14, 2023
9b52701
g2pc-core-lib-changes
abhilashkadu Dec 17, 2023
04c2bc4
g2pc-dp-core-lib changes.
abhilashkadu Dec 17, 2023
8208b72
g2pc-ref-dc-client changes.
abhilashkadu Dec 17, 2023
1ff015a
g2pc-ref-farmer-regsvc changes.
abhilashkadu Dec 17, 2023
2666fad
Merge pull request #5 from abhilashkadu/alpha-1.0
vvujjini Dec 18, 2023
40e950d
Dc implementation added README.md and reference images
kshitijapatange Dec 19, 2023
bc139d5
reference images url updates and keycloak configuration steps added.
kshitijapatange Dec 20, 2023
3b49b8b
Merge pull request #6 from kshitijapatange/alpha-1.0
vvujjini Dec 21, 2023
e0f92a8
Updated README.md file with /status and /on-status , updated images url
kshitijapatange Dec 29, 2023
87acae0
Merge pull request #8 from kshitijapatange/alpha-1.0
vvujjini Jan 2, 2024
0fafa33
Updated sftp connection document and images.
kshitijapatange Jan 4, 2024
5b6e8e8
Merge pull request #9 from kshitijapatange/alpha-1.0
vvujjini Jan 8, 2024
68b4116
Updated README.md file with /status and /on-status , updated images url
kshitijapatange Jan 22, 2024
0c73560
Merge pull request #10 from kshitijapatange/alpha-1.0
vvujjini Jan 30, 2024
fda5e36
Updated README.md file with sunbird rc integration changes
kshitijapatange Jan 30, 2024
b9590a1
numbering updated
kshitijapatange Feb 8, 2024
1cfbdfa
Merge pull request #11 from kshitijapatange/alpha-1.0
vvujjini Feb 8, 2024
a176c37
g2pc-core-lib changes.
abhilashkadu Feb 14, 2024
84f3857
g2pc-dc-core-lib changes.
abhilashkadu Feb 14, 2024
7f97b6e
g2pc-dp-core-lib changes.
abhilashkadu Feb 14, 2024
21e2416
g2pc-dp-core-lib changes.
abhilashkadu Feb 14, 2024
4d7b979
g2pc-ref-dc-client changes.
abhilashkadu Feb 14, 2024
8866212
g2pc-ref-dc-client changes.
abhilashkadu Feb 14, 2024
58205af
g2pc-ref-farmer-regsvc changes.
abhilashkadu Feb 14, 2024
cbe4145
g2pc-ref-mno-regsvc changes.
abhilashkadu Feb 14, 2024
c336169
g2pc-ref-mno-regsvc changes.
abhilashkadu Feb 14, 2024
8cd4a2a
g2pc-core-lib-changes.
abhilashkadu Feb 14, 2024
e8b7a5c
g2pc-dc-core-lib application.yml changes.
abhilashkadu Feb 14, 2024
a383d63
g2pc-dp-core-lib application.yml changes
abhilashkadu Feb 14, 2024
c601985
g2pc-ref-dc-client application.yml changes
abhilashkadu Feb 14, 2024
9b036ba
g2pc-ref-farmer-regsvc application.yml changes
abhilashkadu Feb 14, 2024
e3b3287
g2pc-ref-mno-regsvc application.yml changes
abhilashkadu Feb 14, 2024
e29e77b
Merge pull request #13 from abhilashkadu/alpha-1.0
vvujjini Feb 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refactored g2pc-ref-dc-client changes-1.
abhilashkadu committed Dec 1, 2023
commit 8f00c0aab5fc00ecc63a3565de7d0f2dfd9912b8
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
package g2pc.ref.dc.client.config;

import g2pc.core.lib.constants.CoreConstants;
import g2pc.core.lib.enums.SortOrderEnum;
import g2pc.ref.dc.client.constants.Constants;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

import java.util.HashMap;
import java.util.Map;

@Service
@Slf4j
public class RegistryConfig {

@Value("${registry.api_urls.farmer_search_api}")
private String farmerSearchURL;

@Value("${registry.api_urls.mobile_search_api}")
private String mobileSearchURL;

@Value("${keycloak.farmer.clientId}")
private String farmerClientId;

@Value("${keycloak.farmer.clientSecret}")
private String farmerClientSecret;

@Value("${keycloak.farmer.url}")
private String keycloakFarmerTokenUrl;

@Value("${keycloak.mobile.clientId}")
private String mobileClientId;

@Value("${keycloak.mobile.clientSecret}")
private String mobileClientSecret;

@Value("${keycloak.mobile.url}")
private String keycloakMobileTokenUrl;

/**
* Map to represent which query params are required for which registry
*
*
* @return query params specific to registry
*/
public Map<String, Object> getQueryParamsConfig() {
Map<String, Object> queryParamsConfig = new HashMap<>();

Map<String, String> farmerRegistryMap = new HashMap<>();
farmerRegistryMap.put("farmer_id", "");
farmerRegistryMap.put("season", "");


Map<String, String> mobileRegistryMap = new HashMap<>();
mobileRegistryMap.put("mobile_number", "");
mobileRegistryMap.put("season", "");

queryParamsConfig.put(Constants.FARMER_REGISTRY, farmerRegistryMap);
queryParamsConfig.put(Constants.MOBILE_REGISTRY, mobileRegistryMap);
return queryParamsConfig;
}

/**
* Map to represent which common values to be used to generate request for a registry
*
*
* @return Map to represent registry specific config values
*/
public Map<String, Object> getRegistrySpecificConfig() {
Map<String, Object> queryParamsConfig = new HashMap<>();

Map<String, String> farmerRegistryMap = getFarmerRegistryMap();
Map<String, String> mobileRegistryMap = getMobileRegistryMap();

queryParamsConfig.put(Constants.FARMER_REGISTRY, farmerRegistryMap);
queryParamsConfig.put(Constants.MOBILE_REGISTRY, mobileRegistryMap);
return queryParamsConfig;
}

/**
* Set farmer registry specific config values
*
*
* @return Map to represent registry specific config values for farmer
*/
private Map<String, String> getFarmerRegistryMap() {
Map<String, String> farmerRegistryMap = new HashMap<>();
farmerRegistryMap.put(CoreConstants.QUERY_NAME, "paid_farmer");
farmerRegistryMap.put(CoreConstants.DP_SEARCH_URL, farmerSearchURL);
farmerRegistryMap.put(CoreConstants.REG_TYPE, "ns:FARMER_REGISTRY");
farmerRegistryMap.put(CoreConstants.REG_SUB_TYPE, "");
farmerRegistryMap.put(CoreConstants.QUERY_TYPE, "namedQuery");
farmerRegistryMap.put(CoreConstants.SORT_ATTRIBUTE, "farmer_id");
farmerRegistryMap.put(CoreConstants.SORT_ORDER, SortOrderEnum.ASC.toValue());
farmerRegistryMap.put(CoreConstants.PAGE_NUMBER, "1");
farmerRegistryMap.put(CoreConstants.PAGE_SIZE, "10");
farmerRegistryMap.put(CoreConstants.CLIENT_ID, farmerClientId);
farmerRegistryMap.put(CoreConstants.CLIENT_SECRET, farmerClientSecret);
farmerRegistryMap.put(CoreConstants.KEYCLOAK_URL, keycloakFarmerTokenUrl);
return farmerRegistryMap;
}

/**
* Set mobile registry specific config values
*
*
* @return Map to represent registry specific config values for mobile
*/
private Map<String, String> getMobileRegistryMap() {
Map<String, String> mobileRegistryMap = new HashMap<>();
mobileRegistryMap.put(CoreConstants.QUERY_NAME, "mobile_registered");
mobileRegistryMap.put(CoreConstants.DP_SEARCH_URL, mobileSearchURL);
mobileRegistryMap.put(CoreConstants.REG_TYPE, "ns:MOBILE_REGISTRY");
mobileRegistryMap.put(CoreConstants.REG_SUB_TYPE, "");
mobileRegistryMap.put(CoreConstants.QUERY_TYPE, "namedQuery");
mobileRegistryMap.put(CoreConstants.SORT_ATTRIBUTE, "mobile_number");
mobileRegistryMap.put(CoreConstants.SORT_ORDER, SortOrderEnum.ASC.toValue());
mobileRegistryMap.put(CoreConstants.PAGE_NUMBER, "1");
mobileRegistryMap.put(CoreConstants.PAGE_SIZE, "10");
mobileRegistryMap.put(CoreConstants.CLIENT_ID, mobileClientId);
mobileRegistryMap.put(CoreConstants.CLIENT_SECRET, mobileClientSecret);
mobileRegistryMap.put(CoreConstants.KEYCLOAK_URL, keycloakMobileTokenUrl);
return mobileRegistryMap;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"name": "abhi"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
welcome to the project