diff --git a/.vscode/settings.json b/.vscode/settings.json
index 919e8c1758c58191d78ed41247e8434c61534e20..3d3ca0e02a8210bc411c626dc07ca12bbf8361a3 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -34,6 +34,7 @@
"criteres",
"Derniere",
"Detaillees",
+ "Enedis",
"enedissgegrandlyon",
"Etage",
"etat",
@@ -43,6 +44,7 @@
"grandlyon",
"HISTO",
"insee",
+ "konnector",
"konnectors",
"lastname",
"llle",
diff --git a/README.md b/README.md
index 61399a0a7d62aa4eacd275831153c3ec4dd3a300..f70e98872cc60929900ad995b01b2dc73dae935c 100644
--- a/README.md
+++ b/README.md
@@ -1,181 +1,7 @@
-# enedis-sge-konnector
+# Enedis-sge-konnector
-Retreving consumption data from Enedis SGE SOAP api
+Retrieving consumption data from Enedis SGE SOAP api
-## Getting started
+## Documentation
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
-```
-cd existing_repo
-git remote add origin https://forge.grandlyon.com/web-et-numerique/llle_project/enedis-sge-konnector.git
-git branch -M main
-git push -uf origin main
-```
-
-## Integrate with your tools
-
-- [ ] [Set up project integrations](https://forge.grandlyon.com/web-et-numerique/llle_project/enedis-sge-konnector/-/settings/integrations)
-
-## Collaborate with your team
-
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
----
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-
-Choose a self-explaining name for your project.
-
-## Description
-
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-
-Show your appreciation to those who have contributed to the project.
-
-## License
-
-For open source projects, say how it is licensed.
-
-## Project status
-
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
-
-# [Cozy][cozy] <YOUR SUPER NEW KONNECTOR NAME>
-
-## What's Cozy?
-
-
-
-[Cozy] is a personal data platform that brings all your web services in the same private space. With it, your webapps and your devices can share data easily, providing you with a new experience. You can install Cozy on your own hardware where no one's tracking you.
-
-## What is this konnector about ?
-
-This konnector retrieves your <SOME DATA> and <SOME OTHER DATA> from <SERVICE>
-<YOUR DESCRIPTION HERE>
-
-### Open a Pull-Request
-
-If you want to work on this konnector and submit code modifications, feel free to open pull-requests!
-</br>See :
-
-- the [contributing guide][contribute] for more information about how to properly open pull-requests.
-- the [konnectors development guide](https://docs.cozy.io/en/tutorials/konnector/)
-
-### Run and test
-
-Create a `konnector-dev-config.json` file at the root with your test credentials :
-
-```javascript
-{
- "COZY_URL": "http://cozy.tools:8080",
- "fields": {"login":"zuck.m@rk.fb", "password":"123456"}
-}
-```
-
-Then :
-
-```sh
-yarn
-yarn standalone
-```
-
-For running the konnector connected to a Cozy server and more details see [konnectors tutorial](https://docs.cozy.io/en/tutorials/konnector/)
-
-### Cozy-konnector-libs
-
-This connector uses [cozy-konnector-libs](https://github.com/cozy/cozy-konnector-libs). It brings a bunch of helpers to interact with the Cozy server and to fetch data from an online service.
-
-### Maintainer
-
-The lead maintainers for this konnector is <YOUR NAME>
-
-### Get in touch
-
-You can reach the Cozy Community by:
-
-- [Konnectors tutorial](https://docs.cozy.io/en/tutorials/konnector/)
-- Chatting with us on IRC [#cozycloud on Libera.Chat][libera]
-- Posting on our [Forum]
-- Posting issues on the [Github repos][github]
-- Say Hi! on [Twitter]
-
-## License
-
-<YOUR KONNECTOR NAME> is developed by <your name> and distributed under the [AGPL v3 license][agpl-3.0].
-
-[cozy]: https://cozy.io 'Cozy Cloud'
-[agpl-3.0]: https://www.gnu.org/licenses/agpl-3.0.html
-[libera]: https://web.libera.chat/#cozycloud
-[forum]: https://forum.cozy.io/
-[github]: https://github.com/cozy/
-[nodejs]: https://nodejs.org/
-[standard]: https://standardjs.com
-[twitter]: https://twitter.com/mycozycloud
-[webpack]: https://webpack.js.org
-[yarn]: https://yarnpkg.com
-[travis]: https://travis-ci.org
-[contribute]: CONTRIBUTING.md
+[Enedis SGE Konnector - Self-Data](https://doc.self-data.alpha.grandlyon.com/konnectors/enedis-sge/)
diff --git a/__tests__/requests/insee.spec.js b/__tests__/requests/insee.spec.js
index bc133d14f9f923e37c2b69a027442b902431686f..5eff0f2e4349790be1d9cd3d9ac84a064e5908f1 100644
--- a/__tests__/requests/insee.spec.js
+++ b/__tests__/requests/insee.spec.js
@@ -42,6 +42,45 @@ describe('getInseeCode', () => {
expect(await getInseeCode(38080, "L'isle d'abeau")).toEqual('38193')
})
+ describe('should handle communes with "Saint" or "St"', () => {
+ it("should return insee code for: Saint Romain au Mont d'Or", async () => {
+ expect(await getInseeCode(69270, "Saint Romain au Mont d'Or")).toEqual(
+ '69233'
+ )
+ })
+
+ it("should return insee code for: St Romain au Mont d'Or", async () => {
+ expect(await getInseeCode(69270, "St Romain au Mont d'Or")).toEqual(
+ '69233'
+ )
+ })
+
+ it('should return insee code for: Saint Genis les Ollières', async () => {
+ expect(await getInseeCode(69290, 'Saint Genis les Ollières')).toEqual(
+ '69205'
+ )
+ })
+
+ it('should return insee code for: St Genis les Ollières', async () => {
+ expect(await getInseeCode(69290, 'St Genis les Ollières')).toEqual(
+ '69205'
+ )
+ })
+
+ it('should return insee code for: St Priest', async () => {
+ // 69800 has only a single commune
+ expect(await getInseeCode(69800, 'st priest')).toEqual('69290')
+ })
+
+ // No regression test with replacement of st
+ it('should return insee code for: Puget-Rostang', async () => {
+ expect(await getInseeCode('06260', 'Puget-Rostang')).toEqual('06098')
+ })
+ it('should return insee code for: St léger', async () => {
+ expect(await getInseeCode('06260', 'St léger')).toEqual('06124')
+ })
+ })
+
describe("should return correct insee code for Couzon-au-Mont-d'Or", () => {
it("should return insee code for: Couzon au mont d'or", async () => {
expect(await getInseeCode(69270, "Couzon au mont d'or")).toEqual(
diff --git a/package.json b/package.json
index 8ebee45dbafe2ce284d20813dd5354500e7efc3f..804b079c38ab5299be9f00773e16f056696191a1 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
"pretest": "npm run clean",
"release": "standard-version --no-verify",
"standalone": "cozy-konnector-standalone",
+ "standalone-no-data": "NO_DATA=true cozy-konnector-standalone src/index.js",
"start": "node ./src/index.js",
"test:cov": "jest --coverage",
"test": "jest",
diff --git a/src/core/contractActivation.js b/src/core/contractActivation.js
index 900183c43acda67506297f5d7bbe401e5f4ba80e..fe80491885cf975b7e2b880857d55b242cda8aac 100644
--- a/src/core/contractActivation.js
+++ b/src/core/contractActivation.js
@@ -70,6 +70,7 @@ async function activateContract(
}
//TODO: handle SGT4B8: Il existe déjà plusieurs demandes en cours sur le point ?
//TODO: handle SGT4H9: La demande ne porte pas sur un point équipé d'un compteur communicant ouvert aux services niveau 2.
+ //TODO: handle SGT589: La demande ne peut pas aboutir car le compteur n'est actuellement pas téléopérable.
throw errors.LOGIN_FAILED
}
}
diff --git a/src/index.js b/src/index.js
index 21306faf8b87daf57dddcee85cd988f9c8917350..8fd6b395d17fdd2a015f0ddddb06ee4baef632e5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -56,6 +56,7 @@ const startLoadDate = moment().subtract(7, 'day')
const endDate = moment()
const endDateString = endDate.format('YYYY-MM-DD')
const ACCOUNT_ID = isLocal() ? 'default_account_id' : 'enedissgegrandlyon'
+const NO_DATA = process.env.NO_DATA === 'true'
module.exports = new BaseKonnector(start)
@@ -92,6 +93,13 @@ async function start(fields, cozyParameters) {
try {
log('info', 'Konnector configuration ...')
log('info', `isManual execution: ${manualExecution}`)
+
+ if (NO_DATA) {
+ log(
+ 'debug',
+ 'NO_DATA is enabled, konnector will stop after verifyUserIdentity()'
+ )
+ }
const transaction = Sentry.startTransaction({
op: 'konnector',
name: 'SGE Konnector',
@@ -149,6 +157,8 @@ async function start(fields, cozyParameters) {
sgeLogin
)
+ exitIfDebug(user)
+
let consent = await createBoConsent(
boBaseUrl,
boToken,
@@ -230,6 +240,8 @@ async function start(fields, cozyParameters) {
accountData.data.inseeCode
)
+ exitIfDebug(user)
+
if (!userConsent) {
const errorMessage = 'No user consent found'
log('error', errorMessage)
@@ -623,3 +635,19 @@ function isFirstStart(account) {
log('info', 'Konnector first start')
return true
}
+
+/**
+ * Check if konnector is launched in local with NO_DATA option
+ * If so, logs result from verifyUserIdentity() and stops the konnector before getting any data
+ * @param {User} user - The user object to log
+ */
+function exitIfDebug(user) {
+ if (NO_DATA) {
+ log(
+ 'debug',
+ `Stopping konnector before getting data, user found from verifyUserIdentity():`
+ )
+ log('debug', user)
+ process.exit()
+ }
+}
diff --git a/src/requests/insee.js b/src/requests/insee.js
index 16523319924ba91f36f77069b5d6b82e2045bbda..932be3813f654c35fd1dedae6a2742f5148c6e9e 100644
--- a/src/requests/insee.js
+++ b/src/requests/insee.js
@@ -26,6 +26,7 @@ async function getInseeCode(postalCode, city) {
const filteredResponse = response.data.filter(
town => sanitizeCity(town.nomCommune) === parsedCity
)
+
return filteredResponse[0].codeCommune
}
} catch (error) {
@@ -44,6 +45,7 @@ async function getInseeCode(postalCode, city) {
function sanitizeCity(city) {
return city
.toLowerCase()
+ .replace(/st/g, 'saint')
.replace(/[âêîôûäëïü-\sʼ'éèç]/g, match => REPLACE_CHARS[match])
.trim()
}